From 7b62ceacee8acb34ca24e2d5da03a593cb40fd5d Mon Sep 17 00:00:00 2001 From: Baptiste Lepilleur Date: Thu, 9 May 2013 16:24:13 +0000 Subject: [PATCH] - disabled warning 4786 for VS6 caused by STL (identifier was truncated to '255' characters in the debug information) - added batchbuild config for XP VM --- devtools/agent_vmxp.json | 26 ++++++++++++++++++++++++++ include/json/config.h | 3 +++ 2 files changed, 29 insertions(+) create mode 100644 devtools/agent_vmxp.json diff --git a/devtools/agent_vmxp.json b/devtools/agent_vmxp.json new file mode 100644 index 0000000..61f5a4c --- /dev/null +++ b/devtools/agent_vmxp.json @@ -0,0 +1,26 @@ +{ + "cmake_variants" : [ + {"name": "generator", + "generators": [ + {"generator": [ + "Visual Studio 6", + "Visual Studio 7", + "Visual Studio 8 2005" + ] + } + ] + }, + {"name": "shared_dll", + "variables": [ + ["JSONCPP_LIB_BUILD_SHARED=true"], + ["JSONCPP_LIB_BUILD_SHARED=false"] + ] + }, + {"name": "build_type", + "build_types": [ + "debug", + "release" + ] + } + ] +} diff --git a/include/json/config.h b/include/json/config.h index c9b298d..810a56b 100644 --- a/include/json/config.h +++ b/include/json/config.h @@ -68,6 +68,9 @@ // Microsoft Visual Studio 6 only support conversion from __int64 to double // (no conversion from unsigned __int64). #define JSON_USE_INT64_DOUBLE_CONVERSION 1 +// Disable warning 4786 for VS6 caused by STL (identifier was truncated to '255' characters in the debug information) +// All projects I've ever seen with VS6 were using this globally (not bothering with pragma push/pop). +#pragma warning(disable : 4786) #endif // if defined(_MSC_VER) && _MSC_VER < 1200 // MSVC 6 #if defined(_MSC_VER) && _MSC_VER >= 1500 // MSVC 2008