[pkg-boost-commits] r14327 - in boost/branches/1.36.0/debian: . patches

[smr at alioth.debian.org]

Author: smr
Date: 2008-11-15 07:05:44 +0000 (Sat, 15 Nov 2008)
New Revision: 14327

Added:
   boost/branches/1.36.0/debian/patches/atomic_count_gcc.patch
Modified:
   boost/branches/1.36.0/debian/changelog
   boost/branches/1.36.0/debian/patches/series
Log:
GCC >= 4.2 moved bits/atomic.h to ext/atomic.h 

Modified: boost/branches/1.36.0/debian/changelog
===================================================================
--- boost/branches/1.36.0/debian/changelog	2008-11-15 05:18:07 UTC (rev 14326)
+++ boost/branches/1.36.0/debian/changelog	2008-11-15 07:05:44 UTC (rev 14327)
@@ -1,3 +1,10 @@
+boost1.36 (1.36.0-7) unstable; urgency=low
+
+  * patches/atomic_count_gcc.patch: New.  GCC version >= 4.2 has moved
+    <bits/atomic.h> to <ext/atomic.h>.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 15 Nov 2008 01:03:05 -0600
+
 boost1.36 (1.36.0-6) unstable; urgency=low
 
   * patches/atomic_count.patch: Add arm, armel, and hppa to architectures

Added: boost/branches/1.36.0/debian/patches/atomic_count_gcc.patch
===================================================================
--- boost/branches/1.36.0/debian/patches/atomic_count_gcc.patch	                        (rev 0)
+++ boost/branches/1.36.0/debian/patches/atomic_count_gcc.patch	2008-11-15 07:05:44 UTC (rev 14327)
@@ -0,0 +1,15 @@
+--- boost1.36-1.36.0.orig/boost/detail/atomic_count_gcc.hpp
++++ boost1.36-1.36.0/boost/detail/atomic_count_gcc.hpp
+@@ -17,7 +17,11 @@
+ //  http://www.boost.org/LICENSE_1_0.txt)
+ //
+ 
+-#include <bits/atomicity.h>
++#if defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 420 ) 
++#  include <ext/atomicity.h>
++#else
++#  include <bits/atomicity.h>
++#endif
+ 
+ namespace boost
+ {

Modified: boost/branches/1.36.0/debian/patches/series
===================================================================
--- boost/branches/1.36.0/debian/patches/series	2008-11-15 05:18:07 UTC (rev 14326)
+++ boost/branches/1.36.0/debian/patches/series	2008-11-15 07:05:44 UTC (rev 14327)
@@ -2,6 +2,7 @@
 add-disable-long-double.patch
 math_tools_config.patch
 atomic_count.patch
+atomic_count_gcc.patch
 endian.patch
 avoid-PATH_MAX.patch
 jam-wall-clean.patch