Mercurial > hg > orthanc
diff OrthancServer/ServerContext.cpp @ 3713:56f2397f027a storage-commitment
integration mainline->storage-commitment
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 02 Mar 2020 15:42:17 +0100 |
| parents | 9dac85e807c2 2a170a8f1faf |
| children | 0540b54324f1 |
line wrap: on
line diff
--- a/OrthancServer/ServerContext.cpp Mon Mar 02 10:13:34 2020 +0100 +++ b/OrthancServer/ServerContext.cpp Mon Mar 02 15:42:17 2020 +0100 @@ -75,7 +75,7 @@ { while (!that->done_) { - std::auto_ptr<IDynamicObject> obj(that->pendingChanges_.Dequeue(sleepDelay)); + std::unique_ptr<IDynamicObject> obj(that->pendingChanges_.Dequeue(sleepDelay)); if (obj.get() != NULL) { @@ -664,7 +664,7 @@ lock_(that_.dicomCacheMutex_) { #if ENABLE_DICOM_CACHE == 0 - static std::auto_ptr<IDynamicObject> p; + static std::unique_ptr<IDynamicObject> p; p.reset(provider_.Provide(instancePublicId)); dicom_ = dynamic_cast<ParsedDicomFile*>(p.get()); #else @@ -833,7 +833,7 @@ // Optimization in Orthanc 1.5.1 - Don't read the full JSON from // the disk if only "main DICOM tags" are to be returned - std::auto_ptr<Json::Value> dicomAsJson; + std::unique_ptr<Json::Value> dicomAsJson; bool hasOnlyMainDicomTags; DicomMap dicom;