diff Applications/StoneApplicationContext.h @ 561:1201b12eb9f8 dev

merge default -> dev
author Alain Mazy <alain@mazy.be>
date Thu, 18 Apr 2019 09:30:00 +0200
parents aa00a49444c6 aaeec7be8fb7
children ccd1a1ede305
line wrap: on
line diff
--- a/Applications/StoneApplicationContext.h	Wed Apr 17 16:13:42 2019 +0200
+++ b/Applications/StoneApplicationContext.h	Thu Apr 18 09:30:00 2019 +0200
@@ -27,24 +27,7 @@
 #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