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

[smr at alioth.debian.org]

Author: smr
Date: 2008-08-03 01:31:17 +0000 (Sun, 03 Aug 2008)
New Revision: 14243

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/gcc-4.3.patch
Log:
Close #485512 using provided patch.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2008-07-07 03:46:19 UTC (rev 14242)
+++ boost/trunk/debian/changelog	2008-08-03 01:31:17 UTC (rev 14243)
@@ -2,6 +2,9 @@
 
   [ Steve M. Robbins ]
 
+  * debian/patches/gcc-4.3.patch: Qualify typedef in
+    boost/gil/bit_aligned_pixel_reference.hpp.  Closes: #485512.
+  
   * debian/patches/test-child-exit-t1723.patch: New.  Ignore child process
     if return status is zero (normal); fix for Boost ticket 1723.
   
@@ -12,7 +15,7 @@
   
   * debian/rules: perform parallel builds as per $DEB_BUILD_OPTIONS 
 
- -- Steve M. Robbins <smr at debian.org>  Sun, 06 Jul 2008 22:58:37 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sat, 02 Aug 2008 20:30:36 -0500
 
 boost1.35 (1.35.0-5) unstable; urgency=low
 

Modified: boost/trunk/debian/patches/gcc-4.3.patch
===================================================================
--- boost/trunk/debian/patches/gcc-4.3.patch	2008-07-07 03:46:19 UTC (rev 14242)
+++ boost/trunk/debian/patches/gcc-4.3.patch	2008-08-03 01:31:17 UTC (rev 14243)
@@ -1,5 +1,5 @@
---- boost-posix-2008-03-21.orig/boost/spirit/phoenix/operators.hpp
-+++ boost-posix-2008-03-21/boost/spirit/phoenix/operators.hpp
+--- boost1.35-1.35.0.orig/boost/spirit/phoenix/operators.hpp
++++ boost1.35-1.35.0/boost/spirit/phoenix/operators.hpp
 @@ -25,6 +25,7 @@
  #include <boost/spirit/phoenix/composite.hpp>
  #include <boost/config.hpp>
@@ -8,8 +8,8 @@
  
  ///////////////////////////////////////////////////////////////////////////////
  namespace phoenix {
---- boost-posix-2008-03-21.orig/boost/date_time/tz_db_base.hpp
-+++ boost-posix-2008-03-21/boost/date_time/tz_db_base.hpp
+--- boost1.35-1.35.0.orig/boost/date_time/tz_db_base.hpp
++++ boost1.35-1.35.0/boost/date_time/tz_db_base.hpp
 @@ -158,7 +158,7 @@
        typedef typename time_zone_type::base_type time_zone_base_type;
        typedef typename time_zone_type::time_duration_type time_duration_type;
@@ -19,8 +19,8 @@
        typedef std::basic_string<char_type> string_type;
  
        //! Constructs an empty database
---- boost-posix-2008-03-21.orig/libs/spirit/test/numerics_tests.cpp
-+++ boost-posix-2008-03-21/libs/spirit/test/numerics_tests.cpp
+--- boost1.35-1.35.0.orig/libs/spirit/test/numerics_tests.cpp
++++ boost1.35-1.35.0/libs/spirit/test/numerics_tests.cpp
 @@ -12,6 +12,7 @@
  #include <climits>
  #include <iostream>
@@ -29,3 +29,14 @@
  
  using namespace std;
  using namespace boost::spirit;
+--- boost1.35-1.35.0.orig/boost/gil/bit_aligned_pixel_reference.hpp
++++ boost1.35-1.35.0/boost/gil/bit_aligned_pixel_reference.hpp
+@@ -121,7 +121,7 @@
+           bool IsMutable>
+ struct bit_aligned_pixel_reference {
+     BOOST_STATIC_CONSTANT(int, bit_size = (mpl::accumulate<ChannelBitSizes, mpl::int_<0>, mpl::plus<mpl::_1, mpl::_2> >::type::value));
+-    typedef bit_range<bit_size,IsMutable>                                           bit_range_t;
++    typedef boost::gil::bit_range<bit_size,IsMutable>                               bit_range_t;
+     typedef BitField                                                                bitfield_t;  
+     typedef typename mpl::if_c<IsMutable,unsigned char*,const unsigned char*>::type data_ptr_t;
+