Mercurial > hg > orthanc

changeset 4121:7c9ff821063a framework-lgpl

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 07 Jul 2020 19:54:53 +0200
parents 304842a0d152
children 4bb7522a63e0
files OrthancFramework/Sources/JobsEngine/JobsRegistry.cpp OrthancServer/CMakeLists.txt OrthancServer/Sources/Database/Compatibility/ICreateInstance.cpp OrthancServer/Sources/ServerIndex.cpp
diffstat 4 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/JobsEngine/JobsRegistry.cpp	Tue Jul 07 19:37:25 2020 +0200
+++ b/OrthancFramework/Sources/JobsEngine/JobsRegistry.cpp	Tue Jul 07 19:54:53 2020 +0200
@@ -1039,6 +1039,7 @@
         }
       }
 
+      (void) ok;  // Remove warning about unused variable in release builds
       assert(ok);
 
       found->second->SetState(JobState_Pending);
--- a/OrthancServer/CMakeLists.txt	Tue Jul 07 19:37:25 2020 +0200
+++ b/OrthancServer/CMakeLists.txt	Tue Jul 07 19:54:53 2020 +0200
@@ -195,7 +195,7 @@
 set(ORTHANC_EMBEDDED_FILES
   CONFIGURATION_SAMPLE         ${CMAKE_SOURCE_DIR}/Resources/Configuration.json
   DICOM_CONFORMANCE_STATEMENT  ${CMAKE_SOURCE_DIR}/Resources/DicomConformanceStatement.txt
-  FONT_UBUNTU_MONO_BOLD_16     ${CMAKE_SOURCE_DIR}/../OrthancFramework/Resources/Fonts/UbuntuMonoBold-16.json
+  FONT_UBUNTU_MONO_BOLD_16     ${CMAKE_SOURCE_DIR}/Resources/Fonts/UbuntuMonoBold-16.json
   LUA_TOOLBOX                  ${CMAKE_SOURCE_DIR}/Resources/Toolbox.lua
   PREPARE_DATABASE             ${CMAKE_SOURCE_DIR}/Sources/Database/PrepareDatabase.sql
   UPGRADE_DATABASE_3_TO_4      ${CMAKE_SOURCE_DIR}/Sources/Database/Upgrade3To4.sql
--- a/OrthancServer/Sources/Database/Compatibility/ICreateInstance.cpp	Tue Jul 07 19:37:25 2020 +0200
+++ b/OrthancServer/Sources/Database/Compatibility/ICreateInstance.cpp	Tue Jul 07 19:54:53 2020 +0200
@@ -83,6 +83,7 @@
 
           bool ok = (database.LookupResource(result.patientId_, dummy, hashPatient) &&
                      database.LookupResource(result.studyId_, dummy, hashStudy));
+          (void) ok;  // Remove warning about unused variable in release builds
           assert(ok);
         }
         else if (database.LookupResource(result.studyId_, dummy, hashStudy))
@@ -93,6 +94,7 @@
           result.isNewSeries_ = true;
 
           bool ok = database.LookupResource(result.patientId_, dummy, hashPatient);
+          (void) ok;  // Remove warning about unused variable in release builds
           assert(ok);
         }
         else if (database.LookupResource(result.patientId_, dummy, hashPatient))
--- a/OrthancServer/Sources/ServerIndex.cpp	Tue Jul 07 19:37:25 2020 +0200
+++ b/OrthancServer/Sources/ServerIndex.cpp	Tue Jul 07 19:54:53 2020 +0200
@@ -1506,6 +1506,7 @@
       if (!done)
       {
         bool ok = db_.LookupParent(currentId, currentId);
+        (void) ok;  // Remove warning about unused variable in release builds
         assert(ok);
       }
     }