From d0332953cda33fb4f8e24ebff9c49159b69c43d6 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Sat, 29 May 2010 13:00:38 -0700 Subject: Add protobuf 2.3.0 sources This is the contents of protobuf-2.3.0.tar.bz2 from http://code.google.com/p/protobuf/downloads/list. Change-Id: Idfde09ce7ef5ac027b07ee83f2674fbbed5c30b2 --- vsprojects/config.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'vsprojects/config.h') diff --git a/vsprojects/config.h b/vsprojects/config.h index e09f297..2c64450 100644 --- a/vsprojects/config.h +++ b/vsprojects/config.h @@ -5,7 +5,11 @@ #define HASH_MAP_H /* 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 >= 1600 #define HASH_NAMESPACE std #else #define HASH_NAMESPACE stdext -- cgit v1.1