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_1_59_0.mpl.config.wundef.patch | |
| parent | starmath: these constans are local and static (diff) | |
| download | core-5f321b5011c619e88e19018ff05ed3ca2cdd5851.tar.gz core-5f321b5011c619e88e19018ff05ed3ca2cdd5851.zip | |
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_1_59_0.mpl.config.wundef.patch')
| -rw-r--r-- | external/boost/boost_1_59_0.mpl.config.wundef.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/external/boost/boost_1_59_0.mpl.config.wundef.patch b/external/boost/boost_1_59_0.mpl.config.wundef.patch new file mode 100644 index 000000000000..2826cfc2b6c4 --- /dev/null +++ b/external/boost/boost_1_59_0.mpl.config.wundef.patch @@ -0,0 +1,11 @@ +diff -ru boost.orig/boost/mpl/aux_/config/operators.hpp boost/boost/mpl/aux_/config/operators.hpp +--- foo/misc/boost.orig/boost/mpl/aux_/config/operators.hpp 2015-07-19 11:20:40.015955021 +0200 ++++ foo/misc/boost/boost/mpl/aux_/config/operators.hpp 2015-07-19 11:33:14.342946543 +0200 +@@ -24,7 +24,6 @@ + || BOOST_WORKAROUND(__EDG_VERSION__, <= 245) \ + || BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, <= 0x0295) \ + || BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600)) \ +- || BOOST_WORKAROUND(__NVCC__, BOOST_TESTED_AT(1)) \ + ) + + # define BOOST_MPL_CFG_USE_OPERATORS_OVERLOADING |