diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-02-21 14:33:44 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2014-02-21 14:35:52 +0900 |
commit | 5f17e5eaad665337c7d8b7f05a61adc21d80a073 (patch) | |
tree | fa653f05c3724046dc9bd373f1e66fd462f282b3 /package | |
parent | 24dd10c727ab2d7a38368292498520e11d98e3cb (diff) |
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: I674b7ee507258555b667657a13db6fda9b8d8372
Diffstat (limited to 'package')
-rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 4 | ||||
-rw-r--r-- | package/source/zippackage/ZipPackageFolder.cxx | 2 | ||||
-rw-r--r-- | package/source/zippackage/zipfileaccess.cxx | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 46ce17db5ad0..e1cf3f781266 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -67,7 +67,7 @@ #include "com/sun/star/io/XAsyncOutputMonitor.hpp" #include <cstring> -#include <memory> +#include <boost/scoped_ptr.hpp> #include <vector> #include <ucbhelper/fileidentifierconverter.hxx> @@ -505,7 +505,7 @@ void ZipPackage::parseContentType() void ZipPackage::getZipFileContents() { - auto_ptr < ZipEnumeration > pEnum ( m_pZipFile->entries() ); + boost::scoped_ptr < ZipEnumeration > pEnum ( m_pZipFile->entries() ); ZipPackageStream *pPkgStream; ZipPackageFolder *pPkgFolder, *pCurrent; OUString sTemp, sDirName; diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index 7dbd7406a895..2f0013e2bc43 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -37,7 +37,7 @@ #include <EncryptedDataHeader.hxx> #include <rtl/random.h> #include <rtl/instance.hxx> -#include <memory> +#include <boost/scoped_ptr.hpp> using namespace com::sun::star; using namespace com::sun::star::packages::zip::ZipConstants; diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index 7648beeb901a..8db659fd7d59 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -33,8 +33,6 @@ #include <ucbhelper/content.hxx> #include <rtl/ref.hxx> -#include <memory> - using namespace ::com::sun::star; #if OSL_DEBUG_LEVEL > 0 |