Kaydet (Commit) 350fa615 authored tarafından Caolán McNamara's avatar Caolán McNamara

bump boost from 1.54 to 1.55

Change-Id: I5c9d01fa1be54b81f2aedead5f55ae737fb25d5a
üst 8fad6d99
...@@ -31,7 +31,7 @@ export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons- ...@@ -31,7 +31,7 @@ export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-
export APACHE_COMMONS_HTTPCLIENT_TARBALL := 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz export APACHE_COMMONS_HTTPCLIENT_TARBALL := 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
export APACHE_COMMONS_LANG_TARBALL := 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz export APACHE_COMMONS_LANG_TARBALL := 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
export APACHE_COMMONS_LOGGING_TARBALL := 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz export APACHE_COMMONS_LOGGING_TARBALL := 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
export BOOST_TARBALL := 15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2 export BOOST_TARBALL := d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
export BSH_TARBALL := ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz export BSH_TARBALL := ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
......
...@@ -47,6 +47,8 @@ boost_patches += boost.wshadow.patch ...@@ -47,6 +47,8 @@ boost_patches += boost.wshadow.patch
boost_patches += boost.wdeprecated-register.patch.0 boost_patches += boost.wdeprecated-register.patch.0
boost_patches += boost.wuninitialized.patch boost_patches += boost.wuninitialized.patch
boost_patches += boost.wdeprecated-auto_ptr.patch.0 boost_patches += boost.wdeprecated-auto_ptr.patch.0
#https://svn.boost.org/trac/boost/ticket/9397
boost_patches += boost.9397.warnings.patch.0
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
......
Index: boost/predef/os/bsd/bsdi.h
===================================================================
--- boost/predef/os/bsd/bsdi.h (revision 86709)
+++ boost/predef/os/bsd/bsdi.h (working copy)
@@ -24,7 +24,7 @@
#define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__bsdi__) \
)
# ifndef BOOST_OS_BSD_AVAILABLE
Index: boost/predef/os/bsd/dragonfly.h
===================================================================
--- boost/predef/os/bsd/dragonfly.h (revision 86709)
+++ boost/predef/os/bsd/dragonfly.h (working copy)
@@ -24,7 +24,7 @@
#define BOOST_OS_BSD_DRAGONFLY BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__DragonFly__) \
)
# ifndef BOOST_OS_BSD_AVAILABLE
Index: boost/predef/os/bsd/free.h
===================================================================
--- boost/predef/os/bsd/free.h (revision 86709)
+++ boost/predef/os/bsd/free.h (working copy)
@@ -26,7 +26,7 @@
#define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__FreeBSD__) \
)
# ifndef BOOST_OS_BSD_AVAILABLE
Index: boost/predef/os/bsd/net.h
===================================================================
--- boost/predef/os/bsd/net.h (revision 86709)
+++ boost/predef/os/bsd/net.h (working copy)
@@ -31,7 +31,7 @@
#define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__NETBSD__) || defined(__NetBSD__) \
)
# ifndef BOOST_OS_BSD_AVAILABLE
Index: boost/predef/os/bsd/open.h
===================================================================
--- boost/predef/os/bsd/open.h (revision 86709)
+++ boost/predef/os/bsd/open.h (working copy)
@@ -55,7 +55,7 @@
#define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__OpenBSD__) \
)
# ifndef BOOST_OS_BSD_AVAILABLE
Index: boost/predef/os/bsd.h
===================================================================
--- boost/predef/os/bsd.h (revision 86709)
+++ boost/predef/os/bsd.h (working copy)
@@ -59,7 +59,7 @@
#define BOOST_OS_BSD BOOST_VERSION_NUMBER_NOT_AVAILABLE
#endif
-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(BSD) || \
defined(_SYSTYPE_BSD) \
)
Index: boost/predef/os/macos.h
===================================================================
--- boost/predef/os/macos.h (revision 86709)
+++ boost/predef/os/macos.h (working copy)
@@ -31,7 +31,7 @@
#define BOOST_OS_MACOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(macintosh) || defined(Macintosh) || \
(defined(__APPLE__) && defined(__MACH__)) \
)
--- foo/foo/foo/boost/detail/endian.hpp --- foo/foo/foo/boost/predef/other/endian.h
+++ foo/foo/foo/boost/detail/endian.hpp +++ foo/foo/foo/boost/predef/other/endian.h
@@ -28,8 +28,8 @@ @@ -53,7 +53,7 @@
// */
// Special cases come first: #if !BOOST_ENDIAN_BIG_BYTE && !BOOST_ENDIAN_BIG_WORD && \
// !BOOST_ENDIAN_LITTLE_BYTE && !BOOST_ENDIAN_LITTLE_WORD
-#if defined (__GLIBC__) -# if BOOST_LIB_C_GNU
-// GNU libc offers the helpful header <endian.h> which defines +# if BOOST_LIB_C_GNU || defined(__ANDROID__)
+#if defined (__GLIBC__) || defined(__ANDROID__)
+// GNU libc and Android's bionic offer the helpful header <endian.h> which defines
// __BYTE_ORDER
# include <endian.h> # include <endian.h>
# if (__BYTE_ORDER == __LITTLE_ENDIAN) # else
# if BOOST_OS_MACOS
--- foo/foo/foo/boost/config/compiler/clang.hpp --- foo/foo/foo/boost/config/compiler/clang.hpp
+++ foo/foo/foo/boost/config/compiler/clang.hpp +++ foo/foo/foo/boost/config/compiler/clang.hpp
@@ -8,6 +8,8 @@ @@ -10,6 +10,8 @@
// Clang compiler setup. #define BOOST_HAS_PRAGMA_ONCE
+#include <utility> +#include <utility>
+ +
#if !__has_feature(cxx_exceptions) && !defined(BOOST_NO_EXCEPTIONS) #if !__has_feature(cxx_exceptions) && !defined(BOOST_NO_EXCEPTIONS)
# define BOOST_NO_EXCEPTIONS # define BOOST_NO_EXCEPTIONS
#endif #endif
@@ -108,7 +108,7 @@ @@ -128,7 +130,7 @@
# define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX # define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#endif #endif
......
--- foo/foo/foo/boost/math/special_functions/detail/bessel_jy_series.hpp
+++ foo/foo/foo/boost/math/special_functions/detail/bessel_jy_series.hpp
@@ -194,9 +194,9 @@
}
else
{
- int s;
- prefix = boost::math::lgamma(-v, &s, pol) + p;
- prefix = exp(prefix) * s / constants::pi<T>();
+ int s_lcl;
+ prefix = boost::math::lgamma(-v, &s_lcl, pol) + p;
+ prefix = exp(prefix) * s_lcl / constants::pi<T>();
}
bessel_y_small_z_series_term_b<T, Policy> s2(v, x);
max_iter = policies::get_max_series_iterations<Policy>();
--- foo/foo/foo/boost/math/special_functions/ellint_rj.hpp
+++ foo/foo/foo/boost/math/special_functions/ellint_rj.hpp
@@ -91,11 +91,11 @@
BOOST_ASSERT(pmy >= 0);
- T p = pmy + y;
- value = boost::math::ellint_rj(x, y, z, p, pol);
+ T p_lcl = pmy + y;
+ value = boost::math::ellint_rj(x, y, z, p_lcl, pol);
value *= pmy;
value -= 3 * boost::math::ellint_rf(x, y, z, pol);
- value += 3 * sqrt((x * y * z) / (x * z + p * q)) * boost::math::ellint_rc(x * z + p * q, p * q, pol);
+ value += 3 * sqrt((x * y * z) / (x * z + p_lcl * q)) * boost::math::ellint_rc(x * z + p_lcl * q, p_lcl * q, pol);
value /= (y + q);
return value;
}
--- foo/foo/foo/boost/random/binomial_distribution.hpp --- foo/foo/foo/boost/random/binomial_distribution.hpp
+++ foo/foo/foo/boost/random/binomial_distribution.hpp +++ foo/foo/foo/boost/random/binomial_distribution.hpp
@@ -272,21 +272,21 @@ @@ -272,21 +272,21 @@
......
--- foo/foo/foo/boost/detail/endian.hpp --- foo/foo/foo/boost/predef/other/endian.h
+++ foo/foo/foo/boost/detail/endian.hpp +++ foo/foo/foo/boost/predef/other/endian.h
@@ -47,15 +47,15 @@ @@ -77,7 +77,7 @@
# define BOOST_LITTLE_ENDIAN # undef BOOST_ENDIAN_LITTLE_BYTE
# elif (__BYTE_ORDER == __BIG_ENDIAN) # define BOOST_ENDIAN_LITTLE_BYTE BOOST_VERSION_NUMBER_AVAILABLE
# define BOOST_BIG_ENDIAN # endif
-# elif (__BYTE_ORDER == __PDP_ENDIAN) -# if (__BYTE_ORDER == __PDP_ENDIAN)
+# elif defined(__PDP_ENDIAN) && (__BYTE_ORDER == __PDP_ENDIAN) +# if defined(__PDP_ENDIAN) && (__BYTE_ORDER == __PDP_ENDIAN)
# define BOOST_PDP_ENDIAN # undef BOOST_ENDIAN_LITTLE_WORD
# else # define BOOST_ENDIAN_LITTLE_WORD BOOST_VERSION_NUMBER_AVAILABLE
# error Unknown machine endianness detected.
# endif # endif
# define BOOST_BYTE_ORDER __BYTE_ORDER
#elif defined(__NetBSD__) || defined(__FreeBSD__) || \
- defined(__OpenBSD__) || (__DragonFly__)
+ defined(__OpenBSD__) || (defined(__DragonFly__) && (__DragonFly__))
//
// BSD has endian.h, see https://svn.boost.org/trac/boost/ticket/6013
# if defined(__OpenBSD__)
--- foo/foo/foo/boost/lexical_cast.hpp
+++ foo/foo/foo/boost/lexical_cast.hpp
@@ -69,7 +69,7 @@
throw_exception(bad_lexical_cast(typeid(Source), typeid(Target)))
#endif
-#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
+#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || (defined(GCC_VERSION) && GCC_VERSION > 40700)
#define BOOST_LCAST_HAS_INT128
#endif
--- foo/foo/foo/boost/multi_array/base.hpp --- foo/foo/foo/boost/multi_array/base.hpp
+++ foo/foo/foo/boost/multi_array/base.hpp +++ foo/foo/foo/boost/multi_array/base.hpp
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
......
--- foo/foo/foo/boost/math/special_functions/airy.hpp
+++ foo/foo/foo/boost/math/special_functions/airy.hpp
@@ -340,13 +340,6 @@
inline T airy_ai_zero(unsigned m, const Policy& pol)
{
BOOST_FPU_EXCEPTION_GUARD
- typedef typename policies::evaluation<T, Policy>::type value_type;
- typedef typename policies::normalise<
- Policy,
- policies::promote_float<false>,
- policies::promote_double<false>,
- policies::discrete_quantile<>,
- policies::assert_undefined<> >::type forwarding_policy;
BOOST_STATIC_ASSERT_MSG(false == std::numeric_limits<T>::is_integer, "Airy return type must be a floating-point type.");
return policies::checked_narrowing_cast<T, Policy>(detail::airy_ai_zero_imp<T>(m, pol), "boost::math::airy_ai_zero<%1%>(unsigned)");
}
@@ -388,13 +381,6 @@
inline T airy_bi_zero(unsigned m, const Policy& pol)
{
BOOST_FPU_EXCEPTION_GUARD
- typedef typename policies::evaluation<T, Policy>::type value_type;
- typedef typename policies::normalise<
- Policy,
- policies::promote_float<false>,
- policies::promote_double<false>,
- policies::discrete_quantile<>,
- policies::assert_undefined<> >::type forwarding_policy;
BOOST_STATIC_ASSERT_MSG(false == std::numeric_limits<T>::is_integer, "Airy return type must be a floating-point type.");
return policies::checked_narrowing_cast<T, Policy>(detail::airy_bi_zero_imp<T>(m, pol), "boost::math::airy_bi_zero<%1%>(unsigned)");
}
--- foo/foo/foo/boost/multi_array/base.hpp --- foo/foo/foo/boost/multi_array/base.hpp
+++ foo/foo/foo/boost/multi_array/base.hpp +++ foo/foo/foo/boost/multi_array/base.hpp
@@ -501,6 +501,7 @@ @@ -501,6 +501,7 @@
......
--- misc/boost_1_44_0/boost/math/tools/fraction.hpp
+++ misc/build/boost_1_44_0/boost/math/tools/fraction.hpp
@@ -33,7 +33,7 @@
typedef typename Gen::result_type result_type;
typedef typename Gen::result_type value_type;
- static result_type a(const value_type& v)
+ static result_type a(const value_type&)
{
return 1;
}
--- misc/boost_1_44_0/boost/random/lagged_fibonacci.hpp --- misc/boost_1_44_0/boost/random/lagged_fibonacci.hpp
+++ misc/build/boost_1_44_0/boost/random/lagged_fibonacci.hpp +++ misc/build/boost_1_44_0/boost/random/lagged_fibonacci.hpp
@@ -16,6 +16,12 @@ @@ -16,6 +16,12 @@
......
--- a/b/boost/boost/math/special_functions/beta.hpp 2013-05-31 18:12:02.036007347 +0200
+++ a/b/boost/boost/math/special_functions/beta.hpp 2013-05-31 18:11:56.260996218 +0200
@@ -1331,7 +1331,6 @@
BOOST_FPU_EXCEPTION_GUARD
typedef typename tools::promote_args<RT1, RT2, RT3>::type result_type;
typedef typename policies::evaluation<result_type, Policy>::type value_type;
- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
typedef typename policies::normalise<
Policy,
policies::promote_float<false>,
@@ -1349,7 +1348,6 @@
BOOST_FPU_EXCEPTION_GUARD
typedef typename tools::promote_args<RT1, RT2, RT3>::type result_type;
typedef typename policies::evaluation<result_type, Policy>::type value_type;
- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
typedef typename policies::normalise<
Policy,
policies::promote_float<false>,
--- a/b/boost/boost/random/generate_canonical.hpp 2013-05-31 18:13:09.804149686 +0200 --- a/b/boost/boost/random/generate_canonical.hpp 2013-05-31 18:13:09.804149686 +0200
+++ a/b/boost/boost/random/generate_canonical.hpp 2013-05-31 18:13:30.020195845 +0200 +++ a/b/boost/boost/random/generate_canonical.hpp 2013-05-31 18:13:30.020195845 +0200
@@ -55,7 +55,6 @@ @@ -55,7 +55,6 @@
...@@ -82,17 +62,6 @@ ...@@ -82,17 +62,6 @@
d = from_stream(beg, eos); d = from_stream(beg, eos);
return is; return is;
} }
--- a/b/boost/boost/unordered/detail/unique.hpp 2013-05-31 13:32:51.122254361 +0200
+++ a/b/boost/boost/unordered/detail/unique.hpp 2013-05-31 13:32:57.578278121 +0200
@@ -334,8 +334,6 @@
value_type& operator[](key_type const& k)
{
- typedef typename value_type::second_type mapped_type;
-
std::size_t key_hash = this->hash(k);
iterator pos = this->find_node(key_hash, k);
--- a/b/boost/boost/tuple/detail/tuple_basic.hpp 2013-05-31 13:31:21.682966336 +0200 --- a/b/boost/boost/tuple/detail/tuple_basic.hpp 2013-05-31 13:31:21.682966336 +0200
+++ a/b/boost/boost/tuple/detail/tuple_basic.hpp 2013-05-31 13:32:44.067231648 +0200 +++ a/b/boost/boost/tuple/detail/tuple_basic.hpp 2013-05-31 13:32:44.067231648 +0200
@@ -225,7 +225,6 @@ @@ -225,7 +225,6 @@
...@@ -103,48 +72,6 @@ ...@@ -103,48 +72,6 @@
return impl::call(c).head; return impl::call(c).head;
} }
--- misc/boost_1_44_0/boost/algorithm/string/detail/finder.hpp
+++ misc/build/boost_1_44_0/boost/algorithm/string/detail/finder.hpp
@@ -142,7 +142,6 @@
ForwardIteratorT End,
std::forward_iterator_tag ) const
{
- typedef ForwardIteratorT input_iterator_type;
typedef iterator_range<ForwardIteratorT> result_type;
first_finder_type first_finder(
@@ -263,7 +262,6 @@
ForwardIteratorT End,
unsigned int N) const
{
- typedef ForwardIteratorT input_iterator_type;
typedef iterator_range<ForwardIteratorT> result_type;
// Sanity check
@@ -298,7 +296,6 @@
ForwardIteratorT End,
unsigned int N) const
{
- typedef ForwardIteratorT input_iterator_type;
typedef iterator_range<ForwardIteratorT> result_type;
// Sanity check
@@ -362,7 +359,6 @@
unsigned int N,
std::random_access_iterator_tag )
{
- typedef ForwardIteratorT input_iterator_type;
typedef iterator_range<ForwardIteratorT> result_type;
if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
@@ -436,7 +432,6 @@
unsigned int N,
std::random_access_iterator_tag )
{
- typedef ForwardIteratorT input_iterator_type;
typedef iterator_range<ForwardIteratorT> result_type;
if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
--- misc/boost_1_44_0/boost/bind/arg.hpp --- misc/boost_1_44_0/boost/bind/arg.hpp
+++ misc/build/boost_1_44_0/boost/bind/arg.hpp +++ misc/build/boost_1_44_0/boost/bind/arg.hpp
@@ -35,6 +35,8 @@ @@ -35,6 +35,8 @@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment