[Libreoffice-commits] core.git: jvmfwk/plugins jvmfwk/source

[Mike Kaganski]

 jvmfwk/plugins/sunmajor/pluginlib/util.cxx |    6 ------
 jvmfwk/source/fwkutil.cxx                  |    6 ------
 2 files changed, 12 deletions(-)

New commits:
commit 94a5665ef3c0fa594048dd425772c4be29d9d7da
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 31 16:16:37 2018 +0300

    jvmfwk: MSVC: pragma warning: make more specific, remove obsolete
    
    Change-Id: Ibb69ba9c994e44c162318e40c4469c311309f326
    Reviewed-on: https://gerrit.libreoffice.org/48996
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index fd6680ae07e1..fb6ec2ba6eb4 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -39,16 +39,10 @@
 #include <map>
 
 #if defined(_WIN32)
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #if !defined WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 #endif
 #include <string.h>
 
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 3d0a2ac22804..e8c13021ce48 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -19,16 +19,10 @@
 
 
 #if defined(_WIN32)
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #if !defined WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 #endif
 
 #include <string>