[Libreoffice-commits] core.git: extensions/source include/comphelper solenv/gbuild

[Stephan Bergmann]

 extensions/source/ole/servprov.cxx        |    3 ---
 extensions/source/ole/unoobjw.cxx         |    3 ---
 include/comphelper/windowsdebugoutput.hxx |    5 -----
 solenv/gbuild/platform/com_MSC_defs.mk    |    1 +
 4 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit d098fb74df7c11bbfa8103ec8c7c89652b07bfc4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 1 14:59:01 2018 +0200

    Improve handling of _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
    
    _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING turned into a global
    -D..., same as existing
    _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING.
    
    Change-Id: Ifefdc930a1d3ecf5366523dea509bfaca1f4e002
    Reviewed-on: https://gerrit.libreoffice.org/55188
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index f0ebc858f841..729f858d191a 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-// See https://blogs.msdn.microsoft.com/vcblog/2017/12/08/c17-feature-removals-and-deprecations/
-#define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING 1
-
 #include <vector>
 
 #include "ole2uno.hxx"
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index f355b261566c..18ae4215ed5b 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -22,9 +22,6 @@
 // https://www.codeproject.com/Articles/9014/Understanding-COM-Event-Handling
 // https://blogs.msdn.microsoft.com/ericlippert/2005/02/15/why-does-wscript-connectobject-not-always-work/
 
-// See https://blogs.msdn.microsoft.com/vcblog/2017/12/08/c17-feature-removals-and-deprecations/
-#define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING 1
-
 #include "ole2uno.hxx"
 
 #include <stdio.h>
diff --git a/include/comphelper/windowsdebugoutput.hxx b/include/comphelper/windowsdebugoutput.hxx
index 059dc1358015..b42808ba4ada 100644
--- a/include/comphelper/windowsdebugoutput.hxx
+++ b/include/comphelper/windowsdebugoutput.hxx
@@ -15,11 +15,6 @@
 #ifndef INCLUDED_COMPHELPER_WINDOWSDEBUGOUTPUT_HXX
 #define INCLUDED_COMPHELPER_WINDOWSDEBUGOUTPUT_HXX
 
-// If you get a warning about <codecvt> being deprecated from VS2017, you need to add a "#define
-// _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING 1" to your source file before any #include
-// statements. It would not be enough to have that here. See
-// https://blogs.msdn.microsoft.com/vcblog/2017/12/08/c17-feature-removals-and-deprecations/
-
 #include <codecvt>
 #include <iomanip>
 #include <ostream>
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 67fa66d511dc..d626db4c0ff9 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -48,6 +48,7 @@ gb_COMPILERDEFS := \
 	-DBOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE \
 	-DBOOST_SYSTEM_NO_DEPRECATED \
 	-D_HAS_AUTO_PTR_ETC \
+	-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING \
 	-D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \
 	-D_CRT_NON_CONFORMING_SWPRINTFS \
 	-D_CRT_NONSTDC_NO_DEPRECATE \