[Boost-commit] svn:boost r61791 - trunk/boost/config/compiler

Subject: [Boost-commit] svn:boost r61791 - trunk/boost/config/compiler
From: john_at_[hidden]
Date: 2010-05-05 13:55:17

Author: johnmaddock
Date: 2010-05-05 13:55:15 EDT (Wed, 05 May 2010)
New Revision: 61791
URL: http://svn.boost.org/trac/boost/changeset/61791

Log:
Only define BOOST_NO_EXCEPTIONS if not already defined - fixes #4059.
Text files modified: 
   trunk/boost/config/compiler/borland.hpp     |     2 +-                                      
   trunk/boost/config/compiler/clang.hpp       |     2 +-                                      
   trunk/boost/config/compiler/codegear.hpp    |     2 +-                                      
   trunk/boost/config/compiler/common_edg.hpp  |     2 +-                                      
   trunk/boost/config/compiler/digitalmars.hpp |     2 +-                                      
   trunk/boost/config/compiler/gcc.hpp         |     2 +-                                      
   trunk/boost/config/compiler/kai.hpp         |     2 +-                                      
   trunk/boost/config/compiler/metrowerks.hpp  |     2 +-                                      
   trunk/boost/config/compiler/visualc.hpp     |     2 +-                                      
   9 files changed, 9 insertions(+), 9 deletions(-)

Modified: trunk/boost/config/compiler/borland.hpp
==============================================================================
--- trunk/boost/config/compiler/borland.hpp	(original)
+++ trunk/boost/config/compiler/borland.hpp	2010-05-05 13:55:15 EDT (Wed, 05 May 2010)
@@ -218,7 +218,7 @@
 //
 // check for exception handling support:
 //
-#if !defined(_CPPUNWIND) && !defined(BOOST_CPPUNWIND) && !defined(__EXCEPTIONS)
+#if !defined(_CPPUNWIND) && !defined(BOOST_CPPUNWIND) && !defined(__EXCEPTIONS) && !defined(BOOST_NO_EXCEPTIONS)
 #  define BOOST_NO_EXCEPTIONS
 #endif
 //

Modified: trunk/boost/config/compiler/clang.hpp
==============================================================================
--- trunk/boost/config/compiler/clang.hpp	(original)
+++ trunk/boost/config/compiler/clang.hpp	2010-05-05 13:55:15 EDT (Wed, 05 May 2010)
@@ -8,7 +8,7 @@
 
 // Clang compiler setup.
 
-#if __has_feature(cxx_exceptions)
+#if __has_feature(cxx_exceptions) && !defined(BOOST_NO_EXCEPTIONS)
 #else
 #  define BOOST_NO_EXCEPTIONS
 #endif

Modified: trunk/boost/config/compiler/codegear.hpp
==============================================================================
--- trunk/boost/config/compiler/codegear.hpp	(original)
+++ trunk/boost/config/compiler/codegear.hpp	2010-05-05 13:55:15 EDT (Wed, 05 May 2010)
@@ -131,7 +131,7 @@
 //
 // check for exception handling support:
 //
-#if !defined(_CPPUNWIND) && !defined(BOOST_CPPUNWIND) && !defined(__EXCEPTIONS)
+#if !defined(_CPPUNWIND) && !defined(BOOST_CPPUNWIND) && !defined(__EXCEPTIONS) && !defined(BOOST_NO_EXCEPTIONS)
 #  define BOOST_NO_EXCEPTIONS
 #endif
 //

Modified: trunk/boost/config/compiler/common_edg.hpp
==============================================================================
--- trunk/boost/config/compiler/common_edg.hpp	(original)
+++ trunk/boost/config/compiler/common_edg.hpp	2010-05-05 13:55:15 EDT (Wed, 05 May 2010)
@@ -44,7 +44,7 @@
 #endif 
 
 // See also kai.hpp which checks a Kai-specific symbol for EH
-# if !defined(__KCC) && !defined(__EXCEPTIONS)
+# if !defined(__KCC) && !defined(__EXCEPTIONS) && !defined(BOOST_NO_EXCEPTIONS)
 #     define BOOST_NO_EXCEPTIONS
 # endif
 

Modified: trunk/boost/config/compiler/digitalmars.hpp
==============================================================================
--- trunk/boost/config/compiler/digitalmars.hpp	(original)
+++ trunk/boost/config/compiler/digitalmars.hpp	2010-05-05 13:55:15 EDT (Wed, 05 May 2010)
@@ -51,7 +51,7 @@
 
 
 // check for exception handling support:
-#ifndef _CPPUNWIND
+#if !defined(_CPPUNWIND) && !defined(BOOST_NO_EXCEPTIONS)
 #  define BOOST_NO_EXCEPTIONS
 #endif
 

Modified: trunk/boost/config/compiler/gcc.hpp
==============================================================================
--- trunk/boost/config/compiler/gcc.hpp	(original)
+++ trunk/boost/config/compiler/gcc.hpp	2010-05-05 13:55:15 EDT (Wed, 05 May 2010)
@@ -81,7 +81,7 @@
 #define BOOST_NO_COMPLETE_VALUE_INITIALIZATION
 #endif
 
-#ifndef __EXCEPTIONS
+#if !defined(__EXCEPTIONS) && !defined(BOOST_NO_EXCEPTIONS)
 # define BOOST_NO_EXCEPTIONS
 #endif
 

Modified: trunk/boost/config/compiler/kai.hpp
==============================================================================
--- trunk/boost/config/compiler/kai.hpp	(original)
+++ trunk/boost/config/compiler/kai.hpp	2010-05-05 13:55:15 EDT (Wed, 05 May 2010)
@@ -17,7 +17,7 @@
 #   endif
 
 // see also common_edg.hpp which needs a special check for __KCC
-# if !defined(_EXCEPTIONS)
+# if !defined(_EXCEPTIONS) && !defined(BOOST_NO_EXCEPTIONS)
 #     define BOOST_NO_EXCEPTIONS
 # endif
 

Modified: trunk/boost/config/compiler/metrowerks.hpp
==============================================================================
--- trunk/boost/config/compiler/metrowerks.hpp	(original)
+++ trunk/boost/config/compiler/metrowerks.hpp	2010-05-05 13:55:15 EDT (Wed, 05 May 2010)
@@ -48,7 +48,7 @@
 #   define BOOST_NO_INTRINSIC_WCHAR_T
 #endif
 
-#if !__option(exceptions)
+#if !__option(exceptions) && !defined(BOOST_NO_EXCEPTIONS)
 #   define BOOST_NO_EXCEPTIONS
 #endif
 

Modified: trunk/boost/config/compiler/visualc.hpp
==============================================================================
--- trunk/boost/config/compiler/visualc.hpp	(original)
+++ trunk/boost/config/compiler/visualc.hpp	2010-05-05 13:55:15 EDT (Wed, 05 May 2010)
@@ -115,7 +115,7 @@
 
 //   
 // check for exception handling support:   
-#ifndef _CPPUNWIND 
+#if !defined(_CPPUNWIND) && !defined(BOOST_NO_EXCEPTIONS)
 #  define BOOST_NO_EXCEPTIONS   
 #endif