comparison Framework/Plugins/PluginInitialization.cpp @ 153:b0f20acf5793

merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 01 Jul 2020 08:54:43 +0200
parents 063aa53b5917 6c58af430ba0
children 9cc6fec07135
comparison
equal deleted inserted replaced
152:063aa53b5917 153:b0f20acf5793
43 43
44 bool InitializePlugin(OrthancPluginContext* context, 44 bool InitializePlugin(OrthancPluginContext* context,
45 const std::string& dbms, 45 const std::string& dbms,
46 bool isIndex) 46 bool isIndex)
47 { 47 {
48 #if defined(ORTHANC_FRAMEWORK_VERSION_IS_ABOVE) // This indicates Orthanc framework >= 1.7.2
48 Orthanc::Logging::InitializePluginContext(context); 49 Orthanc::Logging::InitializePluginContext(context);
50 #else
51 Orthanc::Logging::Initialize(context);
52 #endif
53
49 OrthancPlugins::SetGlobalContext(context); 54 OrthancPlugins::SetGlobalContext(context);
50 ImplicitTransaction::SetErrorOnDoubleExecution(false); 55 ImplicitTransaction::SetErrorOnDoubleExecution(false);
51 56
52 assert(DisplayPerformanceWarning(dbms, isIndex)); 57 assert(DisplayPerformanceWarning(dbms, isIndex));
53 58