diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-01-31 09:41:59 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-01-31 21:01:17 +0100 |
| commit | bca11ff008b53764cf248eff485bdb24c41b6fa3 (patch) | |
| tree | 940db4c9540b9e78b4f1fe2a360a260458a79b90 /avmedia | |
| parent | 453cb4dfa5c563fcfe723a9193246873ebc83b1e (diff) | |
avmedia: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: I6274d563f9bb4f1f173d0d5d25239e5617ee064c
Reviewed-on: https://gerrit.libreoffice.org/48946
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/win/framegrabber.cxx | 7 | ||||
| -rw-r--r-- | avmedia/source/win/player.cxx | 7 | ||||
| -rw-r--r-- | avmedia/source/win/window.cxx | 8 |
3 files changed, 1 insertions, 21 deletions
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx index aa270660a7f4..fb0369d7c8cc 100644 --- a/avmedia/source/win/framegrabber.cxx +++ b/avmedia/source/win/framegrabber.cxx @@ -21,10 +21,6 @@ #include <memory> -#if defined _MSC_VER -#pragma warning(push, 1) -#pragma warning(disable: 4917) -#endif #include <prewin.h> #include <postwin.h> #include <objbase.h> @@ -32,9 +28,6 @@ #include <Amvideo.h> #include "interface.hxx" #include <uuids.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif #include "framegrabber.hxx" #include "player.hxx" diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index 4aef762f63bd..12e2abd65290 100644 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -17,18 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined _MSC_VER -#pragma warning(push, 1) -#pragma warning(disable: 4917) -#endif #include <objbase.h> #include <strmif.h> #include <control.h> #include <uuids.h> #include <evcode.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif #include "player.hxx" #include "framegrabber.hxx" diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx index a24682ae03bc..fd77cd80b118 100644 --- a/avmedia/source/win/window.cxx +++ b/avmedia/source/win/window.cxx @@ -17,17 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined _MSC_VER -#pragma warning(push, 1) -#pragma warning(disable: 4917) -#endif #include <objbase.h> #include <strmif.h> #include <control.h> #include <dshow.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif + #include <com/sun/star/awt/SystemPointer.hpp> #include <cppuhelper/supportsservice.hxx> |