Skip to content

Commit 7b62cea

Browse files
committed
- disabled warning 4786 for VS6 caused by STL (identifier was truncated to '255' characters in the debug information)
- added batchbuild config for XP VM
1 parent cb5ae30 commit 7b62cea

2 files changed

Lines changed: 29 additions & 0 deletions

File tree

devtools/agent_vmxp.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"cmake_variants" : [
3+
{"name": "generator",
4+
"generators": [
5+
{"generator": [
6+
"Visual Studio 6",
7+
"Visual Studio 7",
8+
"Visual Studio 8 2005"
9+
]
10+
}
11+
]
12+
},
13+
{"name": "shared_dll",
14+
"variables": [
15+
["JSONCPP_LIB_BUILD_SHARED=true"],
16+
["JSONCPP_LIB_BUILD_SHARED=false"]
17+
]
18+
},
19+
{"name": "build_type",
20+
"build_types": [
21+
"debug",
22+
"release"
23+
]
24+
}
25+
]
26+
}

include/json/config.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@
6868
// Microsoft Visual Studio 6 only support conversion from __int64 to double
6969
// (no conversion from unsigned __int64).
7070
#define JSON_USE_INT64_DOUBLE_CONVERSION 1
71+
// Disable warning 4786 for VS6 caused by STL (identifier was truncated to '255' characters in the debug information)
72+
// All projects I've ever seen with VS6 were using this globally (not bothering with pragma push/pop).
73+
#pragma warning(disable : 4786)
7174
#endif // if defined(_MSC_VER) && _MSC_VER < 1200 // MSVC 6
7275

7376
#if defined(_MSC_VER) && _MSC_VER >= 1500 // MSVC 2008

0 commit comments

Comments
 (0)