X-Git-Url: http://git.onelab.eu/?p=boost.git;a=blobdiff_plain;f=boost-gcc43.patch;h=7b1f99914420a6bf050c9de1386be9484c55fa7a;hp=af64bd0e16607fe9c0dfed6cd3924ac9ce3f57cb;hb=647afca93404eb8f55adfdb49347ccc218c9ad6c;hpb=5125899c068deace8ca8803f4ee1e1d4b74b260b diff --git a/boost-gcc43.patch b/boost-gcc43.patch index af64bd0..7b1f999 100644 --- a/boost-gcc43.patch +++ b/boost-gcc43.patch @@ -1,19 +1,74 @@ -diff -urp boost_1_34_1/boost/spirit/phoenix/operators.hpp boost_1_34_1.pm/boost/spirit/phoenix/operators.hpp ---- boost_1_34_1/boost/spirit/phoenix/operators.hpp 2006-08-25 18:27:30.000000000 +0200 -+++ boost_1_34_1.pm/boost/spirit/phoenix/operators.hpp 2008-02-06 16:29:32.000000000 +0100 -@@ -24,6 +24,7 @@ - #include - #include - #include +diff -urp boost_1_36_0_beta1-orig/boost/archive/polymorphic_iarchive.hpp boost_1_36_0_beta1/boost/archive/polymorphic_iarchive.hpp +--- boost_1_36_0_beta1-orig/boost/archive/polymorphic_iarchive.hpp 2008-08-11 23:49:44.000000000 +0200 ++++ boost_1_36_0_beta1/boost/archive/polymorphic_iarchive.hpp 2008-08-11 23:50:38.000000000 +0200 +@@ -35,6 +35,8 @@ namespace std{ + #include + #include + ++#include ++ + // determine if its necessary to handle (u)int64_t specifically + // i.e. that its not a synonym for (unsigned) long + // if there is no 64 bit int or if its the same as a long +Only in boost_1_36_0_beta1/boost/archive: polymorphic_iarchive.hpp.orig +diff -urp boost_1_36_0_beta1-orig/boost/archive/polymorphic_oarchive.hpp boost_1_36_0_beta1/boost/archive/polymorphic_oarchive.hpp +--- boost_1_36_0_beta1-orig/boost/archive/polymorphic_oarchive.hpp 2008-08-11 23:49:44.000000000 +0200 ++++ boost_1_36_0_beta1/boost/archive/polymorphic_oarchive.hpp 2008-08-11 23:50:38.000000000 +0200 +@@ -34,6 +34,8 @@ namespace std{ + #include + #include + +#include ++ + // determine if its necessary to handle (u)int64_t specifically + // i.e. that its not a synonym for (unsigned) long + // if there is no 64 bit int or if its the same as a long +Only in boost_1_36_0_beta1/boost/archive: polymorphic_oarchive.hpp.orig +diff -urp boost_1_36_0_beta1-orig/boost/date_time/tz_db_base.hpp boost_1_36_0_beta1/boost/date_time/tz_db_base.hpp +--- boost_1_36_0_beta1-orig/boost/date_time/tz_db_base.hpp 2008-08-11 23:49:45.000000000 +0200 ++++ boost_1_36_0_beta1/boost/date_time/tz_db_base.hpp 2008-08-11 23:50:38.000000000 +0200 +@@ -158,7 +158,7 @@ namespace boost { + typedef typename time_zone_type::base_type time_zone_base_type; + typedef typename time_zone_type::time_duration_type time_duration_type; + typedef time_zone_names_base time_zone_names; +- typedef dst_adjustment_offsets dst_adjustment_offsets; ++ typedef dst_adjustment_offsets dst_adjustment_offsets_t; + typedef std::basic_string string_type; + + //! Constructs an empty database +@@ -346,18 +346,18 @@ namespace boost { + time_duration_type utc_offset = + str_from_delimited_time_duration(result[GMTOFFSET]); + +- dst_adjustment_offsets adjust(time_duration_type(0,0,0), +- time_duration_type(0,0,0), +- time_duration_type(0,0,0)); ++ dst_adjustment_offsets_t adjust(time_duration_type(0,0,0), ++ time_duration_type(0,0,0), ++ time_duration_type(0,0,0)); + + boost::shared_ptr rules; - /////////////////////////////////////////////////////////////////////////////// - namespace phoenix { -diff -urp boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp boost_1_34_1.pm/boost/regex/v4/basic_regex_creator.hpp ---- boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp 2006-07-16 18:06:38.000000000 +0200 -+++ boost_1_34_1.pm/boost/regex/v4/basic_regex_creator.hpp 2008-02-06 17:36:42.000000000 +0100 -@@ -24,6 +24,8 @@ - # include BOOST_ABI_PREFIX + if(has_dst){ +- adjust = dst_adjustment_offsets( +- str_from_delimited_time_duration(result[DSTADJUST]), +- str_from_delimited_time_duration(result[START_TIME]), +- str_from_delimited_time_duration(result[END_TIME]) +- ); ++ adjust = dst_adjustment_offsets_t( ++ str_from_delimited_time_duration(result[DSTADJUST]), ++ str_from_delimited_time_duration(result[START_TIME]), ++ str_from_delimited_time_duration(result[END_TIME]) ++ ); + + rules = + boost::shared_ptr(parse_rules(result[START_DATE_RULE], +Only in boost_1_36_0_beta1/boost/date_time: tz_db_base.hpp.orig +diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_creator.hpp boost_1_36_0_beta1/boost/regex/v4/basic_regex_creator.hpp +--- boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_creator.hpp 2008-08-11 23:49:48.000000000 +0200 ++++ boost_1_36_0_beta1/boost/regex/v4/basic_regex_creator.hpp 2008-08-11 23:50:38.000000000 +0200 +@@ -36,6 +36,8 @@ + # pragma warning(disable: 4800) #endif +#include @@ -21,11 +76,12 @@ diff -urp boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp boost_1_34_1.pm/bo namespace boost{ namespace re_detail{ -diff -urp boost_1_34_1/boost/regex/v4/basic_regex.hpp boost_1_34_1.pm/boost/regex/v4/basic_regex.hpp ---- boost_1_34_1/boost/regex/v4/basic_regex.hpp 2007-06-05 19:28:18.000000000 +0200 -+++ boost_1_34_1.pm/boost/regex/v4/basic_regex.hpp 2008-02-06 17:33:30.000000000 +0100 -@@ -23,6 +23,8 @@ - # include BOOST_ABI_PREFIX +Only in boost_1_36_0_beta1/boost/regex/v4: basic_regex_creator.hpp.orig +diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex.hpp boost_1_36_0_beta1/boost/regex/v4/basic_regex.hpp +--- boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex.hpp 2008-08-11 23:49:48.000000000 +0200 ++++ boost_1_36_0_beta1/boost/regex/v4/basic_regex.hpp 2008-08-11 23:50:38.000000000 +0200 +@@ -30,6 +30,8 @@ + #pragma warning(pop) #endif +#include @@ -33,11 +89,12 @@ diff -urp boost_1_34_1/boost/regex/v4/basic_regex.hpp boost_1_34_1.pm/boost/rege namespace boost{ #ifdef BOOST_MSVC #pragma warning(push) -diff -urp boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp boost_1_34_1.pm/boost/regex/v4/basic_regex_parser.hpp ---- boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp 2008-02-06 17:45:26.000000000 +0100 -+++ boost_1_34_1.pm/boost/regex/v4/basic_regex_parser.hpp 2008-02-06 17:38:58.000000000 +0100 -@@ -23,6 +23,8 @@ - # include BOOST_ABI_PREFIX +Only in boost_1_36_0_beta1/boost/regex/v4: basic_regex.hpp.orig +diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_parser.hpp boost_1_36_0_beta1/boost/regex/v4/basic_regex_parser.hpp +--- boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_parser.hpp 2008-08-11 23:49:48.000000000 +0200 ++++ boost_1_36_0_beta1/boost/regex/v4/basic_regex_parser.hpp 2008-08-11 23:50:38.000000000 +0200 +@@ -30,6 +30,8 @@ + #pragma warning(pop) #endif +#include @@ -45,22 +102,12 @@ diff -urp boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp boost_1_34_1.pm/boo namespace boost{ namespace re_detail{ -diff -urp boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp boost_1_34_1.pm/boost/regex/v4/cpp_regex_traits.hpp ---- boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp 2007-01-15 12:09:44.000000000 +0100 -+++ boost_1_34_1.pm/boost/regex/v4/cpp_regex_traits.hpp 2008-02-06 17:26:51.000000000 +0100 -@@ -41,6 +41,7 @@ - - #include - #include -+#include - - #ifdef BOOST_HAS_ABI_HEADERS - # include BOOST_ABI_PREFIX -diff -urp boost_1_34_1/boost/regex/v4/perl_matcher.hpp boost_1_34_1.pm/boost/regex/v4/perl_matcher.hpp ---- boost_1_34_1/boost/regex/v4/perl_matcher.hpp 2006-10-18 14:55:30.000000000 +0200 -+++ boost_1_34_1.pm/boost/regex/v4/perl_matcher.hpp 2008-02-06 17:39:44.000000000 +0100 -@@ -18,6 +18,8 @@ - # include BOOST_ABI_PREFIX +Only in boost_1_36_0_beta1/boost/regex/v4: basic_regex_parser.hpp.orig +diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/perl_matcher.hpp boost_1_36_0_beta1/boost/regex/v4/perl_matcher.hpp +--- boost_1_36_0_beta1-orig/boost/regex/v4/perl_matcher.hpp 2008-08-11 23:49:48.000000000 +0200 ++++ boost_1_36_0_beta1/boost/regex/v4/perl_matcher.hpp 2008-08-11 23:50:38.000000000 +0200 +@@ -30,6 +30,8 @@ + # pragma warning(disable: 4800) #endif +#include @@ -68,9 +115,10 @@ diff -urp boost_1_34_1/boost/regex/v4/perl_matcher.hpp boost_1_34_1.pm/boost/reg namespace boost{ namespace re_detail{ -diff -urp boost_1_34_1/boost/regex/v4/regex_split.hpp boost_1_34_1.pm/boost/regex/v4/regex_split.hpp ---- boost_1_34_1/boost/regex/v4/regex_split.hpp 2005-01-21 18:22:38.000000000 +0100 -+++ boost_1_34_1.pm/boost/regex/v4/regex_split.hpp 2008-02-06 17:42:13.000000000 +0100 +Only in boost_1_36_0_beta1/boost/regex/v4: perl_matcher.hpp.orig +diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/regex_split.hpp boost_1_36_0_beta1/boost/regex/v4/regex_split.hpp +--- boost_1_36_0_beta1-orig/boost/regex/v4/regex_split.hpp 2008-08-11 23:49:48.000000000 +0200 ++++ boost_1_36_0_beta1/boost/regex/v4/regex_split.hpp 2008-08-11 23:50:38.000000000 +0200 @@ -21,6 +21,8 @@ #ifndef BOOST_REGEX_SPLIT_HPP #define BOOST_REGEX_SPLIT_HPP @@ -79,12 +127,13 @@ diff -urp boost_1_34_1/boost/regex/v4/regex_split.hpp boost_1_34_1.pm/boost/rege + namespace boost{ - #ifdef BOOST_HAS_ABI_HEADERS -diff -urp boost_1_34_1/boost/regex/v4/states.hpp boost_1_34_1.pm/boost/regex/v4/states.hpp ---- boost_1_34_1/boost/regex/v4/states.hpp 2005-09-20 14:01:25.000000000 +0200 -+++ boost_1_34_1.pm/boost/regex/v4/states.hpp 2008-02-06 17:32:42.000000000 +0100 -@@ -23,6 +23,8 @@ - # include BOOST_ABI_PREFIX + #ifdef BOOST_MSVC +Only in boost_1_36_0_beta1/boost/regex/v4: regex_split.hpp.orig +diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/states.hpp boost_1_36_0_beta1/boost/regex/v4/states.hpp +--- boost_1_36_0_beta1-orig/boost/regex/v4/states.hpp 2008-08-11 23:49:48.000000000 +0200 ++++ boost_1_36_0_beta1/boost/regex/v4/states.hpp 2008-08-11 23:50:38.000000000 +0200 +@@ -30,6 +30,8 @@ + #pragma warning(pop) #endif +#include @@ -92,20 +141,10 @@ diff -urp boost_1_34_1/boost/regex/v4/states.hpp boost_1_34_1.pm/boost/regex/v4/ namespace boost{ namespace re_detail{ -diff -urp boost_1_34_1/boost/test/test_tools.hpp boost_1_34_1.pm/boost/test/test_tools.hpp ---- boost_1_34_1/boost/test/test_tools.hpp 2007-02-22 18:57:29.000000000 +0100 -+++ boost_1_34_1.pm/boost/test/test_tools.hpp 2008-02-06 17:18:20.000000000 +0100 -@@ -44,6 +44,7 @@ - // STL - #include // for std::size_t - #include -+#include - - #include - -diff -urp boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp boost_1_34_1.pm/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp ---- boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2006-12-20 17:38:24.000000000 +0100 -+++ boost_1_34_1.pm/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-02-06 17:25:00.000000000 +0100 +Only in boost_1_36_0_beta1/boost/regex/v4: states.hpp.orig +diff -urp boost_1_36_0_beta1-orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp boost_1_36_0_beta1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp +--- boost_1_36_0_beta1-orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-08-11 23:49:45.000000000 +0200 ++++ boost_1_36_0_beta1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-08-11 23:50:38.000000000 +0200 @@ -16,6 +16,8 @@ #include #include @@ -115,101 +154,4 @@ diff -urp boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp boost_1_34 #if defined(BOOST_SPIRIT_DEBUG) #include #endif // defined(BOOST_SPIRIT_DEBUG) -diff -urp boost_1_34_1/boost/wave/util/flex_string.hpp boost_1_34_1.pm/boost/wave/util/flex_string.hpp ---- boost_1_34_1/boost/wave/util/flex_string.hpp 2006-04-25 19:21:01.000000000 +0200 -+++ boost_1_34_1.pm/boost/wave/util/flex_string.hpp 2008-02-06 17:22:31.000000000 +0100 -@@ -94,6 +94,7 @@ class StoragePolicy - #include - #include - #include -+#include - - // this must occur after all of the includes and before any code appears - #ifdef BOOST_HAS_ABI_HEADERS -diff -urp boost_1_34_1/boost/archive/polymorphic_iarchive.hpp boost_1_34_1.pm/boost/archive/polymorphic_iarchive.hpp ---- boost_1_34_1/boost/archive/polymorphic_iarchive.hpp 2005-12-11 07:12:51.000000000 +0100 -+++ boost_1_34_1.pm/boost/archive/polymorphic_iarchive.hpp 2008-02-06 18:42:07.000000000 +0100 -@@ -33,6 +33,8 @@ namespace std{ - #include - #include - -+#include -+ - // determine if its necessary to handle (u)int64_t specifically - // i.e. that its not a synonym for (unsigned) long - // if there is no 64 bit int or if its the same as a long -diff -urp boost_1_34_1.orig/boost/archive/polymorphic_oarchive.hpp boost_1_34_1/boost/archive/polymorphic_oarchive.hpp ---- boost_1_34_1.orig/boost/archive/polymorphic_oarchive.hpp 2008-10-06 15:38:51.000000000 +0200 -+++ boost_1_34_1/boost/archive/polymorphic_oarchive.hpp 2008-10-06 15:38:57.000000000 +0200 -@@ -32,6 +32,8 @@ namespace std{ - #include - #include - -+#include -+ - // determine if its necessary to handle (u)int64_t specifically - // i.e. that its not a synonym for (unsigned) long - // if there is no 64 bit int or if its the same as a long -diff -urp boost_1_34_1/boost/date_time/date_facet.hpp boost_1_34_1-pm/boost/date_time/date_facet.hpp ---- boost_1_34_1/boost/date_time/date_facet.hpp 2005-09-05 23:10:50.000000000 +0200 -+++ boost_1_34_1-pm/boost/date_time/date_facet.hpp 2008-02-13 16:07:59.000000000 +0100 -@@ -429,7 +429,7 @@ namespace boost { namespace date_time { - typedef std::basic_string string_type; - typedef CharT char_type; - typedef boost::date_time::period_parser period_parser_type; -- typedef special_values_parser special_values_parser_type; -+ typedef boost::date_time::special_values_parser special_values_parser_type; - typedef std::vector > input_collection_type; - typedef format_date_parser format_date_parser_type; - // date_generators stuff goes here -diff -urp boost_1_34_1/boost/python/detail/def_helper.hpp boost_1_34_1-pm/boost/python/detail/def_helper.hpp ---- boost_1_34_1/boost/python/detail/def_helper.hpp 2004-09-16 03:00:28.000000000 +0200 -+++ boost_1_34_1-pm/boost/python/detail/def_helper.hpp 2008-02-14 13:26:23.000000000 +0100 -@@ -155,7 +155,7 @@ namespace detail - , T3 const& - , T4 const& - , default_call_policies -- , keywords<0> -+ , boost::python::detail::keywords<0> - , char const* - , void(not_specified::*)() // A function pointer type which is never an - // appropriate default implementation -diff -urp new-boost/date_time/tz_db_base.hpp old-boost/date_time/tz_db_base.hpp ---- boost_1_34_1/boost/date_time/tz_db_base.hpp 2008-06-12 13:03:34.000000000 +0200 -+++ boost_1_34_1-pm/boost/date_time/tz_db_base.hpp 2008-06-12 12:59:43.000000000 +0200 -@@ -158,7 +158,7 @@ namespace boost { - typedef typename time_zone_type::base_type time_zone_base_type; - typedef typename time_zone_type::time_duration_type time_duration_type; - typedef time_zone_names_base time_zone_names; -- typedef dst_adjustment_offsets dst_adjustment_offsets; -+ typedef dst_adjustment_offsets dst_adjustment_offsets_t; - typedef std::basic_string string_type; - - //! Constructs an empty database -@@ -346,18 +346,18 @@ namespace boost { - time_duration_type utc_offset = - str_from_delimited_time_duration(result[GMTOFFSET]); - -- dst_adjustment_offsets adjust(time_duration_type(0,0,0), -- time_duration_type(0,0,0), -- time_duration_type(0,0,0)); -+ dst_adjustment_offsets_t adjust(time_duration_type(0,0,0), -+ time_duration_type(0,0,0), -+ time_duration_type(0,0,0)); - - boost::shared_ptr rules; - - if(has_dst){ -- adjust = dst_adjustment_offsets( -- str_from_delimited_time_duration(result[DSTADJUST]), -- str_from_delimited_time_duration(result[START_TIME]), -- str_from_delimited_time_duration(result[END_TIME]) -- ); -+ adjust = dst_adjustment_offsets_t( -+ str_from_delimited_time_duration(result[DSTADJUST]), -+ str_from_delimited_time_duration(result[START_TIME]), -+ str_from_delimited_time_duration(result[END_TIME]) -+ ); - - rules = - boost::shared_ptr(parse_rules(result[START_DATE_RULE], +Only in boost_1_36_0_beta1/boost/wave/cpplexer/re2clex: cpp_re2c_lexer.hpp.orig