diff OrthancServer/ServerJobs/DicomMoveScuJob.cpp @ 3786:3801435e34a1 SylvainRouquette/fix-issue169-95b752c

integration Orthanc-1.6.0->SylvainRouquette
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 19 Mar 2020 11:48:30 +0100
parents 5ff5d5a0fd28
children 138d0dde41b5
line wrap: on
line diff
--- a/OrthancServer/ServerJobs/DicomMoveScuJob.cpp	Wed Mar 18 08:59:06 2020 +0100
+++ b/OrthancServer/ServerJobs/DicomMoveScuJob.cpp	Thu Mar 19 11:48:30 2020 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2019 Osimis S.A., Belgium
+ * Copyright (C) 2017-2020 Osimis S.A., Belgium
  *
  * This program is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -46,8 +46,8 @@
   class DicomMoveScuJob::Command : public SetOfCommandsJob::ICommand
   {
   private:
-    DicomMoveScuJob&         that_;
-    std::auto_ptr<DicomMap>  findAnswer_;
+    DicomMoveScuJob&           that_;
+    std::unique_ptr<DicomMap>  findAnswer_;
 
   public:
     Command(DicomMoveScuJob& that,
@@ -57,13 +57,13 @@
     {
     }
 
-    virtual bool Execute()
+    virtual bool Execute(const std::string& jobId) ORTHANC_OVERRIDE
     {
       that_.Retrieve(*findAnswer_);
       return true;
     }
 
-    virtual void Serialize(Json::Value& target) const
+    virtual void Serialize(Json::Value& target) const ORTHANC_OVERRIDE
     {
       findAnswer_->Serialize(target);
     }