# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1607256987 -3600
# Node ID e457c30970cf05283338dcccb86ade7b749df1da
# Parent  85237ae3a0766812133333be27f1a37494be1823
fix ORTHANC_DEPRECATED macro for C++14

diff -r 85237ae3a076 -r e457c30970cf OrthancFramework/Sources/Compatibility.h
--- a/OrthancFramework/Sources/Compatibility.h	Sun Dec 06 12:47:54 2020 +0100
+++ b/OrthancFramework/Sources/Compatibility.h	Sun Dec 06 13:16:27 2020 +0100
@@ -34,12 +34,12 @@
 
 
 // Macro "ORTHANC_DEPRECATED" tags a function as having been deprecated
-#if __cplusplus >= 201402L   // C++14
-#  define ORTHANC_DEPRECATED [[deprecated]]
+#if (__cplusplus >= 201402L)  // C++14
+#  define ORTHANC_DEPRECATED(f) [[deprecated]] f
 #elif defined(__GNUC__) || defined(__clang__)
-#  define ORTHANC_DEPRECATED __attribute__((deprecated))
+#  define ORTHANC_DEPRECATED(f) f __attribute__((deprecated))
 #elif defined(_MSC_VER)
-#  define ORTHANC_DEPRECATED __declspec(deprecated)
+#  define ORTHANC_DEPRECATED(f) f __declspec(deprecated)
 #else
 #  define ORTHANC_DEPRECATED
 #endif
diff -r 85237ae3a076 -r e457c30970cf OrthancFramework/Sources/DicomFormat/DicomTag.h
--- a/OrthancFramework/Sources/DicomFormat/DicomTag.h	Sun Dec 06 12:47:54 2020 +0100
+++ b/OrthancFramework/Sources/DicomFormat/DicomTag.h	Sun Dec 06 13:16:27 2020 +0100
@@ -74,7 +74,7 @@
                                  DicomModule module);
 
 #if ORTHANC_BUILDING_FRAMEWORK_LIBRARY == 1
-    ORTHANC_PUBLIC friend std::ostream& operator<< (std::ostream& o, const DicomTag& tag) ORTHANC_DEPRECATED;
+    ORTHANC_PUBLIC ORTHANC_DEPRECATED(friend std::ostream& operator<<(std::ostream& o, const DicomTag& tag));
 #endif
   };
 
diff -r 85237ae3a076 -r e457c30970cf OrthancFramework/Sources/HttpServer/HttpToolbox.h
--- a/OrthancFramework/Sources/HttpServer/HttpToolbox.h	Sun Dec 06 12:47:54 2020 +0100
+++ b/OrthancFramework/Sources/HttpServer/HttpToolbox.h	Sun Dec 06 13:16:27 2020 +0100
@@ -62,36 +62,32 @@
                                     const GetArguments& source);
 
 #if (ORTHANC_ENABLE_MONGOOSE == 1 || ORTHANC_ENABLE_CIVETWEB == 1)
-    ORTHANC_DEPRECATED
-    static bool SimpleGet(std::string& result,
-                          IHttpHandler& handler,
-                          RequestOrigin origin,
-                          const std::string& uri,
-                          const Arguments& httpHeaders);
+    ORTHANC_DEPRECATED(static bool SimpleGet(std::string& result,
+                                             IHttpHandler& handler,
+                                             RequestOrigin origin,
+                                             const std::string& uri,
+                                             const Arguments& httpHeaders));
 
-    ORTHANC_DEPRECATED
-    static bool SimplePost(std::string& result,
-                           IHttpHandler& handler,
-                           RequestOrigin origin,
-                           const std::string& uri,
-                           const void* bodyData,
-                           size_t bodySize,
-                           const Arguments& httpHeaders);
+    ORTHANC_DEPRECATED(static bool SimplePost(std::string& result,
+                                              IHttpHandler& handler,
+                                              RequestOrigin origin,
+                                              const std::string& uri,
+                                              const void* bodyData,
+                                              size_t bodySize,
+                                              const Arguments& httpHeaders));
 
-    ORTHANC_DEPRECATED
-    static bool SimplePut(std::string& result,
-                          IHttpHandler& handler,
-                          RequestOrigin origin,
-                          const std::string& uri,
-                          const void* bodyData,
-                          size_t bodySize,
-                          const Arguments& httpHeaders);
+    ORTHANC_DEPRECATED(static bool SimplePut(std::string& result,
+                                             IHttpHandler& handler,
+                                             RequestOrigin origin,
+                                             const std::string& uri,
+                                             const void* bodyData,
+                                             size_t bodySize,
+                                             const Arguments& httpHeaders));
 
-    ORTHANC_DEPRECATED
-    static bool SimpleDelete(IHttpHandler& handler,
-                             RequestOrigin origin,
-                             const std::string& uri,
-                             const Arguments& httpHeaders);
+    ORTHANC_DEPRECATED(static bool SimpleDelete(IHttpHandler& handler,
+                                                RequestOrigin origin,
+                                                const std::string& uri,
+                                                const Arguments& httpHeaders));
 #endif
   };
 }
diff -r 85237ae3a076 -r e457c30970cf OrthancFramework/Sources/JobsEngine/Operations/JobOperationValues.h
--- a/OrthancFramework/Sources/JobsEngine/Operations/JobOperationValues.h	Sun Dec 06 12:47:54 2020 +0100
+++ b/OrthancFramework/Sources/JobsEngine/Operations/JobOperationValues.h	Sun Dec 06 13:16:27 2020 +0100
@@ -50,7 +50,7 @@
 
 #if ORTHANC_BUILDING_FRAMEWORK_LIBRARY == 1
     // For binary compatibility with Orthanc <= 1.8.0
-    void Append(JobOperationValue* value) ORTHANC_DEPRECATED;
+    ORTHANC_DEPRECATED(void Append(JobOperationValue* value));
 #endif
     
     void Append(JobOperationValues& target,
diff -r 85237ae3a076 -r e457c30970cf OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.h
--- a/OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.h	Sun Dec 06 12:47:54 2020 +0100
+++ b/OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.h	Sun Dec 06 13:16:27 2020 +0100
@@ -85,8 +85,8 @@
       boost::mutex::scoped_lock  lock_;
 
 #if ORTHANC_BUILDING_FRAMEWORK_LIBRARY == 1
-      void AddInput(size_t index,
-                    const JobOperationValue& value) ORTHANC_DEPRECATED;
+      ORTHANC_DEPRECATED(void AddInput(size_t index,
+                                       const JobOperationValue& value));
 #endif
       
     public: