pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[c++11] Backport for gcc 4.6 support

Browse source
This commit is contained in:
Alex Zolotarev 2014-08-25 18:43:51 +03:00 • committed by Alex Zolotarev
parent faba78e0c4
commit e82152f267
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
3party/protobuf/config.h
View file

@ -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>

2
drape_frontend/area_shape.cpp
View file

@ -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 &) =

2
std/bind.hpp
View file

@ -6,7 +6,7 @@
#undef new
#endif
#if __cplusplus > 199711L
#if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__)
#include <functional>
using std::bind;

2
std/function.hpp
View file

@ -5,7 +5,7 @@
#undef new
#endif
#if __cplusplus > 199711L
#if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__)
#include <functional>
using std::function;

2
std/shared_ptr.hpp
View file

@ -5,7 +5,7 @@
#undef new
#endif
#if __cplusplus > 199711L
#if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__)
#include <memory>
using std::shared_ptr;

2
std/weak_ptr.hpp
View file

@ -5,7 +5,7 @@
#undef new
#endif
#if __cplusplus > 199711L
#if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__)
#include <memory>
using std::weak_ptr;