diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-11-05 08:12:56 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-11-05 10:09:24 +0100 |
| commit | d7f64593db4afdf2a7e77ca9147f6495e69912fd (patch) | |
| tree | e8488c24fc7e62a43948a90c7debccc6a2842227 /unotools | |
| parent | 7190e6f114eccd921e6cb6beef793b053cf50856 (diff) | |
The std::auto_ptr workarounds should only be necessary for Boost < 1.67.0
...see the commit message of f8b10b76bc3000eab3269de4472d6c28bd308059 "The
std::auto_ptr workarounds should no longer be necessary" for details. (The
removed settings in 52a26b146542526dc4f6bb193ffb4fd95e4f79fd "fix
unotools/source/i18n/resmgr.cxx build with PCH on Mac" might still theoretically
be necessary for macOS and Windows builds against the baseline Boost 1.66.0, but
it is unlikely that anybody does such builds against anything other than our
Boost 1.76.0 exteranl/boost, anyway.)
Change-Id: I7a5cdc72e76c695b220353b02368623383dcd8a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124725
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/Library_utl.mk | 7 | ||||
| -rw-r--r-- | unotools/source/i18n/resmgr.cxx | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 66c08480db69..07603acb5213 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -90,6 +90,7 @@ $(eval $(call gb_Library_add_exception_objects,utl,\ unotools/source/i18n/intlwrapper \ unotools/source/i18n/localedatawrapper \ unotools/source/i18n/nativenumberwrapper \ + unotools/source/i18n/resmgr \ unotools/source/i18n/textsearch \ unotools/source/i18n/transliterationwrapper \ unotools/source/misc/closeveto \ @@ -116,10 +117,4 @@ $(eval $(call gb_Library_add_exception_objects,utl,\ unotools/source/ucbhelper/xtempfile \ )) -# see the source file -$(eval $(call gb_Library_add_exception_objects,utl,\ - unotools/source/i18n/resmgr, \ - -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR= -D_HAS_AUTO_PTR_ETC=1 \ -)) - # vim: set noet sw=4 ts=4: diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx index 62991153f01c..a10b4710ad8d 100644 --- a/unotools/source/i18n/resmgr.cxx +++ b/unotools/source/i18n/resmgr.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <boost/version.hpp> +#if BOOST_VERSION < 106700 // 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: @@ -26,6 +28,7 @@ #elif defined _MSC_VER #define _HAS_AUTO_PTR_ETC 1 #endif +#endif #include <sal/config.h> |