diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-12-05 21:40:04 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-12-06 07:26:31 +0100 |
| commit | 90d2155912bcee40377620d4836726041a72d537 (patch) | |
| tree | 4a83922ab7dd3a15bfccf0ad48ffd41651785742 /unotools/source | |
| parent | Remove CXXFLAGS_CXX11 from Clang plugin compilation (diff) | |
| download | core-90d2155912bcee40377620d4836726041a72d537.tar.gz core-90d2155912bcee40377620d4836726041a72d537.zip | |
Work around latest Boost 1.65.1 still using deprecated std::auto_ptr
...in various places, which is gone by default at least from recent libc++ in
C++17 mode. So bring it back there for now, until Boost is fixed.
Change-Id: I0b3128d114ab2b5693a84bdc7d2b9b9b9b5c3c76
Reviewed-on: https://gerrit.libreoffice.org/45910
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'unotools/source')
| -rw-r--r-- | unotools/source/i18n/resmgr.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx index a0ad625f7aff..99b27cd7bbbf 100644 --- a/unotools/source/i18n/resmgr.cxx +++ b/unotools/source/i18n/resmgr.cxx @@ -17,6 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +// Needed when #include <boost/locale.hpp> below includes Boost 1.65.1 +// workdir/UnpackedTarball/boost/boost/locale/format.hpp using "std::auto_ptr<data> d;", but must +// come very early here in case <memory> is already (indirectly) included earlier: +#include <config_libcxx.h> +#if HAVE_LIBCXX && __cplusplus >= 201703L +#define _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR +#endif + #include <config_folders.h> #include <sal/config.h> |