comparison OrthancServer/OrthancFindRequestHandler.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 4922bdd046dd
children 884b55ce01f6
comparison
equal deleted inserted replaced
3709:1f4910999fe7 3712:2a170a8f1faf
271 if (!context.GetIndex().LookupParent(parent, instanceId, level)) 271 if (!context.GetIndex().LookupParent(parent, instanceId, level))
272 { 272 {
273 throw OrthancException(ErrorCode_UnknownResource); // The resource was deleted in between 273 throw OrthancException(ErrorCode_UnknownResource); // The resource was deleted in between
274 } 274 }
275 275
276 std::auto_ptr<DicomMap> result(new DicomMap); 276 std::unique_ptr<DicomMap> result(new DicomMap);
277 277
278 switch (level) 278 switch (level)
279 { 279 {
280 case ResourceType_Patient: 280 case ResourceType_Patient:
281 ComputePatientCounters(*result, context.GetIndex(), parent, query); 281 ComputePatientCounters(*result, context.GetIndex(), parent, query);
535 virtual void Visit(const std::string& publicId, 535 virtual void Visit(const std::string& publicId,
536 const std::string& instanceId, 536 const std::string& instanceId,
537 const DicomMap& mainDicomTags, 537 const DicomMap& mainDicomTags,
538 const Json::Value* dicomAsJson) 538 const Json::Value* dicomAsJson)
539 { 539 {
540 std::auto_ptr<DicomMap> counters(ComputeCounters(context_, instanceId, level_, query_)); 540 std::unique_ptr<DicomMap> counters(ComputeCounters(context_, instanceId, level_, query_));
541 541
542 AddAnswer(answers_, mainDicomTags, dicomAsJson, 542 AddAnswer(answers_, mainDicomTags, dicomAsJson,
543 queryAsArray_, sequencesToReturn_, counters.get()); 543 queryAsArray_, sequencesToReturn_, counters.get());
544 } 544 }
545 }; 545 };