[Boost-commit] svn:boost r39061 - trunk/boost/function

From: dgregor_at_[hidden]
Date: 2007-08-29 15:06:12

Author: dgregor
Date: 2007-08-29 15:06:11 EDT (Wed, 29 Aug 2007)
New Revision: 39061
URL: http://svn.boost.org/trac/boost/changeset/39061

Log:
Handle GCC's -fno-exceptions properly. Fixes #1198
Text files modified: 
   trunk/boost/function/function_template.hpp |     8 ++++++++                                
   1 files changed, 8 insertions(+), 0 deletions(-)

Modified: trunk/boost/function/function_template.hpp
==============================================================================
--- trunk/boost/function/function_template.hpp	(original)
+++ trunk/boost/function/function_template.hpp	2007-08-29 15:06:11 EDT (Wed, 29 Aug 2007)
@@ -562,12 +562,16 @@
     operator=(Functor BOOST_FUNCTION_TARGET_FIX(const &) f)
     {
       this->clear();
+#ifndef BOOST_NO_EXCEPTIONS
       try {
         this->assign_to(f);
       } catch (...) {
         vtable = 0;
         throw;
       }
+#else
+      this->assign_to(f);
+#endif
       return *this;
     }
 
@@ -593,12 +597,16 @@
         return *this;
 
       this->clear();
+#ifndef BOOST_NO_EXCEPTIONS
       try {
         this->assign_to_own(f);
       } catch (...) {
         vtable = 0;
         throw;
       }
+#else
+      this->assign_to_own(f);
+#endif
       return *this;
     }