diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-02 15:20:54 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-02 15:20:54 +0200 |
| commit | 36d24bced0ea5fcbbd380b15e9d1a813fbef32cf (patch) | |
| tree | b968e0cbf0aa9b46762824fd874e86576ca86a98 /shell | |
| parent | fb515368bd8200b4d279061bf2b6bd8b38c27a2e (diff) | |
shell (Windows): std::auto_ptr -> std::unique_ptr
Change-Id: I44c843c028c2dfcfcea9f6a2196440ca700fc3a8
Diffstat (limited to 'shell')
4 files changed, 4 insertions, 4 deletions
diff --git a/shell/inc/internal/zipfile.hxx b/shell/inc/internal/zipfile.hxx index 15a900174419..a2e369c5f403 100644 --- a/shell/inc/internal/zipfile.hxx +++ b/shell/inc/internal/zipfile.hxx @@ -40,7 +40,7 @@ class ZipFile public: typedef std::vector<std::string> Directory_t; - typedef std::auto_ptr<Directory_t> DirectoryPtr_t; + typedef std::unique_ptr<Directory_t> DirectoryPtr_t; typedef std::vector<char> ZipContentBuffer_t; public: diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx index 1216f4af2a79..45a747784600 100644 --- a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx +++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx @@ -55,7 +55,7 @@ typedef std::vector<statistic_group_t> statistic_group_list_t; class document_statistic_reader; -typedef std::auto_ptr<document_statistic_reader> document_statistic_reader_ptr; +typedef std::unique_ptr<document_statistic_reader> document_statistic_reader_ptr; document_statistic_reader_ptr create_document_statistic_reader(const std::string& document_name, CMetaInfoReader* meta_info_accessor); diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx index 68078f048e9c..870c33c1dd87 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx @@ -35,7 +35,7 @@ class list_view_builder; -typedef std::auto_ptr<list_view_builder> list_view_builder_ptr; +typedef std::unique_ptr<list_view_builder> list_view_builder_ptr; // factory method for list_view_builder list_view_builder_ptr create_list_view_builder( diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx index 45918f5f5d81..8c62836fbadb 100644 --- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx +++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx @@ -357,7 +357,7 @@ HRESULT STDMETHODCALLTYPE CThumbviewer::Extract(HBITMAP *phBmpImage) try { std::wstring fname = getShortPathName( filename_ ); - std::auto_ptr<ZipFile> zipfile( new ZipFile( WStringToString( fname ) ) ); + std::unique_ptr<ZipFile> zipfile( new ZipFile( WStringToString( fname ) ) ); if (zipfile->HasContent(THUMBNAIL_CONTENT)) { |