[pkg-boost-commits] r14360 - in boost/trunk/debian: . patches

[smr at alioth.debian.org]

Author: smr
Date: 2009-01-10 04:05:22 +0000 (Sat, 10 Jan 2009)
New Revision: 14360

Added:
   boost/trunk/debian/patches/function-template.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Fix misplaced ifdef; bts  #511073.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2008-12-19 03:59:12 UTC (rev 14359)
+++ boost/trunk/debian/changelog	2009-01-10 04:05:22 UTC (rev 14360)
@@ -1,3 +1,11 @@
+boost1.37 (1.37.0-4) unstable; urgency=low
+
+  * patches/function-template.patch: New.  Fix misplaced #ifdef (thanks to
+    Caolan McNamara for the patch at
+    https://bugzilla.redhat.com/show_bug.cgi?id=477131).  Closes: #511073.
+
+ -- Steve M. Robbins <smr at debian.org>  Fri, 09 Jan 2009 22:04:37 -0600
+
 boost1.37 (1.37.0-3) unstable; urgency=low
 
   * patches/series: Add add-disable-long-double.patch to the series.

Added: boost/trunk/debian/patches/function-template.patch
===================================================================
--- boost/trunk/debian/patches/function-template.patch	                        (rev 0)
+++ boost/trunk/debian/patches/function-template.patch	2009-01-10 04:05:22 UTC (rev 14360)
@@ -0,0 +1,14 @@
+--- 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 @@
+           f.vtable->manager(f.functor, this->functor,
+                             boost::detail::function::move_functor_tag);
+ 		  f.vtable = 0;
+-#if !defined(BOOST_NO_EXCEPTIONS)      
+         } else {
+           clear();
+         }
++#if !defined(BOOST_NO_EXCEPTIONS)      
+       } catch (...) {
+         vtable = 0;
+         throw;

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2008-12-19 03:59:12 UTC (rev 14359)
+++ boost/trunk/debian/patches/series	2009-01-10 04:05:22 UTC (rev 14360)
@@ -1,3 +1,4 @@
+function-template.patch
 math-c99.patch
 atomic_count.patch
 atomic_count_gcc.patch