diff options
Diffstat (limited to 'vsprojects')
| -rwxr-xr-x[-rw-r--r--] | vsprojects/config.h | 29 | ||||
| -rwxr-xr-x | vsprojects/extract_includes.bat | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | vsprojects/google/protobuf/stubs/pbconfig.h | 30 | ||||
| -rw-r--r-- | vsprojects/libprotobuf-lite.vcproj | 3 | ||||
| -rw-r--r-- | vsprojects/libprotobuf.vcproj | 3 | ||||
| -rw-r--r-- | vsprojects/lite-test.vcproj | 28 | ||||
| -rw-r--r-- | vsprojects/tests.vcproj | 20 |
7 files changed, 79 insertions, 37 deletions
diff --git a/vsprojects/config.h b/vsprojects/config.h index 2c64450a..a93bb033 100644..100755 --- a/vsprojects/config.h +++ b/vsprojects/config.h @@ -1,28 +1,19 @@ /* protobuf config.h for MSVC. On other platforms, this is generated * automatically by autoheader / autoconf / configure. */ -/* the location of <hash_map> */ -#define HASH_MAP_H <hash_map> +#include <google/protobuf/stubs/pbconfig.h> -/* the namespace of hash_map/hash_set */ -// 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 -#endif - -/* the location of <hash_set> */ -#define HASH_SET_H <hash_set> +#define HASH_MAP_H GOOGLE_PROTOBUF_HASH_MAP_H +#define HASH_NAMESPACE GOOGLE_PROTOBUF_HASH_NAMESPACE +#define HASH_SET_H GOOGLE_PROTOBUF_HASH_SET_H -/* define if the compiler has hash_map */ -#define HAVE_HASH_MAP 1 +#ifdef GOOGLE_PROTOBUF_HAVE_HASH_MAP +#define HAVE_HASH_MAP GOOGLE_PROTOBUF_HAVE_HASH_MAP +#endif -/* define if the compiler has hash_set */ -#define HAVE_HASH_SET 1 +#ifdef GOOGLE_PROTOBUF_HAVE_HASH_SET +#define HAVE_HASH_SET GOOGLE_PROTOBUF_HAVE_HASH_SET +#endif /* define if you want to use zlib. See readme.txt for additional * requirements. */ diff --git a/vsprojects/extract_includes.bat b/vsprojects/extract_includes.bat index e9d762c6..ddf7f33f 100755 --- a/vsprojects/extract_includes.bat +++ b/vsprojects/extract_includes.bat @@ -28,6 +28,7 @@ copy ..\src\google\protobuf\descriptor.pb.h include\google\protobuf\descriptor.p copy ..\src\google\protobuf\dynamic_message.h include\google\protobuf\dynamic_message.h copy ..\src\google\protobuf\extension_set.h include\google\protobuf\extension_set.h copy ..\src\google\protobuf\generated_enum_reflection.h include\google\protobuf\generated_enum_reflection.h +copy ..\src\google\protobuf\generated_enum_util.h include\google\protobuf\generated_enum_util.h copy ..\src\google\protobuf\generated_message_reflection.h include\google\protobuf\generated_message_reflection.h copy ..\src\google\protobuf\generated_message_util.h include\google\protobuf\generated_message_util.h copy ..\src\google\protobuf\io\coded_stream.h include\google\protobuf\io\coded_stream.h @@ -39,7 +40,9 @@ copy ..\src\google\protobuf\io\zero_copy_stream.h include\google\protobuf\io\zer copy ..\src\google\protobuf\io\zero_copy_stream_impl.h include\google\protobuf\io\zero_copy_stream_impl.h copy ..\src\google\protobuf\io\zero_copy_stream_impl_lite.h include\google\protobuf\io\zero_copy_stream_impl_lite.h copy ..\src\google\protobuf\map_entry.h include\google\protobuf\map_entry.h +copy ..\src\google\protobuf\map_entry_lite.h include\google\protobuf\map_entry_lite.h copy ..\src\google\protobuf\map_field.h include\google\protobuf\map_field.h +copy ..\src\google\protobuf\map_field_lite.h include\google\protobuf\map_field_lite.h copy ..\src\google\protobuf\map_field_inl.h include\google\protobuf\map_field_inl.h copy ..\src\google\protobuf\map.h include\google\protobuf\map.h copy ..\src\google\protobuf\map_type_handler.h include\google\protobuf\map_type_handler.h diff --git a/vsprojects/google/protobuf/stubs/pbconfig.h b/vsprojects/google/protobuf/stubs/pbconfig.h index c49d26b0..18250a22 100644..100755 --- a/vsprojects/google/protobuf/stubs/pbconfig.h +++ b/vsprojects/google/protobuf/stubs/pbconfig.h @@ -1,29 +1,39 @@ /* protobuf config.h for MSVC. On other platforms, this is generated * automatically by autoheader / autoconf / configure. */ -/* the location of <hash_map> */ -#define GOOGLE_PROTOBUF_HASH_MAP_H <hash_map> +// NOTE: if you add new macros in this file manually, please propagate the macro +// to vsprojects/config.h. /* the namespace of hash_map/hash_set */ // 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 +// And.. they are moved back to stdext in MSVC 2013 (haven't checked 2012). That +// said, use unordered_map for MSVC 2010 and beyond is our safest bet. +#if _MSC_VER >= 1600 #define GOOGLE_PROTOBUF_HASH_NAMESPACE std -#else +#define GOOGLE_PROTOBUF_HASH_MAP_H <unordered_map> +#define GOOGLE_PROTOBUF_HASH_MAP_CLASS unordered_map +#define GOOGLE_PROTOBUF_HASH_SET_H <unordered_set> +#define GOOGLE_PROTOBUF_HASH_SET_CLASS unordered_set +#elif _MSC_VER >= 1310 #define GOOGLE_PROTOBUF_HASH_NAMESPACE stdext +#define GOOGLE_PROTOBUF_HASH_MAP_H <hash_map> +#define GOOGLE_PROTOBUF_HASH_MAP_CLASS hash_map +#define GOOGLE_PROTOBUF_HASH_SET_H <hash_set> +#define GOOGLE_PROTOBUF_HASH_SET_CLASS hash_set +#else +#define GOOGLE_PROTOBUF_HASH_NAMESPACE std +#define GOOGLE_PROTOBUF_HASH_MAP_H <hash_map> +#define GOOGLE_PROTOBUF_HASH_MAP_CLASS hash_map +#define GOOGLE_PROTOBUF_HASH_SET_H <hash_set> +#define GOOGLE_PROTOBUF_HASH_SET_CLASS hash_set #endif /* the location of <hash_set> */ -#define GOOGLE_PROTOBUF_HASH_SET_H <hash_set> /* define if the compiler has hash_map */ #define GOOGLE_PROTOBUF_HAVE_HASH_MAP 1 /* define if the compiler has hash_set */ #define GOOGLE_PROTOBUF_HAVE_HASH_SET 1 - -/* define if you want to use zlib. See readme.txt for additional - * requirements. */ -// #define HAVE_ZLIB 1 diff --git a/vsprojects/libprotobuf-lite.vcproj b/vsprojects/libprotobuf-lite.vcproj index 339d03fa..d245448d 100644 --- a/vsprojects/libprotobuf-lite.vcproj +++ b/vsprojects/libprotobuf-lite.vcproj @@ -183,6 +183,9 @@ RelativePath="..\src\google\protobuf\stubs\map-util.h" > </File> + <File RelativePath="..\src\google\protobuf\generated_enum_util.h"></File> + <File RelativePath="..\src\google\protobuf\map_entry_lite.h"></File> + <File RelativePath="..\src\google\protobuf\map_field_lite.h"></File> <File RelativePath="..\src\google\protobuf\message_lite.h" > diff --git a/vsprojects/libprotobuf.vcproj b/vsprojects/libprotobuf.vcproj index 6712647d..e782885f 100644 --- a/vsprojects/libprotobuf.vcproj +++ b/vsprojects/libprotobuf.vcproj @@ -223,6 +223,9 @@ RelativePath="..\src\google\protobuf\message_lite.h" > </File> + <File RelativePath="..\src\google\protobuf\generated_enum_util.h"></File> + <File RelativePath="..\src\google\protobuf\map_entry_lite.h"></File> + <File RelativePath="..\src\google\protobuf\map_field_lite.h"></File> <File RelativePath="..\src\google\protobuf\stubs\atomicops.h" > diff --git a/vsprojects/lite-test.vcproj b/vsprojects/lite-test.vcproj index bb338092..8d172248 100644 --- a/vsprojects/lite-test.vcproj +++ b/vsprojects/lite-test.vcproj @@ -182,6 +182,8 @@ RelativePath="..\src\google\protobuf\test_util_lite.h" > </File> + <File RelativePath=".\google\protobuf\map_lite_unittest.pb.h"></File> + <File RelativePath="..\src\google\protobuf\map_lite_test_util.h"></File> <File RelativePath=".\google\protobuf\unittest_lite.pb.h" > @@ -218,6 +220,8 @@ RelativePath=".\google\protobuf\unittest_lite.pb.cc" > </File> + <File RelativePath=".\google\protobuf\map_lite_unittest.pb.cc"></File> + <File RelativePath="..\src\google\protobuf\map_lite_test_util.cc"></File> <File RelativePath=".\google\protobuf\unittest_import_lite.pb.cc" > @@ -299,6 +303,30 @@ /> </FileConfiguration> </File> + <File + RelativePath="..\src\google\protobuf\map_lite_unittest.proto" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Generating map_lite_unittest.pb.{h,cc}..." + CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/map_lite_unittest.proto
" + Outputs="google\protobuf\map_lite_unittest.pb.h;google\protobuf\map_lite_unittest.pb.cc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Generating map_lite_unittest.pb.{h,cc}..." + CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/map_lite_unittest.proto
" + Outputs="google\protobuf\map_lite_unittest.pb.h;google\protobuf\map_lite_unittest.pb.cc" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> diff --git a/vsprojects/tests.vcproj b/vsprojects/tests.vcproj index 23c81f0e..0d42949e 100644 --- a/vsprojects/tests.vcproj +++ b/vsprojects/tests.vcproj @@ -194,6 +194,9 @@ RelativePath="..\src\google\protobuf\test_util.h" > </File> + <File RelativePath="..\src\google\protobuf\map_test_util_impl.h"></File> + <File RelativePath="..\src\google\protobuf\map_test_util.h"></File> + <File RelativePath="..\src\google\protobuf\arena_test_util.h"></File> <File RelativePath="..\src\google\protobuf\compiler\mock_code_generator.h" > @@ -346,6 +349,7 @@ RelativePath="..\src\google\protobuf\map_test_util.cc" > </File> + <File RelativePath="..\src\google\protobuf\arena_test_util.cc"></File> <File RelativePath="..\src\google\protobuf\message_unittest.cc" > @@ -431,7 +435,7 @@ > </File> <File - RelativePath=".\google\protobuf\map_lite_unittest.pb.cc" + RelativePath=".\google\protobuf\unittest_preserve_unknown_enum2.pb.cc" > </File> <File @@ -524,16 +528,16 @@ </File> </Filter> <File - RelativePath="..\src\google\protobuf\map_lite_unittest.proto" + RelativePath="..\src\google\protobuf\unittest_preserve_unknown_enum2.proto" > <FileConfiguration Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" - Description="Generating map_lite_unittest.pb.{h,cc}..." - CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/map_lite_unittest.proto" - Outputs="google\protobuf\map_lite_unittest.pb.h;google\protobuf\map_lite_unittest.pb.cc" + Description="Generating unittest_preserve_unknown_enum2.pb.{h,cc}..." + CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_preserve_unknown_enum2.proto" + Outputs="google\protobuf\unittest_preserve_unknown_enum2.pb.h;google\protobuf\unittest_preserve_unknown_enum2.pb.cc" /> </FileConfiguration> <FileConfiguration @@ -541,9 +545,9 @@ > <Tool Name="VCCustomBuildTool" - Description="Generating map_lite_unittest.pb.{h,cc}..." - CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/map_lite_unittest.proto" - Outputs="google\protobuf\map_lite_unittest.pb.h;google\protobuf\map_lite_unittest.pb.cc" + Description="Generating unittest_preserve_unknown_enum2.pb.{h,cc}..." + CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_preserve_unknown_enum2.proto" + Outputs="google\protobuf\unittest_preserve_unknown_enum2.pb.h;google\protobuf\unittest_preserve_unknown_enum2.pb.cc" /> </FileConfiguration> </File> |