Skip to content

Commit 7a9ce63

Browse files
authored
Update RapidJSON (#98573)
1 parent 4254c6c commit 7a9ce63

40 files changed

+1536
-6274
lines changed

src/native/corehost/json_parser.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,22 @@
88
// https://github.com/Tencent/rapidjson/issues/1596#issuecomment-548774663
99
#define RAPIDJSON_48BITPOINTER_OPTIMIZATION 0
1010

11+
// see https://github.com/Tencent/rapidjson/issues/1448
12+
// including windows.h on purpose to provoke a compile time problem as GetObject is a
13+
// macro that gets defined when windows.h is included
14+
#ifdef _WIN32
15+
#define NOMINMAX
16+
#include <windows.h>
17+
#endif
18+
1119
#include "pal.h"
1220
#include <external/rapidjson/document.h>
1321
#include <external/rapidjson/fwd.h>
1422
#include <vector>
1523
#include "bundle/info.h"
1624

25+
#undef GetObject
26+
1727
class json_parser_t {
1828
public:
1929
#ifdef _WIN32
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
d87b698d0fcc10a5f632ecbc80a9cb2a8fa094a5
1+
3f73edae00aba5b0112a80b4d41e6f1ff7d92a3d
22

3-
https://github.com/Tencent/rapidjson/commit/d87b698d0fcc10a5f632ecbc80a9cb2a8fa094a5
3+
https://github.com/Tencent/rapidjson/commit/3f73edae00aba5b0112a80b4d41e6f1ff7d92a3d
44

55
Note: This library is not using a proper release lifecycle. v1.1.0 was the last version released in 2016.
6-
Therefore, we are pointing to a random commit from 2019 rather than a version tag.
6+
Therefore, we are pointing to a random commit from 2024 rather than a version tag.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
This directory contains the contents of `include/rapidjson` from
2-
<https://github.com/tencent/rapidjson>, commit hash d87b698d0fcc10.
1+
This directory contains selective files from
2+
https://github.com/Tencent/rapidjson/tree/3f73edae00aba5b0112a80b4d41e6f1ff7d92a3d/include/rapidjson

0 commit comments

Comments
 (0)