mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ib13f198e5941a33a9a8d1091c8ceb48e273f00cc
Reviewed-on: https://gerrit.libreoffice.org/48949
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2018-01-31 10:10:54 +03:00
parent 0b3ecd909c
commit 82e3833995
7 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx
View File

@ -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();

1
bridges/source/cpp_uno/msvc_win32_intel/except.cxx
View File

@ -18,7 +18,6 @@
*/
#pragma warning( disable : 4237 )
#include <sal/config.h>
#include <malloc.h>
#include <typeinfo.h>

2
bridges/source/cpp_uno/msvc_win32_intel/msci.hxx
View File

@ -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"

2
bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx
View File

@ -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>

1
bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
View File

@ -234,7 +234,6 @@ void
#endif // 0
#pragma warning( disable : 4237 )
#include <sal/config.h>
#include <memory>

2
bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
View File

@ -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>

6
bridges/source/cpp_uno/shared/vtablefactory.cxx
View File

@ -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