Mercurial > hg > orthanc

changeset 4305:8992faf451fc

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 Fri, 06 Nov 2020 17:02:42 +0100
parents 50b0c69b653a
children 548d77dfb8bc
files OrthancFramework/Resources/CheckOrthancFrameworkSymbols.py OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.h OrthancFramework/Sources/JobsEngine/Operations/StringOperationValue.h OrthancServer/Plugins/Samples/ConnectivityChecks/CMakeLists.txt OrthancServer/Sources/ServerJobs/Operations/DicomInstanceOperationValue.h
diffstat 5 files changed, 22 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/CheckOrthancFrameworkSymbols.py	Fri Nov 06 16:33:52 2020 +0100
+++ b/OrthancFramework/Resources/CheckOrthancFrameworkSymbols.py	Fri Nov 06 17:02:42 2020 +0100
@@ -68,7 +68,8 @@
 
 for root, dirs, files in os.walk(os.path.join(ROOT, '..', 'Sources')):
     for name in files:
-        if os.path.splitext(name)[1] == '.h':
+        if (os.path.splitext(name)[1] == '.h' and
+            name != 'Enumerations_TransferSyntaxes.impl.h'):
             SOURCES.append(os.path.join(root, name))
 
 AMALGAMATION = '/tmp/CheckOrthancFrameworkSymbols.cpp'
@@ -82,7 +83,6 @@
 tu = index.parse(AMALGAMATION, [
     '-DORTHANC_BUILDING_FRAMEWORK_LIBRARY=1',
     '-DORTHANC_BUILD_UNIT_TESTS=0',
-    '-DORTHANC_SANDBOXED=0',
     '-DORTHANC_ENABLE_BASE64=1',
     '-DORTHANC_ENABLE_CIVETWEB=1',
     '-DORTHANC_ENABLE_CURL=1',
@@ -92,15 +92,16 @@
     '-DORTHANC_ENABLE_DCMTK_TRANSCODING=1',
     '-DORTHANC_ENABLE_JPEG=1',
     '-DORTHANC_ENABLE_LOCALE=1',
+    '-DORTHANC_ENABLE_LOGGING=1',
+    '-DORTHANC_ENABLE_LOGGING_STDIO=0',
     '-DORTHANC_ENABLE_LUA=1',
-    '-DORTHANC_ENABLE_LOGGING=1',
     '-DORTHANC_ENABLE_MD5=1',
     '-DORTHANC_ENABLE_PKCS11=1',
     '-DORTHANC_ENABLE_PNG=1',
     '-DORTHANC_ENABLE_PUGIXML=1',
     '-DORTHANC_ENABLE_SSL=1',
+    '-DORTHANC_SANDBOXED=0',
     '-DORTHANC_SQLITE_STANDALONE=0',
-    '-DORTHANC_ENABLE_LOGGING_STDIO=0',
 ])
 
 
@@ -258,6 +259,19 @@
               child.kind == clang.cindex.CursorKind.STRUCT_DECL):
             ExploreClass(child, fqn)
 
+        elif child.kind == clang.cindex.CursorKind.FUNCTION_DECL:
+            visible = False
+            hasImplementation = False
+            for i in child.get_children():
+                if (i.kind == clang.cindex.CursorKind.VISIBILITY_ATTR and
+                    i.spelling == 'default'):
+                    visible = True
+                elif i.kind == clang.cindex.CursorKind.COMPOUND_STMT:
+                    hasImplementation = True
+
+            if visible and hasImplementation:
+                ReportProblem('Exported public function with an implementation', fqn, i)
+
 
 
 print('')
--- a/OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.h	Fri Nov 06 16:33:52 2020 +0100
+++ b/OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.h	Fri Nov 06 17:02:42 2020 +0100
@@ -120,7 +120,7 @@
 
     virtual bool GetOutput(std::string& output,
                            MimeType& mime,
-                           const std::string& key);
+                           const std::string& key) ORTHANC_OVERRIDE;
 
     void AwakeTrailingSleep();
   };
--- a/OrthancFramework/Sources/JobsEngine/Operations/StringOperationValue.h	Fri Nov 06 16:33:52 2020 +0100
+++ b/OrthancFramework/Sources/JobsEngine/Operations/StringOperationValue.h	Fri Nov 06 17:02:42 2020 +0100
@@ -38,7 +38,7 @@
   public:
     explicit StringOperationValue(const std::string& content);
 
-    virtual Type GetType() const;
+    virtual Type GetType() const ORTHANC_OVERRIDE;
     
     virtual JobOperationValue* Clone() const ORTHANC_OVERRIDE;
 
--- a/OrthancServer/Plugins/Samples/ConnectivityChecks/CMakeLists.txt	Fri Nov 06 16:33:52 2020 +0100
+++ b/OrthancServer/Plugins/Samples/ConnectivityChecks/CMakeLists.txt	Fri Nov 06 17:02:42 2020 +0100
@@ -69,6 +69,7 @@
   ${ORTHANC_CORE_SOURCES_DEPENDENCIES}
   ${CMAKE_SOURCE_DIR}/../../../../OrthancFramework/Sources/Enumerations.cpp
   ${CMAKE_SOURCE_DIR}/../../../../OrthancFramework/Sources/Logging.cpp
+  ${CMAKE_SOURCE_DIR}/../../../../OrthancFramework/Sources/OrthancException.cpp
   ${CMAKE_SOURCE_DIR}/../../../../OrthancFramework/Sources/SystemToolbox.cpp
   ${CMAKE_SOURCE_DIR}/../../../../OrthancFramework/Sources/Toolbox.cpp
   Plugin.cpp
--- a/OrthancServer/Sources/ServerJobs/Operations/DicomInstanceOperationValue.h	Fri Nov 06 16:33:52 2020 +0100
+++ b/OrthancServer/Sources/ServerJobs/Operations/DicomInstanceOperationValue.h	Fri Nov 06 17:02:42 2020 +0100
@@ -54,7 +54,7 @@
     {
     }
 
-    virtual Type GetType() const
+    virtual Type GetType() const ORTHANC_OVERRIDE
     {
       return Type_DicomInstance;
     }