Mercurial > hg > orthanc-stone

comparison Applications/StoneApplicationContext.h @ 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 1201b12eb9f8
children 4f2416d519b4
comparison
equal deleted inserted replaced
565:109963050112 566:ccd1a1ede305
25 #include "../Framework/Toolbox/IDelayedCallExecutor.h" 25 #include "../Framework/Toolbox/IDelayedCallExecutor.h"
26 #include "../Framework/Toolbox/OrthancApiClient.h" 26 #include "../Framework/Toolbox/OrthancApiClient.h"
27 #include "../Framework/Viewport/WidgetViewport.h" 27 #include "../Framework/Viewport/WidgetViewport.h"
28 28
29 29
30 #ifdef _MSC_VER
31 #if _MSC_VER > 1910
32 #define orthanc_override override
30 #else 33 #else
34 #define orthanc_override
35 #endif
36 #elif defined __GNUC__
37 #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
38 /* Test for GCC > 3.2.0 */
39 #if GCC_VERSION > 40900
40 #define orthanc_override override
41 #else
42 #define orthanc_override
43 #endif
44 #else
45 #define orthanc_override
46 #endif
47
31 #include <list> 48 #include <list>
32 49
33 namespace OrthancStone 50 namespace OrthancStone
34 { 51 {
35 // a StoneApplicationContext contains the services that a StoneApplication 52 // a StoneApplicationContext contains the services that a StoneApplication