Mercurial > hg > orthanc

changeset 6398:55db426a8667

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <am@orthanc.team>
date Wed, 12 Nov 2025 18:02:18 +0100
parents 252867eea2db (diff) cf8715d1aaf0 (current diff)
children 1facef20a778 ded8a2be0d46 18a70fb61b91
files
diffstat 5 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.cpp	Wed Nov 12 13:51:16 2025 +0100
+++ b/OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.cpp	Wed Nov 12 18:02:18 2025 +0100
@@ -460,7 +460,7 @@
     done_(false)
   {
     std::string jobType;
-    GetJobType(jobType);
+    SequenceOfOperationsJob::GetJobType(jobType);
     
     if (SerializationToolbox::ReadString(serialized, TYPE) != jobType ||
         !serialized.isMember(OPERATIONS) ||
--- a/OrthancFramework/UnitTestsSources/RestApiTests.cpp	Wed Nov 12 13:51:16 2025 +0100
+++ b/OrthancFramework/UnitTestsSources/RestApiTests.cpp	Wed Nov 12 18:02:18 2025 +0100
@@ -402,7 +402,7 @@
     void Reset()
     {
       HttpContentNegociation::Dictionary parameters;
-      Handle("nope", "nope", parameters);
+      AcceptHandler::Handle("nope", "nope", parameters);
     }
 
     const std::string& GetType() const
--- a/OrthancServer/Resources/RunCppCheck.sh	Wed Nov 12 13:51:16 2025 +0100
+++ b/OrthancServer/Resources/RunCppCheck.sh	Wed Nov 12 18:02:18 2025 +0100
@@ -26,7 +26,6 @@
 syntaxError:../../OrthancFramework/UnitTestsSources/ZipTests.cpp:133
 syntaxError:../../OrthancServer/UnitTestsSources/UnitTestsMain.cpp:325
 uninitMemberVar:../../OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp:419
-unusedFunction
 useInitializationList:../../OrthancFramework/Sources/Images/PngReader.cpp:91
 useInitializationList:../../OrthancFramework/Sources/Images/PngWriter.cpp:99
 useInitializationList:../../OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp:275
@@ -59,12 +58,14 @@
 throwInNoexceptFunction:../../OrthancFramework/Sources/MetricsRegistry.cpp:620
 throwInNoexceptFunction:../../OrthancFramework/Sources/MetricsRegistry.cpp:632
 throwInNoexceptFunction:../../OrthancFramework/Sources/MetricsRegistry.cpp:676
-throwInNoexceptFunction:../../OrthancFramework/Sources/JobsEngine/JobsRegistry.cpp:1301
+throwInNoexceptFunction:../../OrthancFramework/Sources/JobsEngine/JobsRegistry.cpp:1296
 throwInNoexceptFunction:../../OrthancServer/Sources/LuaScripting.cpp:830
 throwInNoexceptFunction:../../OrthancServer/Sources/StorageCommitmentReports.cpp:187
 throwInNoexceptFunction:../../OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.h:218
 throwInNoexceptFunction:../../OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.h:376
 throwInNoexceptFunction:../../OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.h:496
+rethrowNoCurrentException:../../OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp
+rethrowNoCurrentException:../../OrthancFramework/UnitTestsSources/RestApiTests.cpp
 EOF
 
 # TODO: re-enable nullPointerOutOfMemory
--- a/OrthancServer/Sources/OrthancWebDav.h	Wed Nov 12 13:51:16 2025 +0100
+++ b/OrthancServer/Sources/OrthancWebDav.h	Wed Nov 12 18:02:18 2025 +0100
@@ -101,7 +101,7 @@
 
     virtual ~OrthancWebDav() ORTHANC_OVERRIDE
     {
-      Stop();
+      OrthancWebDav::Stop();
     }
 
     virtual bool IsExistingFolder(const UriComponents& path) ORTHANC_OVERRIDE;
--- a/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp	Wed Nov 12 13:51:16 2025 +0100
+++ b/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp	Wed Nov 12 18:02:18 2025 +0100
@@ -209,7 +209,7 @@
 
     virtual ~ThreadedInstanceLoader() ORTHANC_OVERRIDE
     {
-      Clear();
+      ThreadedInstanceLoader::Clear();
     }
 
     virtual void Clear() ORTHANC_OVERRIDE