diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-01-31 12:32:51 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-02-01 06:52:50 +0100 |
| commit | b23e4d2bace6eb4729d58fbb7cad4e99ce1aad94 (patch) | |
| tree | c0599b6128c68220d0c55a636b4facdc0041e1f2 | |
| parent | 3c879be2407a511717b74259f99575bf3c675764 (diff) | |
cppuhelper: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Ib097ea1764d275a3123d0dccf05d52315b4858a1
Reviewed-on: https://gerrit.libreoffice.org/48971
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | cppuhelper/source/interfacecontainer.cxx | 4 | ||||
| -rw-r--r-- | include/cppuhelper/propertysetmixin.hxx | 10 | ||||
| -rw-r--r-- | include/cppuhelper/propshlp.hxx | 3 |
3 files changed, 0 insertions, 17 deletions
diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx index d4d60b634d99..d4627ff94399 100644 --- a/cppuhelper/source/interfacecontainer.cxx +++ b/cppuhelper/source/interfacecontainer.cxx @@ -55,10 +55,6 @@ static void sequenceRemoveElementAt( Sequence< Reference< XInterface > > & rSeq, rSeq = aDestSeq; } -#ifdef _MSC_VER -#pragma warning( disable: 4786 ) -#endif - OInterfaceIteratorHelper::OInterfaceIteratorHelper( OInterfaceContainerHelper & rCont_ ) : rCont( rCont_ ) { diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx index c50da4591b70..287ef7dd1fc7 100644 --- a/include/cppuhelper/propertysetmixin.hxx +++ b/include/cppuhelper/propertysetmixin.hxx @@ -56,12 +56,6 @@ namespace cppu { template< typename T > class PropertySetMixin; -// Suppress warnings about virtual functions but non-virtual destructor: -#if defined _MSC_VER -#pragma warning(push) -#pragma warning(disable: 4265) -#endif - /** @short A helper base class for <code>cppu::PropertySetMixin</code>. @@ -429,10 +423,6 @@ private: #pragma GCC diagnostic pop #endif -#if defined _MSC_VER -#pragma warning(pop) -#endif - } #endif diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx index d9eb0c493741..4c102148a9f7 100644 --- a/include/cppuhelper/propshlp.hxx +++ b/include/cppuhelper/propshlp.hxx @@ -661,8 +661,6 @@ protected: #endif // Suppress warning about virtual functions but non-virtual destructor: #if defined _MSC_VER -#pragma warning(push) -#pragma warning(disable: 4265) #if defined __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wnon-virtual-dtor" @@ -677,7 +675,6 @@ protected: #if defined __clang__ #pragma clang diagnostic pop #endif -#pragma warning(pop) #endif /** |