diff options
| author | Alex Zolotarev <deathbaba@gmail.com> | 2011-05-22 18:55:16 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:17:46 +0300 |
| commit | d05a95d469e90eba4919083217fb354479157d0d (patch) | |
| tree | 902f1360d961c6d1d1ac28ae8660f77951407f58 /std | |
| parent | 93219f070fc01b82584a121e0a0d2beb97d01c3d (diff) | |
Fixed MSVC2010 compilation issues
Diffstat (limited to 'std')
| -rw-r--r-- | std/stdint.hpp | 2 | ||||
| -rw-r--r-- | std/unordered_map.hpp | 5 | ||||
| -rw-r--r-- | std/unordered_set.hpp | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/std/stdint.hpp b/std/stdint.hpp index 769c0870fe..d679ba5e7f 100644 --- a/std/stdint.hpp +++ b/std/stdint.hpp @@ -6,7 +6,7 @@ #undef new #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER < 1600 // in VS2010 types below are defined typedef __int8 int8_t; typedef __int16 int16_t; typedef __int32 int32_t; diff --git a/std/unordered_map.hpp b/std/unordered_map.hpp index e6b9fb90f1..19e9588b4c 100644 --- a/std/unordered_map.hpp +++ b/std/unordered_map.hpp @@ -5,6 +5,11 @@ #undef new #endif +#if defined(_MSC_VER) && (_MSC_VER >= 1600) + // to avoid compilation errors on VS2010 + #define BOOST_NO_0X_HDR_TYPEINDEX +#endif + #include <boost/unordered_map.hpp> using boost::unordered_map; using boost::unordered_multimap; diff --git a/std/unordered_set.hpp b/std/unordered_set.hpp index 2377ed7f2a..c0a69d9eca 100644 --- a/std/unordered_set.hpp +++ b/std/unordered_set.hpp @@ -5,6 +5,11 @@ #undef new #endif +#if defined(_MSC_VER) && (_MSC_VER >= 1600) + // to avoid compilation errors on VS2010 + #define BOOST_NO_0X_HDR_TYPEINDEX +#endif + #include <boost/unordered_set.hpp> using boost::unordered_set; |