diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-01-31 20:46:58 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-02-02 05:57:45 +0100 |
| commit | 17b22047a7fac6592c0c0b23072c36c7e0d46a84 (patch) | |
| tree | a77e5aabb5bb891cdb307eee07d5d8a0d7cd287b /pyuno | |
| parent | 20945a9a4de6684010fd5b3603595e6da543807d (diff) | |
pyuno: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Id907f466bc9dc45f3e522fb948488eb35c011bfe
Reviewed-on: https://gerrit.libreoffice.org/49041
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/inc/pyuno.hxx | 6 | ||||
| -rw-r--r-- | pyuno/zipcore/python.cxx | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/pyuno/inc/pyuno.hxx b/pyuno/inc/pyuno.hxx index e2d0c38de640..04c42de6e93f 100644 --- a/pyuno/inc/pyuno.hxx +++ b/pyuno/inc/pyuno.hxx @@ -21,13 +21,7 @@ #define INCLUDED_PYUNO_INC_PYUNO_HXX #ifndef Py_PYTHON_H -#if defined _MSC_VER -#pragma warning(push, 1) -#endif #include <Python.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif #endif // #ifdef Py_PYTHON_H #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/script/CannotConvertException.hpp> diff --git a/pyuno/zipcore/python.cxx b/pyuno/zipcore/python.cxx index 9c6ef836311f..c26d58c36fb8 100644 --- a/pyuno/zipcore/python.cxx +++ b/pyuno/zipcore/python.cxx @@ -24,9 +24,7 @@ #include <wchar.h> #define WIN32_LEAN_AND_MEAN -#pragma warning(push, 1) #include <windows.h> -#pragma warning(pop) #include <tools/pathutils.hxx> |