[pkg-boost-commits] r14494 - in boost/branches/1.39.0/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2009-09-09 03:41:52 +0000 (Wed, 09 Sep 2009)
New Revision: 14494

Modified:
   boost/branches/1.39.0/debian/changelog
   boost/branches/1.39.0/debian/patches/function-template.patch
Log:
Wrap three more try/catch blocks, to allow compiling without exceptions.

Modified: boost/branches/1.39.0/debian/changelog
===================================================================
--- boost/branches/1.39.0/debian/changelog	2009-09-09 03:32:42 UTC (rev 14493)
+++ boost/branches/1.39.0/debian/changelog	2009-09-09 03:41:52 UTC (rev 14494)
@@ -5,8 +5,11 @@
     $(bjam).  Thanks to Andreas Ferber for the report and astute analysis.
     Closes: #545535.  Put the "-mt" decoration before the final suffix for
     compatibility symlinks.  Closes: #545773.
+  
+  * patches/function-template.patch: Wrap three more try/catch blocks with
+    #if !defined(BOOST_NO_EXCEPTIONS).  Closes: #545320.
 
- -- Steve M. Robbins <smr at debian.org>  Tue, 08 Sep 2009 22:36:47 -0500
+ -- Steve M. Robbins <smr at debian.org>  Tue, 08 Sep 2009 22:46:02 -0500
 
 boost1.39 (1.39.0-4) unstable; urgency=low
 

Modified: boost/branches/1.39.0/debian/patches/function-template.patch
===================================================================
--- boost/branches/1.39.0/debian/patches/function-template.patch	2009-09-09 03:32:42 UTC (rev 14493)
+++ boost/branches/1.39.0/debian/patches/function-template.patch	2009-09-09 03:41:52 UTC (rev 14494)
@@ -1,8 +1,67 @@
 Reported upstream as https://svn.boost.org/trac/boost/ticket/2469
 
---- boost1.37-1.37.0.orig/boost/function/function_template.hpp
-+++ boost1.37-1.37.0/boost/function/function_template.hpp
-@@ -950,10 +950,10 @@
+--- boost1.39-1.39.0.orig/boost/function/function_template.hpp
++++ boost1.39-1.39.0/boost/function/function_template.hpp
+@@ -781,24 +781,32 @@
+     operator=(Functor BOOST_FUNCTION_TARGET_FIX(const &) f)
+     {
+       this->clear();
++#if !defined(BOOST_NO_EXCEPTIONS)
+       try {
++#endif
+         this->assign_to(f);
++#if !defined(BOOST_NO_EXCEPTIONS)
+       } catch (...) {
+         vtable = 0;
+         throw;
+       }
++#endif
+       return *this;
+     }
+     template<typename Functor,typename Allocator>
+     void assign(Functor BOOST_FUNCTION_TARGET_FIX(const &) f, Allocator a)
+     {
+       this->clear();
++#if !defined(BOOST_NO_EXCEPTIONS)
+       try {
++#endif
+         this->assign_to_a(f,a);
++#if !defined(BOOST_NO_EXCEPTIONS)
+       } catch (...) {
+         vtable = 0;
+         throw;
+       }
++#endif
+     }
+ 
+ #ifndef BOOST_NO_SFINAE
+@@ -823,12 +831,16 @@
+         return *this;
+ 
+       this->clear();
++#if !defined(BOOST_NO_EXCEPTIONS)
+       try {
++#endif
+         this->assign_to_own(f);
++#if !defined(BOOST_NO_EXCEPTIONS)
+       } catch (...) {
+         vtable = 0;
+         throw;
+       }
++#endif
+       return *this;
+     }
+ 
+@@ -942,7 +954,7 @@
+       if (&f == this)
+         return;
+ 
+-#if !defined(BOOST_NO_EXCEPTIONS)      
++#if !defined(BOOST_NO_EXCEPTIONS)
+       try {
+ #endif
+         if (!f.empty()) {
+@@ -950,10 +962,10 @@
            f.vtable->manager(f.functor, this->functor,
                              boost::detail::function::move_functor_tag);
  		  f.vtable = 0;
@@ -10,7 +69,7 @@
          } else {
            clear();
          }
-+#if !defined(BOOST_NO_EXCEPTIONS)      
++#if !defined(BOOST_NO_EXCEPTIONS)
        } catch (...) {
          vtable = 0;
          throw;