Mercurial > hg > orthanc

comparison 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
comparison
equal deleted inserted replaced
3709:1f4910999fe7 3712:2a170a8f1faf
88 #endif 88 #endif
89 89
90 #include "FindScp.h" 90 #include "FindScp.h"
91 #include "StoreScp.h" 91 #include "StoreScp.h"
92 #include "MoveScp.h" 92 #include "MoveScp.h"
93 #include "../../Compatibility.h"
93 #include "../../Toolbox.h" 94 #include "../../Toolbox.h"
94 #include "../../Logging.h" 95 #include "../../Logging.h"
95 96
96 #include <dcmtk/dcmnet/dcasccfg.h> /* for class DcmAssociationConfiguration */ 97 #include <dcmtk/dcmnet/dcasccfg.h> /* for class DcmAssociationConfiguration */
97 #include <dcmtk/dcmdata/dcuid.h> /* for variable dcmAllStorageSOPClassUIDs */ 98 #include <dcmtk/dcmdata/dcuid.h> /* for variable dcmAllStorageSOPClassUIDs */
736 break; 737 break;
737 738
738 case DicomRequestType_Store: 739 case DicomRequestType_Store:
739 if (server_.HasStoreRequestHandlerFactory()) // Should always be true 740 if (server_.HasStoreRequestHandlerFactory()) // Should always be true
740 { 741 {
741 std::auto_ptr<IStoreRequestHandler> handler 742 std::unique_ptr<IStoreRequestHandler> handler
742 (server_.GetStoreRequestHandlerFactory().ConstructStoreRequestHandler()); 743 (server_.GetStoreRequestHandlerFactory().ConstructStoreRequestHandler());
743 744
744 if (handler.get() != NULL) 745 if (handler.get() != NULL)
745 { 746 {
746 cond = Internals::storeScp(assoc_, &msg, presID, *handler, remoteIp_, associationTimeout_); 747 cond = Internals::storeScp(assoc_, &msg, presID, *handler, remoteIp_, associationTimeout_);
749 break; 750 break;
750 751
751 case DicomRequestType_Move: 752 case DicomRequestType_Move:
752 if (server_.HasMoveRequestHandlerFactory()) // Should always be true 753 if (server_.HasMoveRequestHandlerFactory()) // Should always be true
753 { 754 {
754 std::auto_ptr<IMoveRequestHandler> handler 755 std::unique_ptr<IMoveRequestHandler> handler
755 (server_.GetMoveRequestHandlerFactory().ConstructMoveRequestHandler()); 756 (server_.GetMoveRequestHandlerFactory().ConstructMoveRequestHandler());
756 757
757 if (handler.get() != NULL) 758 if (handler.get() != NULL)
758 { 759 {
759 cond = Internals::moveScp(assoc_, &msg, presID, *handler, remoteIp_, remoteAet_, calledAet_, associationTimeout_); 760 cond = Internals::moveScp(assoc_, &msg, presID, *handler, remoteIp_, remoteAet_, calledAet_, associationTimeout_);
763 764
764 case DicomRequestType_Find: 765 case DicomRequestType_Find:
765 if (server_.HasFindRequestHandlerFactory() || // Should always be true 766 if (server_.HasFindRequestHandlerFactory() || // Should always be true
766 server_.HasWorklistRequestHandlerFactory()) 767 server_.HasWorklistRequestHandlerFactory())
767 { 768 {
768 std::auto_ptr<IFindRequestHandler> findHandler; 769 std::unique_ptr<IFindRequestHandler> findHandler;
769 if (server_.HasFindRequestHandlerFactory()) 770 if (server_.HasFindRequestHandlerFactory())
770 { 771 {
771 findHandler.reset(server_.GetFindRequestHandlerFactory().ConstructFindRequestHandler()); 772 findHandler.reset(server_.GetFindRequestHandlerFactory().ConstructFindRequestHandler());
772 } 773 }
773 774
774 std::auto_ptr<IWorklistRequestHandler> worklistHandler; 775 std::unique_ptr<IWorklistRequestHandler> worklistHandler;
775 if (server_.HasWorklistRequestHandlerFactory()) 776 if (server_.HasWorklistRequestHandlerFactory())
776 { 777 {
777 worklistHandler.reset(server_.GetWorklistRequestHandlerFactory().ConstructWorklistRequestHandler()); 778 worklistHandler.reset(server_.GetWorklistRequestHandlerFactory().ConstructWorklistRequestHandler());
778 } 779 }
779 780