Skip to content

Commit

Permalink
- disabled warning 4786 for VS6 caused by STL (identifier was truncat…
Browse files Browse the repository at this point in the history
…ed to '255' characters in the debug information)

- added batchbuild config for XP VM
  • Loading branch information
blep committed May 9, 2013
1 parent cb5ae30 commit 7b62cea
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 0 deletions.
26 changes: 26 additions & 0 deletions devtools/agent_vmxp.json
Original file line number Diff line number Diff line change
@@ -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"
]
}
]
}
3 changes: 3 additions & 0 deletions include/json/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7b62cea

Please sign in to comment.