Mercurial > hg > orthanc-stone

diff Framework/Deprecated/Loaders/LoaderCache.cpp @ 1226:05d05cba0f4f broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
explicitely tagging LockingEmitter as deprecated
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 08 Dec 2019 11:57:46 +0100
parents 16738485e457
children 0ca50d275b9a
line wrap: on
line diff
--- a/Framework/Deprecated/Loaders/LoaderCache.cpp	Sun Dec 08 11:45:09 2019 +0100
+++ b/Framework/Deprecated/Loaders/LoaderCache.cpp	Sun Dec 08 11:57:46 2019 +0100
@@ -64,7 +64,7 @@
   }
 #else
   LoaderCache::LoaderCache(OrthancStone::ThreadedOracle& oracle,
-                           OrthancStone::Deprecated::LockingEmitter& lockingEmitter)
+                           LockingEmitter& lockingEmitter)
     : oracle_(oracle)
     , lockingEmitter_(lockingEmitter)
   {
@@ -97,7 +97,7 @@
 #if ORTHANC_ENABLE_WASM == 1
           loader.reset(new OrthancSeriesVolumeProgressiveLoader(volumeImage, oracle_, oracle_));
 #else
-          OrthancStone::Deprecated::LockingEmitter::WriterLock lock(lockingEmitter_);
+          LockingEmitter::WriterLock lock(lockingEmitter_);
           loader.reset(new OrthancSeriesVolumeProgressiveLoader(volumeImage, oracle_, lock.GetOracleObservable()));
 #endif
 //          LOG(TRACE) << "LoaderCache::GetSeriesVolumeProgressiveLoader : loader = " << loader.get();
@@ -166,7 +166,7 @@
 #if ORTHANC_ENABLE_WASM == 1
           loader.reset(new OrthancMultiframeVolumeLoader(volumeImage, oracle_, oracle_));
 #else
-          OrthancStone::Deprecated::LockingEmitter::WriterLock lock(lockingEmitter_);
+          LockingEmitter::WriterLock lock(lockingEmitter_);
           loader.reset(new OrthancMultiframeVolumeLoader(volumeImage, oracle_, lock.GetOracleObservable()));
 #endif
           loader->LoadInstance(instanceUuid);
@@ -267,7 +267,7 @@
 #if ORTHANC_ENABLE_WASM == 1
           loader.reset(new DicomStructureSetLoader(oracle_, oracle_));
 #else
-          OrthancStone::Deprecated::LockingEmitter::WriterLock lock(lockingEmitter_);
+          LockingEmitter::WriterLock lock(lockingEmitter_);
           loader.reset(new DicomStructureSetLoader(oracle_, lock.GetOracleObservable()));
 #endif
           loader->LoadInstance(inInstanceUuid, initiallyVisibleStructures);
@@ -363,7 +363,7 @@
   void LoaderCache::ClearCache()
   {
 #if ORTHANC_ENABLE_WASM != 1
-    OrthancStone::Deprecated::LockingEmitter::WriterLock lock(lockingEmitter_);
+    LockingEmitter::WriterLock lock(lockingEmitter_);
 #endif
     
 //#ifndef NDEBUG