diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-15 20:41:33 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-16 12:54:44 +0000 |
| commit | a1ceacc17e3f30d5e9c06b3218ad8ec26ca2f1b9 (patch) | |
| tree | 56a29f66f75f326a0a677ab1697ce28f1bc9fcbf /sal | |
| parent | 18f41dfaf19d656d290c47d196ef2702e169a522 (diff) | |
boost::foo_ptr->std::foo_ptr
Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 434c0b7dc5af..20f5cbef53c2 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -32,7 +32,7 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> -#include <boost/scoped_ptr.hpp> +#include <memory> #ifdef WNT #include <windows.h> @@ -1530,16 +1530,16 @@ namespace osl_FileStatus createTestFile( aTmpName3, aTmpName2 ); createTestDirectory( aTmpName3, aTmpName1 ); - boost::scoped_ptr<Directory> pDir( new Directory( aTmpName3 ) ); - nError1 = pDir->open(); + std::unique_ptr<Directory> xDir( new Directory( aTmpName3 ) ); + nError1 = xDir->open(); CPPUNIT_ASSERT_MESSAGE("open aTmpName3 failed!", ::osl::FileBase::E_None == nError1 ); //getNextItem can not assure which item retrieved - nError1 = pDir->getNextItem( m_aItem_1, 1 ); + nError1 = xDir->getNextItem( m_aItem_1, 1 ); CPPUNIT_ASSERT_MESSAGE("get first item failed!", ::osl::FileBase::E_None == nError1 ); - nError1 = pDir->getNextItem( m_aItem_2 ); + nError1 = xDir->getNextItem( m_aItem_2 ); CPPUNIT_ASSERT_MESSAGE("get second item failed!", ::osl::FileBase::E_None == nError1 ); - pDir->close(); + xDir->close(); //mindy: failed on my RH9,so removed temporaly //nError1 = ::osl::DirectoryItem::get( aVolURL2, m_aVolumeItem ); //CPPUNIT_ASSERT_MESSAGE("get volume item failed!", ::osl::FileBase::E_None == nError1 ); |