From 84e49b5e52a53098e155ae975bd6853516b9e5c2 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Wed, 5 May 2010 17:55:15 +0000
Subject: [PATCH] Only define BOOST_NO_EXCEPTIONS if not already defined -
 fixes #4059.

[SVN r61791]
---
 include/boost/config/compiler/borland.hpp     | 2 +-
 include/boost/config/compiler/clang.hpp       | 2 +-
 include/boost/config/compiler/codegear.hpp    | 2 +-
 include/boost/config/compiler/common_edg.hpp  | 2 +-
 include/boost/config/compiler/digitalmars.hpp | 2 +-
 include/boost/config/compiler/gcc.hpp         | 2 +-
 include/boost/config/compiler/kai.hpp         | 2 +-
 include/boost/config/compiler/metrowerks.hpp  | 2 +-
 include/boost/config/compiler/visualc.hpp     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/boost/config/compiler/borland.hpp b/include/boost/config/compiler/borland.hpp
index 6e9db623..fecc29aa 100644
--- a/include/boost/config/compiler/borland.hpp
+++ b/include/boost/config/compiler/borland.hpp
@@ -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
 //
diff --git a/include/boost/config/compiler/clang.hpp b/include/boost/config/compiler/clang.hpp
index e3551bc4..cdbba676 100644
--- a/include/boost/config/compiler/clang.hpp
+++ b/include/boost/config/compiler/clang.hpp
@@ -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
diff --git a/include/boost/config/compiler/codegear.hpp b/include/boost/config/compiler/codegear.hpp
index c816cf8f..76726f67 100644
--- a/include/boost/config/compiler/codegear.hpp
+++ b/include/boost/config/compiler/codegear.hpp
@@ -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
 //
diff --git a/include/boost/config/compiler/common_edg.hpp b/include/boost/config/compiler/common_edg.hpp
index 9dc4cef8..c2559695 100644
--- a/include/boost/config/compiler/common_edg.hpp
+++ b/include/boost/config/compiler/common_edg.hpp
@@ -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
 
diff --git a/include/boost/config/compiler/digitalmars.hpp b/include/boost/config/compiler/digitalmars.hpp
index a01b4c28..bd37d2f1 100644
--- a/include/boost/config/compiler/digitalmars.hpp
+++ b/include/boost/config/compiler/digitalmars.hpp
@@ -51,7 +51,7 @@
 
 
 // check for exception handling support:
-#ifndef _CPPUNWIND
+#if !defined(_CPPUNWIND) && !defined(BOOST_NO_EXCEPTIONS)
 #  define BOOST_NO_EXCEPTIONS
 #endif
 
diff --git a/include/boost/config/compiler/gcc.hpp b/include/boost/config/compiler/gcc.hpp
index a4c23c36..463bf5dd 100644
--- a/include/boost/config/compiler/gcc.hpp
+++ b/include/boost/config/compiler/gcc.hpp
@@ -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
 
diff --git a/include/boost/config/compiler/kai.hpp b/include/boost/config/compiler/kai.hpp
index ea06f9f4..2337e6a8 100644
--- a/include/boost/config/compiler/kai.hpp
+++ b/include/boost/config/compiler/kai.hpp
@@ -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
 
diff --git a/include/boost/config/compiler/metrowerks.hpp b/include/boost/config/compiler/metrowerks.hpp
index aeba7f80..3bc9d975 100644
--- a/include/boost/config/compiler/metrowerks.hpp
+++ b/include/boost/config/compiler/metrowerks.hpp
@@ -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
 
diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp
index 2238f476..157abc8b 100644
--- a/include/boost/config/compiler/visualc.hpp
+++ b/include/boost/config/compiler/visualc.hpp
@@ -115,7 +115,7 @@
 
 //   
 // check for exception handling support:   
-#ifndef _CPPUNWIND 
+#if !defined(_CPPUNWIND) && !defined(BOOST_NO_EXCEPTIONS)
 #  define BOOST_NO_EXCEPTIONS   
 #endif