summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-07-25 18:55:06 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-07-25 22:44:56 +0200
commitd77e1cf718e004fd24976c3c30c8f03ba3eeddfb (patch)
tree0a277fac275eef49adeaa9c6b29e9cbdb8791728 /solenv
parent18d1492a907e7e72b0351d6b347e7d0dd2cd30f1 (diff)
Silence warning STL4014
"std::result_of and std::result_of_t are deprecated in C++17", as issued (with clang-cl) in slideshow/source/engine/eventmultiplexer.cxx Change-Id: I0f7a6ab98fbaf2a5e4d2aebf2e4af0ecc21075f8 Reviewed-on: https://gerrit.libreoffice.org/58002 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/com_MSC_defs.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index d626db4c0ff9..538bf2d90d45 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -50,6 +50,7 @@ gb_COMPILERDEFS := \
-D_HAS_AUTO_PTR_ETC \
-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING \
-D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \
+ -D_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING \
-D_CRT_NON_CONFORMING_SWPRINTFS \
-D_CRT_NONSTDC_NO_DEPRECATE \
-D_CRT_SECURE_NO_DEPRECATE \