Mercurial > hg > orthanc

diff Core/DicomNetworking/Internals/CommandDispatcher.cpp @ 3712:2a170a8f1faf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 58f92b1c8061
children 56f2397f027a
line wrap: on
line diff
--- a/Core/DicomNetworking/Internals/CommandDispatcher.cpp	Fri Feb 28 13:23:11 2020 +0100
+++ b/Core/DicomNetworking/Internals/CommandDispatcher.cpp	Mon Mar 02 15:32:45 2020 +0100
@@ -90,6 +90,7 @@
 #include "FindScp.h"
 #include "StoreScp.h"
 #include "MoveScp.h"
+#include "../../Compatibility.h"
 #include "../../Toolbox.h"
 #include "../../Logging.h"
 
@@ -738,7 +739,7 @@
             case DicomRequestType_Store:
               if (server_.HasStoreRequestHandlerFactory()) // Should always be true
               {
-                std::auto_ptr<IStoreRequestHandler> handler
+                std::unique_ptr<IStoreRequestHandler> handler
                   (server_.GetStoreRequestHandlerFactory().ConstructStoreRequestHandler());
 
                 if (handler.get() != NULL)
@@ -751,7 +752,7 @@
             case DicomRequestType_Move:
               if (server_.HasMoveRequestHandlerFactory()) // Should always be true
               {
-                std::auto_ptr<IMoveRequestHandler> handler
+                std::unique_ptr<IMoveRequestHandler> handler
                   (server_.GetMoveRequestHandlerFactory().ConstructMoveRequestHandler());
 
                 if (handler.get() != NULL)
@@ -765,13 +766,13 @@
               if (server_.HasFindRequestHandlerFactory() || // Should always be true
                   server_.HasWorklistRequestHandlerFactory())
               {
-                std::auto_ptr<IFindRequestHandler> findHandler;
+                std::unique_ptr<IFindRequestHandler> findHandler;
                 if (server_.HasFindRequestHandlerFactory())
                 {
                   findHandler.reset(server_.GetFindRequestHandlerFactory().ConstructFindRequestHandler());
                 }
 
-                std::auto_ptr<IWorklistRequestHandler> worklistHandler;
+                std::unique_ptr<IWorklistRequestHandler> worklistHandler;
                 if (server_.HasWorklistRequestHandlerFactory())
                 {
                   worklistHandler.reset(server_.GetWorklistRequestHandlerFactory().ConstructWorklistRequestHandler());