diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 09:07:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 11:07:56 +0100 |
commit | 3d79f0ff9eedec74a131796016add94f4a1be02d (patch) | |
tree | 82ce3868d861544691e3600a866eab87e5530d04 | |
parent | 74816dd665fb2980823e01f81446147fe7fe6688 (diff) |
Clang (and GCC) always has __cplusplus >= C++17 now
...after 665ac8f32d3aaaf7c27e8976e14fd4819edbf79b "All supported versions of
Clang and GCC support at least C++17 now". And even if __cplusplus might still
be < 201703L for old versions that only support -std=c++1z and not -std=c++17,
this #if should probably be enabled for those too.
(MSVC will first need adding /Zc:__cplusplus before it has a correct __cplusplus
value.)
Change-Id: If932b293d66e704357b10836839d221634bb1a3b
Reviewed-on: https://gerrit.libreoffice.org/64751
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r-- | unotools/source/i18n/resmgr.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx index 8d4fcb5eac33..be66f9445816 100644 --- a/unotools/source/i18n/resmgr.cxx +++ b/unotools/source/i18n/resmgr.cxx @@ -21,7 +21,7 @@ // 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 +#if HAVE_LIBCXX #define _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR #elif defined _MSC_VER && __cplusplus >= 201703L #define _HAS_AUTO_PTR_ETC 1 |