[Libreoffice-commits] core.git: solenv/gbuild

Wed Jul 25 20:45:22 UTC 2018

solenv/gbuild/platform/com_MSC_defs.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit d77e1cf718e004fd24976c3c30c8f03ba3eeddfb
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jul 25 18:55:06 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 25 22:44:56 2018 +0200

    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 at redhat.com>

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 \
