diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:00:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:01:05 +0100 |
| commit | 871426533f7afe31bc451fa6b407b83db8e52827 (patch) | |
| tree | ed60cee61ebee91994eaffc9c9a3638836ed2ab4 /comphelper | |
| parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) | |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/inc/comphelper/listenernotification.hxx | 15 | ||||
| -rw-r--r-- | comphelper/source/misc/anycompare.cxx | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/comphelper/inc/comphelper/listenernotification.hxx b/comphelper/inc/comphelper/listenernotification.hxx index 98143f1d3242..46ae73a1f651 100644 --- a/comphelper/inc/comphelper/listenernotification.hxx +++ b/comphelper/inc/comphelper/listenernotification.hxx @@ -95,8 +95,13 @@ namespace comphelper /** creates an iterator for looping through all registered listeners */ - inline ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > - createIterator(); + SAL_WNODEPRECATED_DECLARATIONS_PUSH + ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > createIterator() + { + ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pIterator( new ::cppu::OInterfaceIteratorHelper( m_aListeners ) ); + return pIterator; + } + SAL_WNODEPRECATED_DECLARATIONS_POP protected: OListenerContainer( ::osl::Mutex& _rMutex ); @@ -158,12 +163,6 @@ namespace comphelper return m_aListeners.getLength(); } - inline ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > OListenerContainer::createIterator() - { - ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pIterator( new ::cppu::OInterfaceIteratorHelper( m_aListeners ) ); - return pIterator; - } - //==================================================================== //= OSimpleListenerContainer //==================================================================== diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx index a86174daf08e..f776b36be445 100644 --- a/comphelper/source/misc/anycompare.cxx +++ b/comphelper/source/misc/anycompare.cxx @@ -69,7 +69,9 @@ namespace comphelper //------------------------------------------------------------------------------------------------------------------ ::std::auto_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< IKeyPredicateLess > pComparator; + SAL_WNODEPRECATED_DECLARATIONS_POP switch ( i_type.getTypeClass() ) { case TypeClass_CHAR: |