diff OrthancServer/ServerJobs/ArchiveJob.cpp @ 3712:2a170a8f1faf

replacing std::auto_ptr by std::unique_ptr
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 02 Mar 2020 15:32:45 +0100
parents 94f4a18a79cc
children 56f2397f027a
line wrap: on
line diff
--- a/OrthancServer/ServerJobs/ArchiveJob.cpp	Fri Feb 28 13:23:11 2020 +0100
+++ b/OrthancServer/ServerJobs/ArchiveJob.cpp	Mon Mar 02 15:32:45 2020 +0100
@@ -276,7 +276,7 @@
       else if (previous == resources_.end())
       {
         // This is the first time we meet this resource
-        std::auto_ptr<ArchiveIndex> child(new ArchiveIndex(GetChildResourceType(level_)));
+        std::unique_ptr<ArchiveIndex> child(new ArchiveIndex(GetChildResourceType(level_)));
         child->Add(index, resource);
         resources_[id] = child.release();
       }
@@ -308,7 +308,7 @@
           std::list<std::string> children;
           index.GetChildren(children, it->first);
 
-          std::auto_ptr<ArchiveIndex> child(new ArchiveIndex(GetChildResourceType(level_)));
+          std::unique_ptr<ArchiveIndex> child(new ArchiveIndex(GetChildResourceType(level_)));
 
           for (std::list<std::string>::const_iterator 
                  it2 = children.begin(); it2 != children.end(); ++it2)
@@ -695,12 +695,12 @@
   class ArchiveJob::ZipWriterIterator : public boost::noncopyable
   {
   private:
-    TemporaryFile&                        target_;
-    ServerContext&                        context_;
-    ZipCommands                           commands_;
-    std::auto_ptr<HierarchicalZipWriter>  zip_;
-    std::auto_ptr<DicomDirWriter>         dicomDir_;
-    bool                                  isMedia_;
+    TemporaryFile&                          target_;
+    ServerContext&                          context_;
+    ZipCommands                             commands_;
+    std::unique_ptr<HierarchicalZipWriter>  zip_;
+    std::unique_ptr<DicomDirWriter>         dicomDir_;
+    bool                                    isMedia_;
 
   public:
     ZipWriterIterator(TemporaryFile& target,
@@ -902,7 +902,7 @@
     class DynamicTemporaryFile : public IDynamicObject
     {
     private:
-      std::auto_ptr<TemporaryFile>   file_;
+      std::unique_ptr<TemporaryFile>   file_;
 
     public:
       DynamicTemporaryFile(TemporaryFile* f) : file_(f)