Skip to content

Update RapidJSON #98573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 26, 2024
Merged

Update RapidJSON #98573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
608dbf0
Update RapidJSON
am11 Feb 16, 2024
4b89621
Fix windows build
am11 Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/native/corehost/json_parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,22 @@
// https://github.com/Tencent/rapidjson/issues/1596#issuecomment-548774663
#define RAPIDJSON_48BITPOINTER_OPTIMIZATION 0

// see https://github.com/Tencent/rapidjson/issues/1448
// including windows.h on purpose to provoke a compile time problem as GetObject is a
// macro that gets defined when windows.h is included
#ifdef _WIN32
#define NOMINMAX
#include <windows.h>
#endif

#include "pal.h"
#include <external/rapidjson/document.h>
#include <external/rapidjson/fwd.h>
#include <vector>
#include "bundle/info.h"

#undef GetObject

class json_parser_t {
public:
#ifdef _WIN32
Expand Down
6 changes: 3 additions & 3 deletions src/native/external/rapidjson-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
d87b698d0fcc10a5f632ecbc80a9cb2a8fa094a5
3f73edae00aba5b0112a80b4d41e6f1ff7d92a3d

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

Note: This library is not using a proper release lifecycle. v1.1.0 was the last version released in 2016.
Therefore, we are pointing to a random commit from 2019 rather than a version tag.
Therefore, we are pointing to a random commit from 2024 rather than a version tag.
4 changes: 2 additions & 2 deletions src/native/external/rapidjson/README.TXT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
This directory contains the contents of `include/rapidjson` from
<https://github.com/tencent/rapidjson>, commit hash d87b698d0fcc10.
This directory contains selective files from
https://github.com/Tencent/rapidjson/tree/3f73edae00aba5b0112a80b4d41e6f1ff7d92a3d/include/rapidjson
Loading