diff options
| -rw-r--r-- | 3party/protobuf/config.h | 6 | ||||
| -rw-r--r-- | drape_frontend/area_shape.cpp | 2 | ||||
| -rw-r--r-- | std/bind.hpp | 2 | ||||
| -rw-r--r-- | std/function.hpp | 2 | ||||
| -rw-r--r-- | std/shared_ptr.hpp | 2 | ||||
| -rw-r--r-- | std/weak_ptr.hpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/3party/protobuf/config.h b/3party/protobuf/config.h index e6b7816c94..dea2a3bcfa 100644 --- a/3party/protobuf/config.h +++ b/3party/protobuf/config.h @@ -8,7 +8,7 @@ #ifdef _MSC_VER #define HASH_MAP_H <hash_map> #else - #if __cplusplus > 199711L + #if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__) #define HASH_MAP_H <unordered_map> #else #define HASH_MAP_H <tr1/unordered_map> @@ -19,7 +19,7 @@ #ifdef _MSC_VER #define HASH_NAMESPACE stdext #else - #if __cplusplus > 199711L + #if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__) #define HASH_NAMESPACE std #else #define HASH_NAMESPACE std::tr1 @@ -33,7 +33,7 @@ #ifdef _MSC_VER #define HASH_SET_H <hash_set> #else - #if __cplusplus > 199711L + #if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__) #define HASH_SET_H <unordered_set> #else #define HASH_SET_H <tr1/unordered_set> diff --git a/drape_frontend/area_shape.cpp b/drape_frontend/area_shape.cpp index 3972f6bba8..1c44bace34 100644 --- a/drape_frontend/area_shape.cpp +++ b/drape_frontend/area_shape.cpp @@ -13,7 +13,7 @@ AreaShape::AreaShape(vector<m2::PointF> const & triangleList, AreaViewParams con { m_vertexes.reserve(triangleList.size()); -#if __cplusplus > 199711L +#if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__) void (vector<Point3D>::* fn)(Point3D &&) = #else void (vector<Point3D>::* fn)(Point3D const &) = diff --git a/std/bind.hpp b/std/bind.hpp index 88a9e85cff..07c5abfc54 100644 --- a/std/bind.hpp +++ b/std/bind.hpp @@ -6,7 +6,7 @@ #undef new #endif -#if __cplusplus > 199711L +#if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__) #include <functional> using std::bind; diff --git a/std/function.hpp b/std/function.hpp index ca461298d5..9c3f6d9a4c 100644 --- a/std/function.hpp +++ b/std/function.hpp @@ -5,7 +5,7 @@ #undef new #endif -#if __cplusplus > 199711L +#if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__) #include <functional> using std::function; diff --git a/std/shared_ptr.hpp b/std/shared_ptr.hpp index fd70c8f731..d05e4e0b25 100644 --- a/std/shared_ptr.hpp +++ b/std/shared_ptr.hpp @@ -5,7 +5,7 @@ #undef new #endif -#if __cplusplus > 199711L +#if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__) #include <memory> using std::shared_ptr; diff --git a/std/weak_ptr.hpp b/std/weak_ptr.hpp index ac9f183e07..842e086efd 100644 --- a/std/weak_ptr.hpp +++ b/std/weak_ptr.hpp @@ -5,7 +5,7 @@ #undef new #endif -#if __cplusplus > 199711L +#if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__) #include <memory> using std::weak_ptr; |