* [gentoo-commits] gentoo commit in src/patchsets/boost/1.35.0/patches: 01_all_1.35.0-gcc-4.3-fixes-pulled_from_trunk.patch 02_all_1.35.0-0001-serialization-gcc-4.3-compile-fixes.bug-1616-included.patch 03_all_1.35.0-0001-spirit-gcc-4.3-fixes.bug-1617-not_included.patch 04_all_1.35.0-0001-mpl-g-4.3-fix.bug-1528-not-included.patch 05_all_1.35.0-0001-date_time-gcc-4.3-fix.bug-1615-not_included.patch
@ 2008-04-24 14:57 Tiziano Mueller (dev-zero)
0 siblings, 0 replies; only message in thread
From: Tiziano Mueller (dev-zero) @ 2008-04-24 14:57 UTC (permalink / raw
To: gentoo-commits
dev-zero 08/04/24 14:57:22
Added: 01_all_1.35.0-gcc-4.3-fixes-pulled_from_trunk.patch
02_all_1.35.0-0001-serialization-gcc-4.3-compile-fixes.bug-1616-included.patch
03_all_1.35.0-0001-spirit-gcc-4.3-fixes.bug-1617-not_included.patch
04_all_1.35.0-0001-mpl-g-4.3-fix.bug-1528-not-included.patch
05_all_1.35.0-0001-date_time-gcc-4.3-fix.bug-1615-not_included.patch
Log:
Added patches for boost 1.35.0 (patchset version 1)
Revision Changes Path
1.1 src/patchsets/boost/1.35.0/patches/01_all_1.35.0-gcc-4.3-fixes-pulled_from_trunk.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/boost/1.35.0/patches/01_all_1.35.0-gcc-4.3-fixes-pulled_from_trunk.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/boost/1.35.0/patches/01_all_1.35.0-gcc-4.3-fixes-pulled_from_trunk.patch?rev=1.1&content-type=text/plain
Index: 01_all_1.35.0-gcc-4.3-fixes-pulled_from_trunk.patch
===================================================================
diff -Naur boost_1_35_0.orig/boost/archive/polymorphic_iarchive.hpp boost_1_35_0/boost/archive/polymorphic_iarchive.hpp
--- boost_1_35_0.orig/boost/archive/polymorphic_iarchive.hpp 2008-04-24 16:00:51.000000000 +0200
+++ boost_1_35_0/boost/archive/polymorphic_iarchive.hpp 2008-04-24 16:05:15.000000000 +0200
@@ -17,6 +17,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <cstddef> // std::size_t
+#include <climits> // ULONG_MAX
#include <boost/config.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
@@ -38,9 +39,16 @@
// 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
// we shouldn't define separate functions for int64 data types.
-#if defined(BOOST_NO_INT64_T) \
- || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
-# define BOOST_NO_INTRINSIC_INT64_T
+#if defined(BOOST_NO_INT64_T)
+ #define BOOST_NO_INTRINSIC_INT64_T
+#else
+ #if defined(ULONG_MAX)
+ #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
+ #define BOOST_NO_INTRINSIC_INT64_T
+ #endif
+ #else
+ #define BOOST_NO_INTRINSIC_INT64_T
+ #endif
#endif
namespace boost {
@@ -123,7 +131,7 @@
load_end(t.name());
}
protected:
- virtual ~polymorphic_iarchive_impl(){}
+ virtual ~polymorphic_iarchive_impl(){};
public:
// utility function implemented by all legal archives
virtual void set_library_version(unsigned int archive_library_version) = 0;
@@ -166,7 +174,10 @@
class polymorphic_iarchive :
public polymorphic_iarchive_impl,
public detail::shared_ptr_helper
-{};
+{
+public:
+ virtual ~polymorphic_iarchive(){};
+};
} // namespace archive
} // namespace boost
diff -Naur boost_1_35_0.orig/boost/archive/polymorphic_oarchive.hpp boost_1_35_0/boost/archive/polymorphic_oarchive.hpp
--- boost_1_35_0.orig/boost/archive/polymorphic_oarchive.hpp 2008-04-24 16:00:51.000000000 +0200
+++ boost_1_35_0/boost/archive/polymorphic_oarchive.hpp 2008-04-24 16:04:41.000000000 +0200
@@ -17,6 +17,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <cstddef> // size_t
+#include <climits> // ULONG_MAX
#include <string>
#include <boost/config.hpp>
@@ -37,9 +38,16 @@
// 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
// we shouldn't define separate functions for int64 data types.
-#if defined(BOOST_NO_INT64_T) \
- || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
-# define BOOST_NO_INTRINSIC_INT64_T
+#if defined(BOOST_NO_INT64_T)
+ #define BOOST_NO_INTRINSIC_INT64_T
+#else
+ #if defined(ULONG_MAX)
+ #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
+ #define BOOST_NO_INTRINSIC_INT64_T
+ #endif
+ #else
+ #define BOOST_NO_INTRINSIC_INT64_T
+ #endif
#endif
namespace boost {
@@ -123,7 +131,7 @@
save_end(t.name());
}
protected:
- virtual ~polymorphic_oarchive_impl(){}
+ virtual ~polymorphic_oarchive_impl(){};
public:
// utility functions implemented by all legal archives
virtual unsigned int get_flags() const = 0;
@@ -143,7 +151,10 @@
// note: preserve naming symmetry
class polymorphic_oarchive :
public polymorphic_oarchive_impl
-{};
+{
+public:
+ virtual ~polymorphic_oarchive(){};
+};
} // namespace archive
} // namespace boost
diff -Naur boost_1_35_0.orig/boost/gil/algorithm.hpp boost_1_35_0/boost/gil/algorithm.hpp
--- boost_1_35_0.orig/boost/gil/algorithm.hpp 2008-04-24 16:00:47.000000000 +0200
+++ boost_1_35_0/boost/gil/algorithm.hpp 2008-04-24 16:09:51.000000000 +0200
@@ -16,9 +16,11 @@
#include <cassert>
#include <cstddef>
+#include <cstring>
#include <algorithm>
#include <iterator>
#include <memory>
+#include <typeinfo>
#include "gil_config.hpp"
#include "gil_concept.hpp"
#include "color_base_algorithm.hpp"
@@ -31,7 +33,7 @@
/// \brief Some basic STL-style algorithms when applied to image views
/// \author Lubomir Bourdev and Hailin Jin \n
/// Adobe Systems Incorporated
-/// \date 2005-2007 \n Last updated on May 6, 2007
+/// \date 2005-2008 \n Last updated on March 12, 2008
///
////////////////////////////////////////////////////////////////////////////////////////
diff -Naur boost_1_35_0.orig/boost/gil/bit_aligned_pixel_reference.hpp boost_1_35_0/boost/gil/bit_aligned_pixel_reference.hpp
--- boost_1_35_0.orig/boost/gil/bit_aligned_pixel_reference.hpp 2008-04-24 16:00:47.000000000 +0200
+++ boost_1_35_0/boost/gil/bit_aligned_pixel_reference.hpp 2008-04-24 16:09:01.000000000 +0200
@@ -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;
diff -Naur boost_1_35_0.orig/boost/wave/util/macro_helpers.hpp boost_1_35_0/boost/wave/util/macro_helpers.hpp
--- boost_1_35_0.orig/boost/wave/util/macro_helpers.hpp 2008-04-24 16:00:47.000000000 +0200
+++ boost_1_35_0/boost/wave/util/macro_helpers.hpp 2008-04-24 16:13:31.000000000 +0200
@@ -17,6 +17,7 @@
#include <boost/wave/wave_config.hpp>
#include <boost/wave/token_ids.hpp>
#include <boost/wave/cpplexer/validate_universal_char.hpp>
+#include <boost/wave/util/unput_queue_iterator.hpp>
// this must occur after all of the includes and before any code appears
#ifdef BOOST_HAS_ABI_HEADERS
1.1 src/patchsets/boost/1.35.0/patches/02_all_1.35.0-0001-serialization-gcc-4.3-compile-fixes.bug-1616-included.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/boost/1.35.0/patches/02_all_1.35.0-0001-serialization-gcc-4.3-compile-fixes.bug-1616-included.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/boost/1.35.0/patches/02_all_1.35.0-0001-serialization-gcc-4.3-compile-fixes.bug-1616-included.patch?rev=1.1&content-type=text/plain
Index: 02_all_1.35.0-0001-serialization-gcc-4.3-compile-fixes.bug-1616-included.patch
===================================================================
From 5196c2d434eab8d9dc75fa2fe2c2870cf4b7d1fe Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Sat, 2 Feb 2008 18:05:42 +0100
Subject: [PATCH] serialization gcc-4.3 compile fixes
---
libs/serialization/test/test_complex.cpp | 2 ++
libs/serialization/test/test_non_default_ctor.cpp | 2 ++
libs/serialization/test/test_non_intrusive.cpp | 2 ++
3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/libs/serialization/test/test_complex.cpp b/libs/serialization/test/test_complex.cpp
index 603631d..4623ee3 100644
--- a/libs/serialization/test/test_complex.cpp
+++ b/libs/serialization/test/test_complex.cpp
@@ -11,10 +11,12 @@
#include <fstream>
#include <cstdio> // remove
+#include <limits>
#include <boost/config.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
namespace std{
using ::remove;
+ using ::numeric_limits;
}
#endif
diff --git a/libs/serialization/test/test_non_default_ctor.cpp b/libs/serialization/test/test_non_default_ctor.cpp
index 255bd04..0af5ccd 100644
--- a/libs/serialization/test/test_non_default_ctor.cpp
+++ b/libs/serialization/test/test_non_default_ctor.cpp
@@ -16,6 +16,7 @@
#include <cstdlib> // for rand()
#include <cstdio> // remove()
#include <cmath> // for fabs()
+#include <limits>
#include <boost/config.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
@@ -23,6 +24,7 @@ namespace std{
using ::rand;
using ::fabs;
using ::remove;
+ using ::numeric_limits;
}
#endif
diff --git a/libs/serialization/test/test_non_intrusive.cpp b/libs/serialization/test/test_non_intrusive.cpp
index 06ef939..a5e2c7f 100644
--- a/libs/serialization/test/test_non_intrusive.cpp
+++ b/libs/serialization/test/test_non_intrusive.cpp
@@ -16,6 +16,7 @@
#include <cstdlib> // for rand()
#include <cstdio> // remove
#include <cmath> // for fabs()
+#include <limits>
#include <boost/config.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
@@ -23,6 +24,7 @@ namespace std{
using ::rand;
using ::fabs;
using ::remove;
+ using ::numeric_limits;
}
#endif
--
1.5.3.8
1.1 src/patchsets/boost/1.35.0/patches/03_all_1.35.0-0001-spirit-gcc-4.3-fixes.bug-1617-not_included.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/boost/1.35.0/patches/03_all_1.35.0-0001-spirit-gcc-4.3-fixes.bug-1617-not_included.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/boost/1.35.0/patches/03_all_1.35.0-0001-spirit-gcc-4.3-fixes.bug-1617-not_included.patch?rev=1.1&content-type=text/plain
Index: 03_all_1.35.0-0001-spirit-gcc-4.3-fixes.bug-1617-not_included.patch
===================================================================
From 5795e44f39b59db1ae55005697ff077cb0229714 Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Sat, 2 Feb 2008 18:17:54 +0100
Subject: [PATCH] spirit: gcc-4.3 fixes
---
boost/spirit/tree/impl/tree_to_xml.ipp | 1 +
libs/spirit/test/mix_and_match_trees.cpp | 6 +++---
libs/spirit/test/numerics_tests.cpp | 1 +
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/boost/spirit/tree/impl/tree_to_xml.ipp b/boost/spirit/tree/impl/tree_to_xml.ipp
index b8084f8..7d1ca3b 100644
--- a/boost/spirit/tree/impl/tree_to_xml.ipp
+++ b/boost/spirit/tree/impl/tree_to_xml.ipp
@@ -15,6 +15,7 @@
#include <cstdarg>
#include <locale>
#include <string>
+#include <cstring>
#include <map>
#include <iostream>
diff --git a/libs/spirit/test/mix_and_match_trees.cpp b/libs/spirit/test/mix_and_match_trees.cpp
index 8a0069a..22232e9 100644
--- a/libs/spirit/test/mix_and_match_trees.cpp
+++ b/libs/spirit/test/mix_and_match_trees.cpp
@@ -54,7 +54,7 @@ struct my_grammar : grammar<my_grammar>
typedef rule<ast_scanner> ast_rule;
typedef rule<pt_scanner> pt_rule;
- typedef rule<Scanner> rule;
+ typedef rule<Scanner> rule_;
definition(my_grammar const & /* self */)
{
@@ -62,12 +62,12 @@ struct my_grammar : grammar<my_grammar>
start_ = gen_pt_node_d[ pt_rule_ ];
}
- rule const & start() const
+ rule_ const & start() const
{
return start_;
}
- rule start_;
+ rule_ start_;
ast_rule ast_rule_;
pt_rule pt_rule_;
};
diff --git a/libs/spirit/test/numerics_tests.cpp b/libs/spirit/test/numerics_tests.cpp
index b27546d..3ee4af3 100644
--- a/libs/spirit/test/numerics_tests.cpp
+++ b/libs/spirit/test/numerics_tests.cpp
@@ -11,6 +11,7 @@
#include <boost/spirit/actor/assign_actor.hpp>
#include <iostream>
#include <boost/detail/lightweight_test.hpp>
+#include <climits>
using namespace std;
using namespace boost::spirit;
--
1.5.3.8
1.1 src/patchsets/boost/1.35.0/patches/04_all_1.35.0-0001-mpl-g-4.3-fix.bug-1528-not-included.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/boost/1.35.0/patches/04_all_1.35.0-0001-mpl-g-4.3-fix.bug-1528-not-included.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/boost/1.35.0/patches/04_all_1.35.0-0001-mpl-g-4.3-fix.bug-1528-not-included.patch?rev=1.1&content-type=text/plain
Index: 04_all_1.35.0-0001-mpl-g-4.3-fix.bug-1528-not-included.patch
===================================================================
From 902912000f991b385ba063496147cac4ba7b55c2 Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Sat, 2 Feb 2008 17:15:32 +0100
Subject: [PATCH] mpl: g++-4.3 fix
---
boost/mpl/zip_view.hpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/boost/mpl/zip_view.hpp b/boost/mpl/zip_view.hpp
index ee13d03..98a0c7a 100644
--- a/boost/mpl/zip_view.hpp
+++ b/boost/mpl/zip_view.hpp
@@ -37,7 +37,7 @@ struct zip_iterator
typedef zip_iterator<
typename transform1<
IteratorSeq
- , next<_1>
+ , boost::mpl::next<_1>
>::type
> next;
};
@@ -48,8 +48,8 @@ template<
struct zip_view
{
private:
- typedef typename transform1< Sequences, begin<_1> >::type first_ones_;
- typedef typename transform1< Sequences, end<_1> >::type last_ones_;
+ typedef typename transform1< Sequences, boost::mpl::begin<_1> >::type first_ones_;
+ typedef typename transform1< Sequences, boost::mpl::end<_1> >::type last_ones_;
public:
typedef nested_begin_end_tag tag;
--
1.5.3.8
1.1 src/patchsets/boost/1.35.0/patches/05_all_1.35.0-0001-date_time-gcc-4.3-fix.bug-1615-not_included.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/boost/1.35.0/patches/05_all_1.35.0-0001-date_time-gcc-4.3-fix.bug-1615-not_included.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/boost/1.35.0/patches/05_all_1.35.0-0001-date_time-gcc-4.3-fix.bug-1615-not_included.patch?rev=1.1&content-type=text/plain
Index: 05_all_1.35.0-0001-date_time-gcc-4.3-fix.bug-1615-not_included.patch
===================================================================
From 88f7023cc36d82133cfa0e705531a9d73feb4686 Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Sat, 2 Feb 2008 17:22:58 +0100
Subject: [PATCH] date_time: gcc-4.3 fix
---
boost/date_time/tz_db_base.hpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/boost/date_time/tz_db_base.hpp b/boost/date_time/tz_db_base.hpp
index b9c0a8a..03f748e 100644
--- a/boost/date_time/tz_db_base.hpp
+++ b/boost/date_time/tz_db_base.hpp
@@ -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<char_type> time_zone_names;
- typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
+ typedef boost::date_time::dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
typedef std::basic_string<char_type> string_type;
//! Constructs an empty database
--
1.5.3.8
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-04-24 14:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-24 14:57 [gentoo-commits] gentoo commit in src/patchsets/boost/1.35.0/patches: 01_all_1.35.0-gcc-4.3-fixes-pulled_from_trunk.patch 02_all_1.35.0-0001-serialization-gcc-4.3-compile-fixes.bug-1616-included.patch 03_all_1.35.0-0001-spirit-gcc-4.3-fixes.bug-1617-not_included.patch 04_all_1.35.0-0001-mpl-g-4.3-fix.bug-1528-not-included.patch 05_all_1.35.0-0001-date_time-gcc-4.3-fix.bug-1615-not_included.patch Tiziano Mueller (dev-zero)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox