diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-07-15 08:24:22 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-30 15:24:45 +0200 |
| commit | 5f321b5011c619e88e19018ff05ed3ca2cdd5851 (patch) | |
| tree | dec6a29d9b77a6f704965c90b173722ce3d844c7 /external/boost/boost.random.Wunused-local-typedefs.warnings.patch | |
| parent | d62e6476ce6589ef2c014229a6fb2aa2116ce641 (diff) | |
Bump boost to 1.59
1.59 upcoming release is needed for MSVC 14.0 (aka VS 2015) support.
There is a known breakage on MSVC with boost::none instance in
optional library. Use not documented define as explained in this
issue upstream [1]: BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE.
[1] https://svn.boost.org/trac/boost/ticket/11203
Change-Id: I25b1797da93f7959d15a70105d67100e0e2c4b3b
Reviewed-on: https://gerrit.libreoffice.org/17056
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'external/boost/boost.random.Wunused-local-typedefs.warnings.patch')
| -rw-r--r-- | external/boost/boost.random.Wunused-local-typedefs.warnings.patch | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/external/boost/boost.random.Wunused-local-typedefs.warnings.patch b/external/boost/boost.random.Wunused-local-typedefs.warnings.patch index 7d4874217e56..73f8c0b84d8c 100644 --- a/external/boost/boost.random.Wunused-local-typedefs.warnings.patch +++ b/external/boost/boost.random.Wunused-local-typedefs.warnings.patch @@ -1,20 +1,11 @@ ---- 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 -@@ -55,7 +55,6 @@ - using std::floor; - BOOST_ASSERT((g.min)() == 0); - BOOST_ASSERT((g.max)() == 1); +diff -ru boost.orig/boost/random/generate_canonical.hpp boost/boost/random/generate_canonical.hpp +--- a/b/boost.orig/boost/random/generate_canonical.hpp 2015-02-27 18:44:45.000000000 +0100 ++++ a/b/boost/boost/random/generate_canonical.hpp 2015-07-18 21:55:44.152972440 +0200 +@@ -32,7 +32,6 @@ + RealType generate_canonical_impl(URNG& g, boost::mpl::true_ /*is_integral*/) + { + using std::pow; - typedef typename URNG::result_type base_result; std::size_t digits = std::numeric_limits<RealType>::digits; - std::size_t engine_bits = detail::generator_bits<URNG>::value(); - std::size_t b = (std::min)(bits, digits); ---- a/b/boost/boost/random/uniform_real_distribution.hpp 2013-05-31 18:15:04.571429634 +0200 -+++ a/b/boost/boost/random/uniform_real_distribution.hpp 2013-05-31 18:14:28.452337186 +0200 -@@ -36,7 +36,6 @@ - { - for(;;) { - typedef T result_type; -- typedef typename Engine::result_type base_result; - result_type numerator = static_cast<T>(eng() - (eng.min)()); - result_type divisor = static_cast<T>((eng.max)() - (eng.min)()); - BOOST_ASSERT(divisor > 0); + RealType R = RealType((g.max)()) - RealType((g.min)()) + 1; + RealType mult = R; |