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

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

Browse Source 
Change-Id: Ib097ea1764d275a3123d0dccf05d52315b4858a1
Reviewed-on: https://gerrit.libreoffice.org/48971
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2018-01-31 12:32:51 +03:00
parent 3c879be240
commit b23e4d2bac
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cppuhelper/source/interfacecontainer.cxx
View File

@@ -55,10 +55,6 @@ static void sequenceRemoveElementAt( Sequence< Reference< XInterface > > & rSeq,
rSeq = aDestSeq; rSeq = aDestSeq;
} }
#ifdef _MSC_VER
#pragma warning( disable: 4786 )
#endif
OInterfaceIteratorHelper::OInterfaceIteratorHelper( OInterfaceContainerHelper & rCont_ ) OInterfaceIteratorHelper::OInterfaceIteratorHelper( OInterfaceContainerHelper & rCont_ )
: rCont( rCont_ ) : rCont( rCont_ )
{ {

10
include/cppuhelper/propertysetmixin.hxx
View File

@@ -56,12 +56,6 @@ namespace cppu {
template< typename T > class PropertySetMixin; 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>. @short A helper base class for <code>cppu::PropertySetMixin</code>.
@@ -429,10 +423,6 @@ private:
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#if defined _MSC_VER
#pragma warning(pop)
#endif
} }
#endif #endif

3
include/cppuhelper/propshlp.hxx
View File

@@ -661,8 +661,6 @@ protected:
#endif #endif
// Suppress warning about virtual functions but non-virtual destructor: // Suppress warning about virtual functions but non-virtual destructor:
#if defined _MSC_VER #if defined _MSC_VER
#pragma warning(push)
#pragma warning(disable: 4265)
#if defined __clang__ #if defined __clang__
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #pragma clang diagnostic ignored "-Wnon-virtual-dtor"
@@ -677,7 +675,6 @@ protected:
#if defined __clang__ #if defined __clang__
#pragma clang diagnostic pop #pragma clang diagnostic pop
#endif #endif
#pragma warning(pop)
#endif #endif
/** /**