Kaydet (Commit) 82e38339 authored tarafından Mike Kaganski's avatar Mike Kaganski

bridges: MSVC: pragma warning: make more specific, remove obsolete

Change-Id: Ib13f198e5941a33a9a8d1091c8ceb48e273f00cc
Reviewed-on: https://gerrit.libreoffice.org/48949Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst 0b3ecd90
...@@ -21,9 +21,7 @@ ...@@ -21,9 +21,7 @@
#if !defined WIN32_LEAN_AND_MEAN #if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif #endif
#pragma warning(push,1) // disable warnings within system headers
#include <windows.h> #include <windows.h>
#pragma warning(pop)
void dso_init(); void dso_init();
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
*/ */
#pragma warning( disable : 4237 )
#include <sal/config.h> #include <sal/config.h>
#include <malloc.h> #include <malloc.h>
#include <typeinfo.h> #include <typeinfo.h>
......
...@@ -22,9 +22,7 @@ ...@@ -22,9 +22,7 @@
#if !defined WIN32_LEAN_AND_MEAN #if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif #endif
#pragma warning(push, 1)
#include <windows.h> #include <windows.h>
#pragma warning(pop)
#include "rtl/ustring.hxx" #include "rtl/ustring.hxx"
......
...@@ -18,10 +18,8 @@ ...@@ -18,10 +18,8 @@
*/ */
#pragma warning(push,1) // disable warnings within system headers
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#pragma warning(pop)
#include <cppinterfaceproxy.hxx> #include <cppinterfaceproxy.hxx>
......
...@@ -234,7 +234,6 @@ void ...@@ -234,7 +234,6 @@ void
#endif // 0 #endif // 0
#pragma warning( disable : 4237 )
#include <sal/config.h> #include <sal/config.h>
#include <memory> #include <memory>
......
...@@ -19,10 +19,8 @@ ...@@ -19,10 +19,8 @@
#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_MSVC_WIN32_X86_64_MSCX_HXX #ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_MSVC_WIN32_X86_64_MSCX_HXX
#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_MSVC_WIN32_X86_64_MSCX_HXX #define INCLUDED_BRIDGES_SOURCE_CPP_UNO_MSVC_WIN32_X86_64_MSCX_HXX
#pragma warning(push, 1)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#pragma warning(pop)
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
......
...@@ -45,13 +45,7 @@ ...@@ -45,13 +45,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#elif defined _WIN32 #elif defined _WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#ifdef _MSC_VER
#pragma warning(push,1) // disable warnings within system headers
#endif
#include <windows.h> #include <windows.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#else #else
#error Unsupported platform #error Unsupported platform
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment