Mercurial > hg > orthanc-stone

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default -> dev
author Alain Mazy <alain@mazy.be>
date Thu, 18 Apr 2019 09:30:00 +0200
parents aa00a49444c6 aaeec7be8fb7
children ccd1a1ede305
comparison
equal deleted inserted replaced
558:d5579bdc59b5 561:1201b12eb9f8
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
33 #else 30 #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
48 #include <list> 31 #include <list>
49 32
50 namespace OrthancStone 33 namespace OrthancStone
51 { 34 {
52 // a StoneApplicationContext contains the services that a StoneApplication 35 // a StoneApplicationContext contains the services that a StoneApplication