diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-01-31 10:10:54 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-01-31 21:02:42 +0100 |
| commit | 82e3833995d28b3a05ad539d331b47b210d1611f (patch) | |
| tree | 2df9e2eb7d253ce10accc6e6988a8dbe9ee7444c /bridges/source | |
| parent | 0b3ecd909ca337d920cca412d9813851ace55da1 (diff) | |
bridges: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Ib13f198e5941a33a9a8d1091c8ceb48e273f00cc
Reviewed-on: https://gerrit.libreoffice.org/48949
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'bridges/source')
7 files changed, 0 insertions, 16 deletions
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx b/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx index 497c4fbe6347..f65ef74ba4e5 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx @@ -21,9 +21,7 @@ #if !defined WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif -#pragma warning(push,1) // disable warnings within system headers #include <windows.h> -#pragma warning(pop) void dso_init(); diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index 656dab7aa323..3ce8f5c50db9 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -18,7 +18,6 @@ */ -#pragma warning( disable : 4237 ) #include <sal/config.h> #include <malloc.h> #include <typeinfo.h> diff --git a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx index 57f51f2d6bce..fd32db740b2a 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx @@ -22,9 +22,7 @@ #if !defined WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif -#pragma warning(push, 1) #include <windows.h> -#pragma warning(pop) #include "rtl/ustring.hxx" diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx index 31c7b34ac64e..8517f0c72674 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx @@ -18,10 +18,8 @@ */ -#pragma warning(push,1) // disable warnings within system headers #define WIN32_LEAN_AND_MEAN #include <windows.h> -#pragma warning(pop) #include <cppinterfaceproxy.hxx> diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index 02d78d740e80..86753103a751 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -234,7 +234,6 @@ void #endif // 0 -#pragma warning( disable : 4237 ) #include <sal/config.h> #include <memory> diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx index b51f6b7e4bcc..f2ccfbf4ab44 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx @@ -19,10 +19,8 @@ #ifndef 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 #include <windows.h> -#pragma warning(pop) #include <rtl/ustring.hxx> diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index 56669a258680..2c289ea58657 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -45,13 +45,7 @@ #include <sys/mman.h> #elif defined _WIN32 #define WIN32_LEAN_AND_MEAN -#ifdef _MSC_VER -#pragma warning(push,1) // disable warnings within system headers -#endif #include <windows.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif #else #error Unsupported platform #endif |