# HG changeset patch # User Sebastien Jodogne # Date 1776143617 -7200 # Node ID 5dea2c38b6be347cefa031eb6ab40d79dfcfdc98 # Parent 6a2f3fc566f67f9c04c418b9cbaed5b83438fcd7 fix build with framework 1.12.11 diff -r 6a2f3fc566f6 -r 5dea2c38b6be Common/StoragePlugin.cpp --- a/Common/StoragePlugin.cpp Mon Apr 13 10:57:05 2026 +0200 +++ b/Common/StoragePlugin.cpp Tue Apr 14 07:13:37 2026 +0200 @@ -40,16 +40,20 @@ #include #include +#include "EncryptionConfigurator.h" #include "EncryptionHelpers.h" -#include "EncryptionConfigurator.h" #include "FileSystemStorage.h" +#include "MoveStorageJob.h" +#include "StoragePlugin.h" #include #include -#include "MoveStorageJob.h" -#include "StoragePlugin.h" #include +#if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 12, 11) +# include +#endif + #ifdef _WIN32 // This is a hotfix for: https://orthanc.uclouvain.be/hg/orthanc/rev/e4d9a872998f # undef ORTHANC_PLUGINS_API @@ -106,7 +110,12 @@ { try { +#if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 12, 11) + Orthanc::ElapsedTimer timer; +#else Orthanc::Toolbox::ElapsedTimer timer; +#endif + LOG(INFO) << primaryStorage->GetNameForLogs() << ": creating attachment " << uuid << " of type " << boost::lexical_cast(type); std::unique_ptr writer(primaryStorage->GetWriterForObject(uuid, type, cryptoEnabled)); @@ -155,7 +164,12 @@ try { +#if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 12, 11) + Orthanc::ElapsedTimer timer; +#else Orthanc::Toolbox::ElapsedTimer timer; +#endif + LOG(INFO) << storage->GetNameForLogs() << ": reading range of attachment " << uuid << " of type " << boost::lexical_cast(type); @@ -207,7 +221,12 @@ { try { +#if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 12, 11) + Orthanc::ElapsedTimer timer; +#else Orthanc::Toolbox::ElapsedTimer timer; +#endif + LOG(INFO) << storage->GetNameForLogs() << ": reading whole attachment " << uuid << " of type " << boost::lexical_cast(type); std::unique_ptr reader(storage->GetReaderForObject(uuid, type, cryptoEnabled));