Mercurial > hg > orthanc
changeset 6439:8b2ef7afec93
merge
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 18 Nov 2025 17:21:29 +0100 |
| parents | 9aa0a92c7d27 (diff) b832b6f7375d (current diff) |
| children | bd0fb2559a7e f0287aed9e5c |
| files | |
| diffstat | 4 files changed, 1 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.cpp Tue Nov 18 17:14:25 2025 +0100 +++ b/OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.cpp Tue Nov 18 17:21:29 2025 +0100 @@ -191,12 +191,6 @@ } - void SetOfInstancesJob::Start() - { - SetOfCommandsJob::Start(); - } - - void SetOfInstancesJob::Reset() { SetOfCommandsJob::Reset();
--- a/OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.h Tue Nov 18 17:14:25 2025 +0100 +++ b/OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.h Tue Nov 18 17:21:29 2025 +0100 @@ -73,8 +73,6 @@ bool IsFailedInstance(const std::string& instance) const; - virtual void Start() ORTHANC_OVERRIDE; - virtual void Reset() ORTHANC_OVERRIDE; virtual void GetPublicContent(Json::Value& target) const ORTHANC_OVERRIDE;
--- a/OrthancFramework/Sources/MultiThreading/IRunnableBySteps.h Tue Nov 18 17:14:25 2025 +0100 +++ b/OrthancFramework/Sources/MultiThreading/IRunnableBySteps.h Tue Nov 18 17:21:29 2025 +0100 @@ -32,10 +32,6 @@ class IRunnableBySteps : public IDynamicObject { public: - virtual ~IRunnableBySteps() ORTHANC_OVERRIDE - { - } - // Must return "true" if the runnable wishes to continue. Must // return "false" if the runnable has not finished its job. virtual bool Step() = 0;
--- a/OrthancServer/Resources/RunCppCheck-2.17.1.sh Tue Nov 18 17:14:25 2025 +0100 +++ b/OrthancServer/Resources/RunCppCheck-2.17.1.sh Tue Nov 18 17:21:29 2025 +0100 @@ -22,7 +22,6 @@ constParameterPointer:../../OrthancFramework/Sources/Logging.cpp:447 constParameterPointer:../../OrthancFramework/Sources/Logging.cpp:451 constParameterPointer:../../OrthancFramework/Sources/Toolbox.cpp:3046 -constParameterPointer:../../OrthancFramework/Sources/Toolbox.cpp:3053 cstyleCast:../../OrthancServer/Plugins/Engine/PluginsManager.cpp:108 cstyleCast:../../OrthancServer/Plugins/Engine/PluginsManager.cpp:124 cstyleCast:../../OrthancServer/Plugins/Engine/PluginsManager.cpp:140 @@ -41,19 +40,15 @@ knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2299 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2300 nullPointer:../../OrthancFramework/UnitTestsSources/RestApiTests.cpp:322 -stlFindInsert:../../OrthancFramework/Sources/DicomFormat/DicomMap.cpp:1525 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:166 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:74 syntaxError:../../OrthancFramework/Sources/SQLite/FunctionContext.h:53 syntaxError:../../OrthancFramework/UnitTestsSources/DicomMapTests.cpp:74 syntaxError:../../OrthancFramework/UnitTestsSources/ZipTests.cpp:133 syntaxError:../../OrthancServer/UnitTestsSources/UnitTestsMain.cpp:325 -unknownMacro:../../OrthancFramework/Sources/DicomParsing/DicomModification.cpp:39 useInitializationList:../../OrthancFramework/Sources/Images/PngReader.cpp:91 useInitializationList:../../OrthancFramework/Sources/Images/PngWriter.cpp:99 useInitializationList:../../OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp:275 -uselessOverride:../../OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.h:76 -uselessOverride:../../OrthancFramework/Sources/MultiThreading/IRunnableBySteps.h:35 variableScope:../../OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp:228 variableScope:../../OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.cpp:94 EOF @@ -107,6 +102,7 @@ -DORTHANC_SANDBOXED=0 \ -DORTHANC_SQLITE_VERSION=3027001 \ -DORTHANC_UNIT_TESTS_LINK_FRAMEWORK=1 \ + -DORTHANC_VERSION="\"mainline\"" \ -DPUGIXML_VERSION=150 \ -DUNIT_TESTS_WITH_HTTP_CONNEXIONS=1 \ -D__BYTE_ORDER=__LITTLE_ENDIAN \