Support MSVC 2010 beta 1.

pull/3335/head
kenton@google.com 15 years ago
parent 477f799fb6
commit c91e1fe82b
  1. 1
      src/google/protobuf/stubs/strutil.cc
  2. 6
      vsprojects/config.h

@ -36,6 +36,7 @@
#include <limits> #include <limits>
#include <limits.h> #include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <iterator>
#ifdef _WIN32 #ifdef _WIN32
// MSVC has only _snprintf, not snprintf. // MSVC has only _snprintf, not snprintf.

@ -5,7 +5,11 @@
#define HASH_MAP_H <hash_map> #define HASH_MAP_H <hash_map>
/* the namespace of hash_map/hash_set */ /* the namespace of hash_map/hash_set */
#if _MSC_VER < 1310 // Apparently Microsoft decided to move hash_map *back* to the std namespace
// in MSVC 2010:
// http://blogs.msdn.com/vcblog/archive/2009/05/25/stl-breaking-changes-in-visual-studio-2010-beta-1.aspx
// TODO(kenton): Use unordered_map instead, which is available in MSVC 2010.
#if _MSC_VER < 1310 || _MSC_VER >= 1500
#define HASH_NAMESPACE std #define HASH_NAMESPACE std
#else #else
#define HASH_NAMESPACE stdext #define HASH_NAMESPACE stdext

Loading…
Cancel
Save