Mercurial > hg > orthanc-stone

changeset 566:ccd1a1ede305 am-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix previous merge
author Alain Mazy <alain@mazy.be>
date Thu, 18 Apr 2019 11:04:46 +0200
parents 109963050112
children 375dc0aeb19b e77cbe4bb4c8
files Applications/StoneApplicationContext.h
diffstat 1 files changed, 17 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/StoneApplicationContext.h	Thu Apr 18 10:43:17 2019 +0200
+++ b/Applications/StoneApplicationContext.h	Thu Apr 18 11:04:46 2019 +0200
@@ -27,7 +27,24 @@
 #include "../Framework/Viewport/WidgetViewport.h"
 
 
+#ifdef _MSC_VER
+  #if _MSC_VER > 1910
+    #define orthanc_override override
   #else
+    #define orthanc_override
+  #endif
+#elif defined __GNUC__
+  #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+/* Test for GCC > 3.2.0 */
+  #if GCC_VERSION > 40900
+    #define orthanc_override override
+  #else
+    #define orthanc_override
+  #endif
+#else
+    #define orthanc_override
+#endif
+
 #include <list>
 
 namespace OrthancStone