aboutsummaryrefslogtreecommitdiff
path: root/deskutils/gnote/files/extra-src_base_macros.hpp
blob: a04e604f38aba3659e7f8825cf5c2276acb09aa9 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
Working around c++11 issues with the port compiler used on 9.3.

--- src/base/macros.hpp.orig	2016-01-06 21:33:38.207318000 +0100
+++ src/base/macros.hpp	2016-01-06 21:45:25.932524000 +0100
@@ -29,14 +29,16 @@
 #ifndef __BASE_MACROS_
 #define __BASE_MACROS_
 
-#if __cplusplus < 201103L
+//#if __cplusplus < 201103L
   #include <tr1/memory>
   #include <boost/foreach.hpp>
   #include <boost/lexical_cast.hpp>
+/*
 #else
   #include <memory>
   #include <string>
 #endif
+*/
 
 #if __GNUC__
 #define _PRINTF_FORMAT(f,a) \
@@ -46,7 +48,7 @@
 #endif
 
 // define 'final' and 'override' for pre-C++11 compilers
-#if __cplusplus < 201103L
+//#if __cplusplus < 201103L
   #define final
   #define override
   #define FOREACH(var, container) BOOST_FOREACH(var, container)
@@ -58,6 +60,7 @@
   using std::tr1::enable_shared_from_this;
   using std::tr1::dynamic_pointer_cast;
   using std::tr1::static_pointer_cast;
+/*
 #else
   #define FOREACH(var, container) for(var : container)
   #define TO_STRING(x) std::to_string(x)
@@ -69,5 +72,6 @@
   using std::dynamic_pointer_cast;
   using std::static_pointer_cast;
 #endif
+*/
 
 #endif