diff OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.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 1f4910999fe7
children 023b2a9f3aa1
line wrap: on
line diff
--- a/OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp	Fri Feb 28 13:23:11 2020 +0100
+++ b/OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp	Mon Mar 02 15:32:45 2020 +0100
@@ -116,7 +116,7 @@
   {
     std::string id = call.GetUriComponent("id", "");
 
-    std::auto_ptr<ParsedDicomFile> modified;
+    std::unique_ptr<ParsedDicomFile> modified;
 
     {
       ServerContext::DicomCacheLocker locker(OrthancRestApi::GetContext(call), id);
@@ -169,7 +169,7 @@
   }
 
 
-  static void SubmitModificationJob(std::auto_ptr<DicomModification>& modification,
+  static void SubmitModificationJob(std::unique_ptr<DicomModification>& modification,
                                     bool isAnonymization,
                                     RestApiPostCall& call,
                                     const Json::Value& body,
@@ -177,7 +177,7 @@
   {
     ServerContext& context = OrthancRestApi::GetContext(call);
 
-    std::auto_ptr<ResourceModificationJob> job(new ResourceModificationJob(context));
+    std::unique_ptr<ResourceModificationJob> job(new ResourceModificationJob(context));
     
     job->SetModification(modification.release(), level, isAnonymization);
     job->SetOrigin(call);
@@ -192,7 +192,7 @@
   template <enum ResourceType resourceType>
   static void ModifyResource(RestApiPostCall& call)
   {
-    std::auto_ptr<DicomModification> modification(new DicomModification);
+    std::unique_ptr<DicomModification> modification(new DicomModification);
 
     Json::Value body;
     ParseModifyRequest(body, *modification, call);
@@ -207,7 +207,7 @@
   template <enum ResourceType resourceType>
   static void AnonymizeResource(RestApiPostCall& call)
   {
-    std::auto_ptr<DicomModification> modification(new DicomModification);
+    std::unique_ptr<DicomModification> modification(new DicomModification);
 
     Json::Value body;
     ParseAnonymizationRequest(body, *modification, call);
@@ -343,7 +343,7 @@
     {
       for (Json::ArrayIndex i = 0; i < content.size(); i++)
       {
-        std::auto_ptr<ParsedDicomFile> dicom(base.Clone(false));
+        std::unique_ptr<ParsedDicomFile> dicom(base.Clone(false));
         const Json::Value* payload = NULL;
 
         if (content[i].type() == Json::stringValue)
@@ -668,7 +668,7 @@
 
     const std::string study = call.GetUriComponent("id", "");
 
-    std::auto_ptr<SplitStudyJob> job(new SplitStudyJob(context, study));    
+    std::unique_ptr<SplitStudyJob> job(new SplitStudyJob(context, study));    
     job->SetOrigin(call);
 
     std::vector<std::string> series;
@@ -751,7 +751,7 @@
 
     const std::string study = call.GetUriComponent("id", "");
 
-    std::auto_ptr<MergeStudyJob> job(new MergeStudyJob(context, study));    
+    std::unique_ptr<MergeStudyJob> job(new MergeStudyJob(context, study));    
     job->SetOrigin(call);
 
     std::vector<std::string> resources;