From 795ebcc5ea55e696d01ce4d20b7c4a03145d29f5 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:14:48 +0000 Subject: [PATCH 1/6] Initialize branch F-11 for boost --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 2bda2241068f90efc7dfb5f0fd585f28bbbbc451 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 3 Jul 2009 12:38:00 +0000 Subject: [PATCH 2/6] - Add upstream patch to make boost_filesystem compatible with C++0x. - Resolves: #509250 --- boost-fs_gcc44.patch | 16 ++++++++++++++++ boost.spec | 8 +++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 boost-fs_gcc44.patch diff --git a/boost-fs_gcc44.patch b/boost-fs_gcc44.patch new file mode 100644 index 0000000..1b013ef --- /dev/null +++ b/boost-fs_gcc44.patch @@ -0,0 +1,16 @@ +Index: boost/filesystem/operations.hpp +=================================================================== +--- boost/filesystem/operations.hpp (revision 52859) ++++ boost/filesystem/operations.hpp (working copy) +@@ -659,9 +659,9 @@ + { return is_symlink( ph ); } + + inline bool is_empty( const path & ph ) +- { return is_empty( ph ); } ++ { return boost::filesystem::is_empty( ph ); } + inline bool is_empty( const wpath & ph ) +- { return is_empty( ph ); } ++ { return boost::filesystem::is_empty( ph ); } + + inline bool equivalent( const path & ph1, const path & ph2 ) + { return equivalent( ph1, ph2 ); } diff --git a/boost.spec b/boost.spec index 3c21503..365d2ff 100644 --- a/boost.spec +++ b/boost.spec @@ -4,7 +4,7 @@ Name: boost Summary: The Boost C++ Libraries Version: 1.37.0 -Release: 6%{?dist} +Release: 7%{?dist} License: Boost URL: http://www.boost.org/ Group: System Environment/Libraries @@ -30,6 +30,7 @@ Patch5: boost-function_template.patch Patch6: boost-unneccessary_iostreams.patch Patch7: boost-1_37_0-smp.patch Patch8: boost-bitset.patch +Patch9: boost-fs_gcc44.patch %description Boost provides free peer-reviewed portable C++ source libraries. The @@ -78,6 +79,7 @@ sed 's/!!!SONAME!!!/%{sonamever}/' %{PATCH4} | %{__patch} -p1 --fuzz=0 %patch6 -p0 sed 's/!!!SMP_FLAGS!!!/%{?_smp_mflags}/' %{PATCH7} | %{__patch} -p1 --fuzz=0 %patch8 -p1 +%patch9 -p0 %build BOOST_ROOT=`pwd` @@ -210,6 +212,10 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{name}-%{version} %changelog +* Fri Jul 3 2009 Petr Machata - 1.37.0-7 +- Add upstream patch to make boost_filesystem compatible with C++0x. +- Resolves: #509250 + * Mon Mar 23 2009 Petr Machata - 1.37.0-6 - Apply a SMP patch from Stefan Ring - Apply a workaround for "cannot appear in a constant-expression" in From 3900deaf486ec4335ea03af7c9d2299203737220 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 14 Oct 2009 13:34:42 +0000 Subject: [PATCH 3/6] - GCC 4.4 name resolution fixes for GIL - Resolves: #526834 --- boost-gil_gcc44.patch | 204 ++++++++++++++++++++++++++++++++++++++++++ boost.spec | 8 +- 2 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 boost-gil_gcc44.patch diff --git a/boost-gil_gcc44.patch b/boost-gil_gcc44.patch new file mode 100644 index 0000000..e0f86b7 --- /dev/null +++ b/boost-gil_gcc44.patch @@ -0,0 +1,204 @@ +Index: boost/gil/bit_aligned_pixel_reference.hpp +=================================================================== +--- boost/gil/bit_aligned_pixel_reference.hpp (revision 53049) ++++ boost/gil/bit_aligned_pixel_reference.hpp (working copy) +@@ -145,7 +145,7 @@ + + // Construct from another compatible pixel type + bit_aligned_pixel_reference(const bit_aligned_pixel_reference& p) : _bit_range(p._bit_range) {} +- template bit_aligned_pixel_reference(packed_pixel& p) : _bit_range(static_cast(&at_c<0>(p)), at_c<0>(p).first_bit()) { ++ template bit_aligned_pixel_reference(packed_pixel& p) : _bit_range(static_cast(&gil::at_c<0>(p)), gil::at_c<0>(p).first_bit()) { + check_compatible >(); + } + +Index: boost/gil/color_base.hpp +=================================================================== +--- boost/gil/color_base.hpp (revision 53049) ++++ boost/gil/color_base.hpp (working copy) +@@ -155,15 +155,15 @@ + homogeneous_color_base(Element v0, Element v1, Element v2) : _v0(v0), _v1(v1), _v2(v2) {} + + template homogeneous_color_base(const homogeneous_color_base& c) : +- _v0(at_c::value>(c)), +- _v1(at_c::value>(c)), +- _v2(at_c::value>(c)) {} ++ _v0(gil::at_c::value>(c)), ++ _v1(gil::at_c::value>(c)), ++ _v2(gil::at_c::value>(c)) {} + + // Support for l-value reference proxy copy construction + template homogeneous_color_base( homogeneous_color_base& c) : +- _v0(at_c::value>(c)), +- _v1(at_c::value>(c)), +- _v2(at_c::value>(c)) {} ++ _v0(gil::at_c::value>(c)), ++ _v1(gil::at_c::value>(c)), ++ _v2(gil::at_c::value>(c)) {} + + // Support for planar_pixel_iterator construction and dereferencing + template homogeneous_color_base(P* p,bool) : +Index: boost/gil/color_base_algorithm.hpp +=================================================================== +--- boost/gil/color_base_algorithm.hpp (revision 53049) ++++ boost/gil/color_base_algorithm.hpp (working copy) +@@ -101,7 +101,7 @@ + template struct kth_semantic_element_reference_type { + BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c::type::value)); + typedef typename kth_element_reference_type::type type; +- static type get(ColorBase& cb) { return at_c(cb); } ++ static type get(ColorBase& cb) { return gil::at_c(cb); } + }; + + /// \brief Specifies the return type of the constant semantic_at_c(color_base); +@@ -109,7 +109,7 @@ + template struct kth_semantic_element_const_reference_type { + BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c::type::value)); + typedef typename kth_element_const_reference_type::type type; +- static type get(const ColorBase& cb) { return at_c(cb); } ++ static type get(const ColorBase& cb) { return gil::at_c(cb); } + }; + + /// \brief A mutable accessor to the K-th semantic element of a color base +Index: boost/gil/image_view_factory.hpp +=================================================================== +--- boost/gil/image_view_factory.hpp (revision 53049) ++++ boost/gil/image_view_factory.hpp (working copy) +@@ -102,7 +102,7 @@ + BOOST_STATIC_ASSERT((!is_planar::value && view_is_basic::value)); + BOOST_STATIC_ASSERT((boost::is_pointer::value)); + +- return &at_c<0>(view(0,0)); ++ return &gil::at_c<0>(view(0,0)); + } + + /// \ingroup ImageViewConstructors +@@ -430,7 +430,7 @@ + typedef typename type::xy_locator locator_t; + typedef typename type::x_iterator x_iterator_t; + typedef typename iterator_adaptor_get_base::type x_iterator_base_t; +- x_iterator_t sit(x_iterator_base_t(&at_c(src(0,0))),src.pixels().pixel_size()); ++ x_iterator_t sit(x_iterator_base_t(&gil::at_c(src(0,0))),src.pixels().pixel_size()); + return type(src.dimensions(),locator_t(sit, src.pixels().row_size())); + } + }; +@@ -444,7 +444,7 @@ + typedef typename view_type::value>::type type; + static type make(const View& src) { + typedef typename type::x_iterator x_iterator_t; +- return interleaved_view(src.width(),src.height(),(x_iterator_t)&at_c(src(0,0)), src.pixels().row_size()); ++ return interleaved_view(src.width(),src.height(),(x_iterator_t)&gil::at_c(src(0,0)), src.pixels().row_size()); + } + }; + +@@ -494,7 +494,7 @@ + template kth_channel_deref_fn(const kth_channel_deref_fn&) {} + + result_type operator()(argument_type srcP) const { +- return result_type(at_c(srcP)); ++ return result_type(gil::at_c(srcP)); + } + }; + +Index: boost/gil/packed_pixel.hpp +=================================================================== +--- boost/gil/packed_pixel.hpp (revision 53049) ++++ boost/gil/packed_pixel.hpp (working copy) +@@ -81,7 +81,7 @@ + } + packed_pixel(int chan0, int chan1, int chan2) : _bitfield(0) { + BOOST_STATIC_ASSERT((num_channels::value==3)); +- at_c<0>(*this)=chan0; at_c<1>(*this)=chan1; at_c<2>(*this)=chan2; ++ gil::at_c<0>(*this)=chan0; gil::at_c<1>(*this)=chan1; gil::at_c<2>(*this)=chan2; + } + packed_pixel(int chan0, int chan1, int chan2, int chan3) : _bitfield(0) { + BOOST_STATIC_ASSERT((num_channels::value==4)); +Index: boost/gil/pixel.hpp +=================================================================== +--- boost/gil/pixel.hpp (revision 53049) ++++ boost/gil/pixel.hpp (working copy) +@@ -143,11 +143,11 @@ + + private: + static void check_gray() { BOOST_STATIC_ASSERT((is_same::value)); } +- template void assign(const Channel& chan, mpl::false_) { check_gray(); at_c<0>(*this)=chan; } +- template bool equal (const Channel& chan, mpl::false_) const { check_gray(); return at_c<0>(*this)==chan; } ++ template void assign(const Channel& chan, mpl::false_) { check_gray(); gil::at_c<0>(*this)=chan; } ++ template bool equal (const Channel& chan, mpl::false_) const { check_gray(); return gil::at_c<0>(*this)==chan; } + public: +- pixel& operator= (channel_t chan) { check_gray(); at_c<0>(*this)=chan; return *this; } +- bool operator==(channel_t chan) const { check_gray(); return at_c<0>(*this)==chan; } ++ pixel& operator= (channel_t chan) { check_gray(); gil::at_c<0>(*this)=chan; return *this; } ++ bool operator==(channel_t chan) const { check_gray(); return gil::at_c<0>(*this)==chan; } + }; + + ///////////////////////////// +Index: boost/gil/planar_pixel_iterator.hpp +=================================================================== +--- boost/gil/planar_pixel_iterator.hpp (revision 53049) ++++ boost/gil/planar_pixel_iterator.hpp (working copy) +@@ -109,8 +109,8 @@ + reference operator->() const { return **this; } + + // PERFORMANCE_CHECK: Remove? +- bool operator< (const planar_pixel_iterator& ptr) const { return at_c<0>(*this)< at_c<0>(ptr); } +- bool operator!=(const planar_pixel_iterator& ptr) const { return at_c<0>(*this)!=at_c<0>(ptr); } ++ bool operator< (const planar_pixel_iterator& ptr) const { return gil::at_c<0>(*this)< gil::at_c<0>(ptr); } ++ bool operator!=(const planar_pixel_iterator& ptr) const { return gil::at_c<0>(*this)!=gil::at_c<0>(ptr); } + private: + friend class boost::iterator_core_access; + +@@ -119,8 +119,8 @@ + void advance(ptrdiff_t d) { static_transform(*this,*this,std::bind2nd(detail::plus_asymmetric(),d)); } + reference dereference() const { return this->template deref(); } + +- ptrdiff_t distance_to(const planar_pixel_iterator& it) const { return at_c<0>(it)-at_c<0>(*this); } +- bool equal(const planar_pixel_iterator& it) const { return at_c<0>(*this)==at_c<0>(it); } ++ ptrdiff_t distance_to(const planar_pixel_iterator& it) const { return gil::at_c<0>(it)-gil::at_c<0>(*this); } ++ bool equal(const planar_pixel_iterator& it) const { return gil::at_c<0>(*this)==gil::at_c<0>(it); } + }; + + namespace detail { +Index: libs/gil/test/pixel.cpp +=================================================================== +--- libs/gil/test/pixel.cpp (revision 53049) ++++ libs/gil/test/pixel.cpp (working copy) +@@ -34,8 +34,9 @@ + // Testing pixel references and values, pixel operations, color conversion + + using namespace boost::gil; +-using namespace std; ++using std::swap; + using namespace boost; ++ + void error_if(bool condition); + + struct increment { +@@ -63,8 +64,8 @@ + + // test homogeneous algorithms - fill, max, min + static const int num_chan = num_channels::value; +- static_fill(C2::_pixel, at_c<0>(C1::_pixel)+1); +- error_if(at_c<0>(C2::_pixel) != at_c(C2::_pixel)); ++ static_fill(C2::_pixel, gil::at_c<0>(C1::_pixel)+1); ++ error_if(gil::at_c<0>(C2::_pixel) != gil::at_c(C2::_pixel)); + + C2::_pixel = C1::_pixel; + error_if(static_max(C2::_pixel) != static_max(C1::_pixel)); +@@ -107,7 +108,7 @@ + error_if(C1::_pixel!=C2::_pixel); + + static_generate(C2::_pixel, set_to_one()); +- error_if(at_c<0>(C2::_pixel) != 1); ++ error_if(gil::at_c<0>(C2::_pixel) != 1); + + // Test swap if both are mutable and if their value type is the same + // (We know the second one is mutable) +@@ -313,7 +314,7 @@ + bgr8_pixel_t bgr8(rgb8); + error_if(bgr8[0] == rgb8[0]); + error_if(dynamic_at_c(bgr8,0) == dynamic_at_c(rgb8,0)); +- error_if(at_c<0>(bgr8) == at_c<0>(rgb8)); ++ error_if(gil::at_c<0>(bgr8) == gil::at_c<0>(rgb8)); + error_if(semantic_at_c<0>(bgr8) != semantic_at_c<0>(rgb8)); + error_if(get_color(bgr8,blue_t()) != get_color(rgb8,blue_t())); + diff --git a/boost.spec b/boost.spec index 365d2ff..413112e 100644 --- a/boost.spec +++ b/boost.spec @@ -4,7 +4,7 @@ Name: boost Summary: The Boost C++ Libraries Version: 1.37.0 -Release: 7%{?dist} +Release: 8%{?dist} License: Boost URL: http://www.boost.org/ Group: System Environment/Libraries @@ -31,6 +31,7 @@ Patch6: boost-unneccessary_iostreams.patch Patch7: boost-1_37_0-smp.patch Patch8: boost-bitset.patch Patch9: boost-fs_gcc44.patch +Patch10: boost-gil_gcc44.patch %description Boost provides free peer-reviewed portable C++ source libraries. The @@ -80,6 +81,7 @@ sed 's/!!!SONAME!!!/%{sonamever}/' %{PATCH4} | %{__patch} -p1 --fuzz=0 sed 's/!!!SMP_FLAGS!!!/%{?_smp_mflags}/' %{PATCH7} | %{__patch} -p1 --fuzz=0 %patch8 -p1 %patch9 -p0 +%patch10 -p0 %build BOOST_ROOT=`pwd` @@ -212,6 +214,10 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{name}-%{version} %changelog +* Wed Oct 14 2009 Petr Machata - 1.37.0-8 +- GCC 4.4 name resolution fixes for GIL +- Resolves: #526834 + * Fri Jul 3 2009 Petr Machata - 1.37.0-7 - Add upstream patch to make boost_filesystem compatible with C++0x. - Resolves: #509250 From 65538ccd6e90acfb596db41a667f255e2fd1099a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:22:50 +0000 Subject: [PATCH 4/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8ebb4c7..a239116 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: boost -# $Id: Makefile,v 1.3 2005/08/19 17:39:58 bkoz Exp $ +# $Id: Makefile,v 1.4 2007/10/15 17:13:04 scop Exp $ NAME := boost SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From bcbc97f80da605b68330cbfd3bff632e3b80e70a Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 27 Jan 2010 12:26:07 +0000 Subject: [PATCH 5/6] - More GCC 4.4 name resolution fixes for GIL - Resolves: #526834 --- boost-gil_gcc44-2.patch | 159 ++++++++++++++++++++++++++++++++++++++++ boost.spec | 8 +- 2 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 boost-gil_gcc44-2.patch diff --git a/boost-gil_gcc44-2.patch b/boost-gil_gcc44-2.patch new file mode 100644 index 0000000..59ddbe0 --- /dev/null +++ b/boost-gil_gcc44-2.patch @@ -0,0 +1,159 @@ +Index: /trunk/boost/gil/color_base.hpp +=================================================================== +--- /trunk/boost/gil/color_base.hpp (revision 54725) ++++ /trunk/boost/gil/color_base.hpp (revision 58777) +@@ -86,5 +86,5 @@ + operator Element () const { return _v0; } + +- template homogeneous_color_base(const homogeneous_color_base& c) : _v0(at_c<0>(c)) {} ++ template homogeneous_color_base(const homogeneous_color_base& c) : _v0(gil::at_c<0>(c)) {} + }; + +@@ -108,11 +108,11 @@ + + template homogeneous_color_base(const homogeneous_color_base& c) : +- _v0(at_c::value>(c)), +- _v1(at_c::value>(c)) {} ++ _v0(gil::at_c::value>(c)), ++ _v1(gil::at_c::value>(c)) {} + + // Support for l-value reference proxy copy construction + template homogeneous_color_base( homogeneous_color_base& c) : +- _v0(at_c::value>(c)), +- _v1(at_c::value>(c)) {} ++ _v0(gil::at_c::value>(c)), ++ _v1(gil::at_c::value>(c)) {} + + // Support for planar_pixel_iterator construction and dereferencing +@@ -213,15 +213,15 @@ + + template homogeneous_color_base(const homogeneous_color_base& c) : +- _v0(at_c::value>(c)), +- _v1(at_c::value>(c)), +- _v2(at_c::value>(c)), +- _v3(at_c::value>(c)) {} ++ _v0(gil::at_c::value>(c)), ++ _v1(gil::at_c::value>(c)), ++ _v2(gil::at_c::value>(c)), ++ _v3(gil::at_c::value>(c)) {} + + // Support for l-value reference proxy copy construction + template homogeneous_color_base( homogeneous_color_base& c) : +- _v0(at_c::value>(c)), +- _v1(at_c::value>(c)), +- _v2(at_c::value>(c)), +- _v3(at_c::value>(c)) {} ++ _v0(gil::at_c::value>(c)), ++ _v1(gil::at_c::value>(c)), ++ _v2(gil::at_c::value>(c)), ++ _v3(gil::at_c::value>(c)) {} + + // Support for planar_pixel_iterator construction and dereferencing +@@ -279,17 +279,17 @@ + + template homogeneous_color_base(const homogeneous_color_base& c) : +- _v0(at_c::value>(c)), +- _v1(at_c::value>(c)), +- _v2(at_c::value>(c)), +- _v3(at_c::value>(c)), +- _v4(at_c::value>(c)) {} ++ _v0(gil::at_c::value>(c)), ++ _v1(gil::at_c::value>(c)), ++ _v2(gil::at_c::value>(c)), ++ _v3(gil::at_c::value>(c)), ++ _v4(gil::at_c::value>(c)) {} + + // Support for l-value reference proxy copy construction + template homogeneous_color_base( homogeneous_color_base& c) : +- _v0(at_c::value>(c)), +- _v1(at_c::value>(c)), +- _v2(at_c::value>(c)), +- _v3(at_c::value>(c)), +- _v4(at_c::value>(c)) {} ++ _v0(gil::at_c::value>(c)), ++ _v1(gil::at_c::value>(c)), ++ _v2(gil::at_c::value>(c)), ++ _v3(gil::at_c::value>(c)), ++ _v4(gil::at_c::value>(c)) {} + + // Support for planar_pixel_iterator construction and dereferencing +Index: /trunk/boost/gil/bit_aligned_pixel_reference.hpp +=================================================================== +--- /trunk/boost/gil/bit_aligned_pixel_reference.hpp (revision 54725) ++++ /trunk/boost/gil/bit_aligned_pixel_reference.hpp (revision 58777) +@@ -170,6 +170,6 @@ + private: + static void check_gray() { BOOST_STATIC_ASSERT((is_same::value)); } +- template void assign(const Channel& chan, mpl::false_) const { check_gray(); at_c<0>(*this)=chan; } +- template bool equal (const Channel& chan, mpl::false_) const { check_gray(); return at_c<0>(*this)==chan; } ++ template void assign(const Channel& chan, mpl::false_) const { check_gray(); gil::at_c<0>(*this)=chan; } ++ template bool equal (const Channel& chan, mpl::false_) const { check_gray(); return gil::at_c<0>(*this)==chan; } + }; + +Index: /trunk/boost/gil/extension/dynamic_image/reduce.hpp +=================================================================== +--- /trunk/boost/gil/extension/dynamic_image/reduce.hpp (revision 37609) ++++ /trunk/boost/gil/extension/dynamic_image/reduce.hpp (revision 58777) +@@ -60,5 +60,5 @@ + template + struct at_c, K> { +- static const std::size_t value=size::value - order::type>::type::value +1; ++ static const std::size_t value=size::value - order::type>::type::value +1; + typedef size_t type; + }; +Index: /trunk/boost/gil/gil_concept.hpp +=================================================================== +--- /trunk/boost/gil/gil_concept.hpp (revision 57980) ++++ /trunk/boost/gil/gil_concept.hpp (revision 58777) +@@ -619,5 +619,5 @@ + + #if !defined(_MSC_VER) || _MSC_VER > 1310 +- CR cr=at_c(cb); ignore_unused_variable_warning(cr); ++ CR cr=gil::at_c(cb); ignore_unused_variable_warning(cr); + #endif + +@@ -656,6 +656,6 @@ + + #if !defined(_MSC_VER) || _MSC_VER > 1310 +- CR r=at_c<0>(cb); +- at_c<0>(cb)=r; ++ CR r=gil::at_c<0>(cb); ++ gil::at_c<0>(cb)=r; + #endif + } +Index: /trunk/boost/gil/planar_pixel_iterator.hpp +=================================================================== +--- /trunk/boost/gil/planar_pixel_iterator.hpp (revision 54725) ++++ /trunk/boost/gil/planar_pixel_iterator.hpp (revision 58777) +@@ -185,5 +185,5 @@ + template + inline std::ptrdiff_t memunit_distance(const planar_pixel_iterator& p1, const planar_pixel_iterator& p2) { +- return memunit_distance(at_c<0>(p1),at_c<0>(p2)); ++ return memunit_distance(gil::at_c<0>(p1),gil::at_c<0>(p2)); + } + +Index: /trunk/boost/gil/packed_pixel.hpp +=================================================================== +--- /trunk/boost/gil/packed_pixel.hpp (revision 58302) ++++ /trunk/boost/gil/packed_pixel.hpp (revision 58777) +@@ -78,5 +78,5 @@ + packed_pixel(int chan0, int chan1) : _bitfield(0) { + BOOST_STATIC_ASSERT((num_channels::value==2)); +- at_c<0>(*this)=chan0; at_c<1>(*this)=chan1; ++ gil::at_c<0>(*this)=chan0; gil::at_c<1>(*this)=chan1; + } + packed_pixel(int chan0, int chan1, int chan2) : _bitfield(0) { +@@ -107,9 +107,9 @@ + // Support for assignment/equality comparison of a channel with a grayscale pixel + static void check_gray() { BOOST_STATIC_ASSERT((is_same::value)); } +- template void assign(const Channel& chan, mpl::false_) { check_gray(); at_c<0>(*this)=chan; } +- template bool equal (const Channel& chan, mpl::false_) const { check_gray(); return at_c<0>(*this)==chan; } ++ template void assign(const Channel& chan, mpl::false_) { check_gray(); gil::at_c<0>(*this)=chan; } ++ template bool equal (const Channel& chan, mpl::false_) const { check_gray(); return gil::at_c<0>(*this)==chan; } + public: +- packed_pixel& operator= (int chan) { check_gray(); at_c<0>(*this)=chan; return *this; } +- bool operator==(int chan) const { check_gray(); return at_c<0>(*this)==chan; } ++ packed_pixel& operator= (int chan) { check_gray(); gil::at_c<0>(*this)=chan; return *this; } ++ bool operator==(int chan) const { check_gray(); return gil::at_c<0>(*this)==chan; } + }; + diff --git a/boost.spec b/boost.spec index 413112e..37470b7 100644 --- a/boost.spec +++ b/boost.spec @@ -4,7 +4,7 @@ Name: boost Summary: The Boost C++ Libraries Version: 1.37.0 -Release: 8%{?dist} +Release: 9%{?dist} License: Boost URL: http://www.boost.org/ Group: System Environment/Libraries @@ -32,6 +32,7 @@ Patch7: boost-1_37_0-smp.patch Patch8: boost-bitset.patch Patch9: boost-fs_gcc44.patch Patch10: boost-gil_gcc44.patch +Patch11: boost-gil_gcc44-2.patch %description Boost provides free peer-reviewed portable C++ source libraries. The @@ -82,6 +83,7 @@ sed 's/!!!SMP_FLAGS!!!/%{?_smp_mflags}/' %{PATCH7} | %{__patch} -p1 --fuzz=0 %patch8 -p1 %patch9 -p0 %patch10 -p0 +%patch11 -p2 %build BOOST_ROOT=`pwd` @@ -214,6 +216,10 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{name}-%{version} %changelog +* Wed Jan 27 2010 Petr Machata - 1.37.0-9 +- More GCC 4.4 name resolution fixes for GIL +- Resolves: #526834 + * Wed Oct 14 2009 Petr Machata - 1.37.0-8 - GCC 4.4 name resolution fixes for GIL - Resolves: #526834 From e5f9e16a8511e63ac02442d662facb4e7fad6646 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:12:21 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a239116..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: boost -# $Id: Makefile,v 1.4 2007/10/15 17:13:04 scop Exp $ -NAME := boost -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 diff --git a/import.log b/import.log deleted file mode 100644 index 8ea7cec..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -boost-1_37_0-1_fc10:HEAD:boost-1.37.0-1.fc10.src.rpm:1229535558