summaryrefslogtreecommitdiffstats
path: root/filter/Library_svgfilter.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2018-01-19 21:23:51 +0100
committerMichael Stahl <mstahl@redhat.com>2018-01-22 20:08:05 +0100
commit61c88ae6945c241f5f2aeb844eeca0776b487132 (patch)
treee36c2dcfd7917a779e17e840071a836bcb944184 /filter/Library_svgfilter.mk
parentsw: add an assert wrt. recent bug in SwHTMLParser::SplitAttrTab() (diff)
downloadcore-61c88ae6945c241f5f2aeb844eeca0776b487132.tar.gz
core-61c88ae6945c241f5f2aeb844eeca0776b487132.zip
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 'filter/Library_svgfilter.mk')
-rw-r--r--filter/Library_svgfilter.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index b8e52c73d9fe..e0d8ff37ccce 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -29,6 +29,13 @@ $(eval $(call gb_Library_add_defs,svgfilter,\
-DFILTER_DLLIMPLEMENTATION \
))
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_defs,svgfilter,\
+ -D_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING \
+ -D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING \
+))
+endif
+
$(eval $(call gb_Library_set_include,svgfilter,\
$$(INCLUDE) \
-I$(SRCDIR)/filter/inc \