diff Framework/Oracle/GenericOracleRunner.cpp @ 1308:adf234ecaa00 broker

Merge
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 04 Mar 2020 10:21:54 +0100
parents c38c89684d83
children 30deba7bc8e2
line wrap: on
line diff
--- a/Framework/Oracle/GenericOracleRunner.cpp	Wed Mar 04 10:07:37 2020 +0100
+++ b/Framework/Oracle/GenericOracleRunner.cpp	Wed Mar 04 10:21:54 2020 +0100
@@ -314,7 +314,7 @@
 
     if (ok)
     {
-      std::auto_ptr<Orthanc::ParsedDicomFile> result(new Orthanc::ParsedDicomFile(dicom));
+      std::unique_ptr<Orthanc::ParsedDicomFile> result(new Orthanc::ParsedDicomFile(dicom));
 
       boost::posix_time::ptime end = boost::posix_time::microsec_clock::local_time();
       LOG(TRACE) << path << ": parsed in " << (end-start).total_milliseconds() << " ms";
@@ -352,7 +352,7 @@
     }
 
     uint64_t fileSize;
-    std::auto_ptr<Orthanc::ParsedDicomFile> parsed(ParseDicom(fileSize, path, command.IsPixelDataIncluded()));
+    std::unique_ptr<Orthanc::ParsedDicomFile> parsed(ParseDicom(fileSize, path, command.IsPixelDataIncluded()));
 
     if (fileSize != static_cast<size_t>(fileSize))
     {
@@ -418,7 +418,7 @@
     }
 
     size_t fileSize;
-    std::auto_ptr<Orthanc::ParsedDicomFile> parsed(ParseDicomSuccessMessage::ParseWadoAnswer(fileSize, answer, answerHeaders));
+    std::unique_ptr<Orthanc::ParsedDicomFile> parsed(ParseDicomSuccessMessage::ParseWadoAnswer(fileSize, answer, answerHeaders));
 
     {
       ParseDicomSuccessMessage message(command, *parsed, fileSize,