diff options
| author | Michael Stahl <mstahl@redhat.com> | 2018-01-19 21:23:51 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-01-22 20:08:05 +0100 |
| commit | 61c88ae6945c241f5f2aeb844eeca0776b487132 (patch) | |
| tree | e36c2dcfd7917a779e17e840071a836bcb944184 /sdext | |
| parent | 0b1f8cb4a7eca3ab5b55c1866ef2761398d1ae95 (diff) | |
gbuild: always compile as C++17 with MSVC 2017
The current update MSVC 2017.5 supports fancy new C++ features, but
unfortunately in its default C++14 mode it falls over and dies with
an internal compiler error as soon as it sees the WeakImplHelper
variadic template.
In order to work around the ICE, build everything as C++17,
which somehow doesn't crash.
This causes loads of deprecation warnings about obsolete std::this
and badly designed std::that, almost all of them from boost headers,
which are well known for following every best practice in the C++ book.
Liberally sprinkle macros around to suppress the warnings for now,
like we already do with the other million warnings from boost headers.
Change-Id: Ia6b6ef5e457b5fe3c8cfe361ba5da39376bb7c4c
Reviewed-on: https://gerrit.libreoffice.org/48225
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/Library_pdfimport.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk index 854f00c49248..7c11d36e42ba 100644 --- a/sdext/Library_pdfimport.mk +++ b/sdext/Library_pdfimport.mk @@ -35,6 +35,12 @@ $(eval $(call gb_Library_use_externals,pdfimport,\ $(if $(filter-out WNT MACOSX,$(OS)),fontconfig) \ )) +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_defs,pdfimport, \ + -D_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING \ +)) +endif + $(eval $(call gb_Library_add_defs,pdfimport, \ -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ -DBOOST_ALL_NO_LIB \ |