# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1604681461 -3600
# Node ID e712ff3eede3726f8894ccac8e5dc0e72b499e60
# Parent  c17f219cec42f50c0482d7467d5b90de2df3a791
sync

diff -r c17f219cec42 -r e712ff3eede3 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Mon Nov 02 14:01:21 2020 +0100
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Fri Nov 06 17:51:01 2020 +0100
@@ -112,6 +112,12 @@
         set(ORTHANC_FRAMEWORK_MD5 "3c171217f930abe80246997bdbcaf7cc")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.2")
         set(ORTHANC_FRAMEWORK_MD5 "328f94dcbd78c169655a13f7ad58a2c2")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.3")
+        set(ORTHANC_FRAMEWORK_MD5 "3f1ba9502ec7c5449971d3b56087bcde")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.4")
+        set(ORTHANC_FRAMEWORK_MD5 "19fcb7c21876af86546baa048a22c6c0")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.0")
+        set(ORTHANC_FRAMEWORK_MD5 "f8ec7554ef5d23ea4ce474b1e8214de9")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
diff -r c17f219cec42 -r e712ff3eede3 Resources/Orthanc/Databases/DatabaseConstraint.cpp
--- a/Resources/Orthanc/Databases/DatabaseConstraint.cpp	Mon Nov 02 14:01:21 2020 +0100
+++ b/Resources/Orthanc/Databases/DatabaseConstraint.cpp	Fri Nov 06 17:51:01 2020 +0100
@@ -47,6 +47,9 @@
 #  include <OrthancException.h>
 #endif
 
+#include <cassert>
+
+
 namespace Orthanc
 {
   namespace Plugins
diff -r c17f219cec42 -r e712ff3eede3 Resources/Orthanc/Databases/DatabaseConstraint.h
--- a/Resources/Orthanc/Databases/DatabaseConstraint.h	Mon Nov 02 14:01:21 2020 +0100
+++ b/Resources/Orthanc/Databases/DatabaseConstraint.h	Fri Nov 06 17:51:01 2020 +0100
@@ -109,7 +109,7 @@
                        bool mandatory);
 
 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
-    DatabaseConstraint(const OrthancPluginDatabaseConstraint& constraint);
+    explicit DatabaseConstraint(const OrthancPluginDatabaseConstraint& constraint);
 #endif
     
     ResourceType GetLevel() const
diff -r c17f219cec42 -r e712ff3eede3 Resources/Orthanc/Databases/ISqlLookupFormatter.cpp
--- a/Resources/Orthanc/Databases/ISqlLookupFormatter.cpp	Mon Nov 02 14:01:21 2020 +0100
+++ b/Resources/Orthanc/Databases/ISqlLookupFormatter.cpp	Fri Nov 06 17:51:01 2020 +0100
@@ -49,6 +49,9 @@
 
 #include "DatabaseConstraint.h"
 
+#include <boost/lexical_cast.hpp>
+
+
 namespace Orthanc
 {
   static std::string FormatLevel(ResourceType level)
diff -r c17f219cec42 -r e712ff3eede3 Resources/Orthanc/LinuxStandardBaseToolchain.cmake
--- a/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Mon Nov 02 14:01:21 2020 +0100
+++ b/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Fri Nov 06 17:51:01 2020 +0100
@@ -21,11 +21,11 @@
 #
 # Full build, as used on the BuildBot CIS:
 #
-#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu -DENABLE_PKCS11=ON -G Ninja
+#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake ../OrthancServer/ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu -DENABLE_PKCS11=ON -G Ninja
 #
 # Or, more lightweight version (without libp11 and ICU):
 #
-#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -G Ninja
+#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake ../OrthancServer/ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -G Ninja
 #
 
 INCLUDE(CMakeForceCompiler)
diff -r c17f219cec42 -r e712ff3eede3 Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h
--- a/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h	Mon Nov 02 14:01:21 2020 +0100
+++ b/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h	Fri Nov 06 17:51:01 2020 +0100
@@ -779,7 +779,7 @@
     void UpdateProgress(float progress);
     
   public:
-    OrthancJob(const std::string& jobType);
+    explicit OrthancJob(const std::string& jobType);
     
     virtual ~OrthancJob()
     {