Skip to content

Commit c5487c3

Browse files
committed
Update rapidjson to latest code from github
1 parent 6a04040 commit c5487c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+4880
-1549
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ include_directories(include SYSTEM
7777
thirdparty/gtest-1.11.0/include
7878
thirdparty/json11-ec4e452
7979
thirdparty/jsoncpp-1.9.4/include
80-
thirdparty/rapidjson-1.1.0/include
80+
thirdparty/rapidjson-48fbd8c/include
8181
thirdparty/picojson-1.3.0
8282
thirdparty/nlohmann-json-3.1.2
8383
)

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,12 @@ Valijson supports JSON documents loaded using various JSON parser libraries. It
209209
- [json11 (commit afcc8d0)](https://github.com/dropbox/json11/tree/afcc8d0d82b1ce2df587a7a0637d05ba493bf5e6)
210210
- [jsoncpp 1.9.4](https://github.com/open-source-parsers/jsoncpp/archive/1.9.4.tar.gz)
211211
- [nlohmann/json 1.1.0](https://github.com/nlohmann/json/archive/v1.1.0.tar.gz)
212-
- [rapidjson 1.1.0](https://github.com/miloyip/rapidjson/releases/tag/v1.1.0)
212+
- [rapidjson (commit 48fbd8c)](https://github.com/Tencent/rapidjson/tree/48fbd8cd202ca54031fe799db2ad44ffa8e77c13)
213213
- [PicoJSON 1.3.0](https://github.com/kazuho/picojson/archive/v1.3.0.tar.gz)
214214
- [Poco JSON 1.7.8](https://pocoproject.org/docs/Poco.JSON.html)
215215
- [Qt 5.8](http://doc.qt.io/qt-5/json.html)
216216

217-
Other versions of these libraries may work, but have not been tested. In particular, versions of JsonCpp going back to 0.5.0 should also work correctly.
217+
Other versions of these libraries may work, but have not been tested. In particular, versions of jsoncpp going back to 0.5.0 should also work correctly.
218218

219219
## Package Managers ##
220220

@@ -232,7 +232,7 @@ The exceptions to this are boost, Poco and Qt5, which due to their size must be
232232

233233
When using PicoJSON, it may be necessary to include the `picojson.h` before other headers to ensure that the appropriate macros have been enabled.
234234

235-
When building Valijson using CMake on Mac OS X, with Qt 5 installed via Homebrew, you may need to set `CMAKE_PREFIX_PATH` so that CMake can find your Qt installation, e.g:
235+
When building Valijson using CMake on macOS, with Qt 5 installed via Homebrew, you may need to set `CMAKE_PREFIX_PATH` so that CMake can find your Qt installation, e.g:
236236
```bash
237237
mkdir build
238238
cd build

thirdparty/rapidjson-1.1.0/include/rapidjson/allocators.h

Lines changed: 0 additions & 271 deletions
This file was deleted.

thirdparty/rapidjson-1.1.0/include/rapidjson/error/en.h

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)