You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by se...@apache.org on 2007/12/19 01:12:50 UTC
svn commit: r605369 - in /incubator/stdcxx/branches/4.2.x/include/rw:
_config-acc.h _config-deccxx.h _config-eccp.h _config-gcc.h _config-icc.h
_config-mipspro.h _config-xlc.h
Author: sebor
Date: Tue Dec 18 16:12:47 2007
New Revision: 605369
URL: http://svn.apache.org/viewvc?rev=605369&view=rev
Log:
2007-12-18 Travis Vitek <vi...@roguewave.com>
Merged rev 605368 with a fix for STDCXX-240 from trunk.
* include/rw/_config-acc.h: Conditionally disable exception
support if appropriate command line option is set.
* include/rw/_config-deccxx.h: Ditto.
* include/rw/_config-eccp.h: Ditto.
* include/rw/_config-gcc.h: Ditto.
* include/rw/_config-icc.h: Ditto.
* include/rw/_config-mipspro.h: Ditto.
* include/rw/_config-xlc.h: Ditto.
Modified:
incubator/stdcxx/branches/4.2.x/include/rw/_config-acc.h
incubator/stdcxx/branches/4.2.x/include/rw/_config-deccxx.h
incubator/stdcxx/branches/4.2.x/include/rw/_config-eccp.h
incubator/stdcxx/branches/4.2.x/include/rw/_config-gcc.h
incubator/stdcxx/branches/4.2.x/include/rw/_config-icc.h
incubator/stdcxx/branches/4.2.x/include/rw/_config-mipspro.h
incubator/stdcxx/branches/4.2.x/include/rw/_config-xlc.h
Modified: incubator/stdcxx/branches/4.2.x/include/rw/_config-acc.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/rw/_config-acc.h?rev=605369&r1=605368&r2=605369&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/rw/_config-acc.h (original)
+++ incubator/stdcxx/branches/4.2.x/include/rw/_config-acc.h Tue Dec 18 16:12:47 2007
@@ -88,3 +88,13 @@
# endif // _RWSTD_NO_STRING_NPOS_TYPE
# endif // _RWSTD_NO_EXTERN_TEMPLATE
#endif // aCC < 6.0
+
+#ifdef __HPACC_NOEH
+ // disable exceptions when the macro __HPACC_NOEH
+ // is #defined by the compiler, e.g., when the
+ // +noeh option is used
+# ifndef _RWSTD_NO_EXCEPTIONS
+# define _RWSTD_NO_EXCEPTIONS
+# endif // _RWSTD_NO_EXCEPTIONS
+#endif // __HPACC_NOEH
+
Modified: incubator/stdcxx/branches/4.2.x/include/rw/_config-deccxx.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/rw/_config-deccxx.h?rev=605369&r1=605368&r2=605369&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/rw/_config-deccxx.h (original)
+++ incubator/stdcxx/branches/4.2.x/include/rw/_config-deccxx.h Tue Dec 18 16:12:47 2007
@@ -46,3 +46,12 @@
// C++ C library headers (the <cxxx> kind)
# define _RWSTD_NO_NEW_HEADER
#endif // __DECCXX_VER < 60390008
+
+#ifndef __EXCEPTIONS
+ // disable exceptions when the macro __EXCEPTIONS
+ // is not #defined by the compiler, e.g., when
+ // the -LANG:exceptions=OFF option is used
+# ifndef _RWSTD_NO_EXCEPTIONS
+# define _RWSTD_NO_EXCEPTIONS
+# endif // _RWSTD_NO_EXCEPTIONS
+#endif // __EXCEPTIONS
Modified: incubator/stdcxx/branches/4.2.x/include/rw/_config-eccp.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/rw/_config-eccp.h?rev=605369&r1=605368&r2=605369&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/rw/_config-eccp.h (original)
+++ incubator/stdcxx/branches/4.2.x/include/rw/_config-eccp.h Tue Dec 18 16:12:47 2007
@@ -61,3 +61,12 @@
#undef _RWSTD_NO_DEPRECATED_C_HEADERS
#undef _RWSTD_NO_PURE_C_HEADERS
+
+#ifndef __EXCEPTIONS
+ // disable exceptions when the macro __EXCEPTIONS
+ // is not #defined by the compiler, e.g., when
+ // the -no_exceptions option is used
+# ifndef _RWSTD_NO_EXCEPTIONS
+# define _RWSTD_NO_EXCEPTIONS
+# endif // _RWSTD_NO_EXCEPTIONS
+#endif // __EXCEPTIONS
Modified: incubator/stdcxx/branches/4.2.x/include/rw/_config-gcc.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/rw/_config-gcc.h?rev=605369&r1=605368&r2=605369&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/rw/_config-gcc.h (original)
+++ incubator/stdcxx/branches/4.2.x/include/rw/_config-gcc.h Tue Dec 18 16:12:47 2007
@@ -46,7 +46,7 @@
// the -fno-exceptions option is used
# ifndef _RWSTD_NO_EXCEPTIONS
# define _RWSTD_NO_EXCEPTIONS
-# endif
+# endif // _RWSTD_NO_EXCEPTIONS
#endif // __EXCEPTIONS
#if !defined (_RWSTD_USE_PURE_C_HEADERS)
Modified: incubator/stdcxx/branches/4.2.x/include/rw/_config-icc.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/rw/_config-icc.h?rev=605369&r1=605368&r2=605369&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/rw/_config-icc.h (original)
+++ incubator/stdcxx/branches/4.2.x/include/rw/_config-icc.h Tue Dec 18 16:12:47 2007
@@ -44,6 +44,15 @@
# undef _RWSTD_NO_NEW_HEADER
# undef _RWSTD_NO_LIBC_IN_STD
+# ifndef __EXCEPTIONS
+ // disable exceptions when the macro __EXCEPTIONS
+ // is not #deined by the compiler, e.g., when
+ // the -fno-exceptions option is used
+# ifndef _RWSTD_NO_EXCEPTIONS
+# define _RWSTD_NO_EXCEPTIONS
+# endif // _RWSTD_NO_EXCEPTIONS
+# endif
+
#else // if defined (_WIN{32,64})
# include "_config-msvcrt.h"
Modified: incubator/stdcxx/branches/4.2.x/include/rw/_config-mipspro.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/rw/_config-mipspro.h?rev=605369&r1=605368&r2=605369&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/rw/_config-mipspro.h (original)
+++ incubator/stdcxx/branches/4.2.x/include/rw/_config-mipspro.h Tue Dec 18 16:12:47 2007
@@ -54,3 +54,13 @@
#if defined (_RWSTD_NO_IMPLICIT_INCLUSION)
# undef _RWSTD_NO_IMPLICIT_INCLUSION
#endif
+
+#ifndef __EXCEPTIONS
+ // disable exceptions when the macro __EXCEPTIONS
+ // is not #defined by the compiler, e.g., when
+ // the -noexceptions option is used
+# ifndef _RWSTD_NO_EXCEPTIONS
+# define _RWSTD_NO_EXCEPTIONS
+# endif // _RWSTD_NO_EXCEPTIONS
+#endif // __EXCEPTIONS
+
Modified: incubator/stdcxx/branches/4.2.x/include/rw/_config-xlc.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/rw/_config-xlc.h?rev=605369&r1=605368&r2=605369&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/rw/_config-xlc.h (original)
+++ incubator/stdcxx/branches/4.2.x/include/rw/_config-xlc.h Tue Dec 18 16:12:47 2007
@@ -138,6 +138,15 @@
# define _RWSTD_NO_UNDEFINED_TEMPLATES
#endif // __TEMPINC__
+#ifndef __EXCEPTIONS
+ // disable exceptions when the macro __EXCEPTIONS
+ // is not #defined by the compiler, e.g., when
+ // the -qnoeh option is used
+# ifndef _RWSTD_NO_EXCEPTIONS
+# define _RWSTD_NO_EXCEPTIONS
+# endif // _RWSTD_NO_EXCEPTIONS
+#endif // __EXCEPTIONS
+
// avoid using autodetected libc headers
#undef _RWSTD_ANSI_C_ASSERT_H