diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 17:10:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-18 07:59:14 +0000 |
| commit | 3a00aaef2a51d7a1a87475a316dc9ae232fac60c (patch) | |
| tree | 4cc4516528c0dcb0bb6871e5b517efb74550a521 /salhelper | |
| parent | c8ee3be0e08c435b106f0ac4b76618b33333b040 (diff) | |
boost->std
Change-Id: Ie490bf2c6921f393bdeed96b1a8815996b701bf0
Reviewed-on: https://gerrit.libreoffice.org/18670
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'salhelper')
| -rw-r--r-- | salhelper/qa/test_api.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx index f016a88d55db..2d7905e6b966 100644 --- a/salhelper/qa/test_api.cxx +++ b/salhelper/qa/test_api.cxx @@ -55,7 +55,7 @@ std::type_info const & getSimpleReferenceObjectTypeInfo() #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> -#include <boost/scoped_ptr.hpp> +#include <memory> namespace { @@ -108,7 +108,7 @@ public: void Test::testCondition() { osl::Mutex mutex; - boost::scoped_ptr< salhelper::Condition > p(new DerivedCondition(mutex)); + std::unique_ptr< salhelper::Condition > p(new DerivedCondition(mutex)); CPPUNIT_ASSERT(typeid (*p.get()) != typeid (salhelper::Condition)); CPPUNIT_ASSERT(typeid (p.get()) == typeid (salhelper::Condition *)); CPPUNIT_ASSERT( @@ -221,12 +221,12 @@ void Test::testSimpleReferenceObject() { void Test::testDerivedCondition() { osl::Mutex mutex; - boost::scoped_ptr< salhelper::Condition > p(new DerivedCondition(mutex)); + std::unique_ptr< salhelper::Condition > p(new DerivedCondition(mutex)); CPPUNIT_ASSERT(dynamic_cast< DerivedCondition * >(p.get()) != 0); } void Test::testDerivedConditionWaiterTimedout() { - boost::scoped_ptr< salhelper::ConditionWaiter::timedout > p( + std::unique_ptr< salhelper::ConditionWaiter::timedout > p( new DerivedConditionWaiterTimedout); CPPUNIT_ASSERT( dynamic_cast< DerivedConditionWaiterTimedout * >(p.get()) != 0); |