diff options
author | Haibo Huang <hhb@google.com> | 2019-09-13 17:13:25 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-13 17:13:25 -0700 |
commit | 9fa2a3d9e356a1f42a6184dcf1e0508ddfa9dbfb (patch) | |
tree | ddfa352072a89c32f33551bfe0dfcf2043c20877 | |
parent | 7d53acdb0994e9c529f65c839c2c371a55ab0bf3 (diff) | |
parent | 0f8e2517cc58735df95ed786e13d1439bc72754d (diff) | |
download | rapidjson-9fa2a3d9e356a1f42a6184dcf1e0508ddfa9dbfb.tar.gz |
Upgrade rapidjson to 2648a732dbb8c7fa211e41616071202bfbd09c77HEADmastermainemu-35-1-releaseemu-34-releaseemu-34-3-releaseemu-34-2-releaseemu-34-2-devemu-33-releaseemu-33-devemu-32-releaseemu-32-devemu-31-release
am: 0f8e2517cc
Change-Id: I44be9b34687a4a86d470a106630710390a8d12f3
-rw-r--r-- | METADATA | 13 | ||||
-rw-r--r-- | doc/internals.md | 2 | ||||
-rw-r--r-- | doc/internals.zh-cn.md | 2 | ||||
-rw-r--r-- | doc/sax.md | 2 | ||||
-rw-r--r-- | doc/sax.zh-cn.md | 2 | ||||
-rw-r--r-- | doc/tutorial.md | 2 | ||||
-rw-r--r-- | doc/tutorial.zh-cn.md | 2 | ||||
-rw-r--r-- | example/tutorial/tutorial.cpp | 2 |
8 files changed, 14 insertions, 13 deletions
@@ -1,8 +1,5 @@ name: "rapidjson" -description: - "A fast JSON parser/generator for C++ with both SAX/DOM style API " - "http://rapidjson.org/" - +description: "A fast JSON parser/generator for C++ with both SAX/DOM style API http://rapidjson.org/" third_party { url { type: HOMEPAGE @@ -12,6 +9,10 @@ third_party { type: GIT value: "https://github.com/Tencent/rapidjson.git" } - version: "d87b698d0fcc10a5f632ecbc80a9cb2a8fa094a5" - last_upgrade_date { year: 2018 month: 07 day: 10 } + version: "2648a732dbb8c7fa211e41616071202bfbd09c77" + last_upgrade_date { + year: 2019 + month: 9 + day: 11 + } } diff --git a/doc/internals.md b/doc/internals.md index 706f98c..81fe9c1 100644 --- a/doc/internals.md +++ b/doc/internals.md @@ -79,7 +79,7 @@ The following tables show the data layout of each type. The 32-bit/64-bit column | `unsigned u` | 32-bit unsigned integer |4 |4 | | (zero padding) | 0 |4 |4 | | (unused) | |4 |8 | -| `unsigned flags_` | `kNumberType kNumberFlag kUIntFlag kUInt64Flag ...` |4 |4 | +| `unsigned flags_` | `kNumberType kNumberFlag kUintFlag kUint64Flag ...` |4 |4 | | Number (Int64) | |32-bit|64-bit| |---------------------|-------------------------------------|:----:|:----:| diff --git a/doc/internals.zh-cn.md b/doc/internals.zh-cn.md index ca3d297..71f8af0 100644 --- a/doc/internals.zh-cn.md +++ b/doc/internals.zh-cn.md @@ -79,7 +79,7 @@ SAX 和 DOM API 都依赖于3个额外的概念:`Allocator`、`Encoding` 和 ` | `unsigned u` | 32位无符号整数 |4 |4 | | (零填充) | 0 |4 |4 | | (未使用) | |4 |8 | -| `unsigned flags_` | `kNumberType kNumberFlag kUIntFlag kUInt64Flag ...` |4 |4 | +| `unsigned flags_` | `kNumberType kNumberFlag kUintFlag kUint64Flag ...` |4 |4 | | Number (Int64) | | 32位 | 64位 | |---------------------|-------------------------------------|:----:|:----:| @@ -37,7 +37,7 @@ Bool(false) Key("n", 1, true) Null() Key("i") -UInt(123) +Uint(123) Key("pi") Double(3.1416) Key("a") diff --git a/doc/sax.zh-cn.md b/doc/sax.zh-cn.md index 740c339..56df69f 100644 --- a/doc/sax.zh-cn.md +++ b/doc/sax.zh-cn.md @@ -37,7 +37,7 @@ Bool(false) Key("n", 1, true) Null() Key("i") -UInt(123) +Uint(123) Key("pi") Double(3.1416) Key("a") diff --git a/doc/tutorial.md b/doc/tutorial.md index 3fa63c9..4bde2fa 100644 --- a/doc/tutorial.md +++ b/doc/tutorial.md @@ -82,7 +82,7 @@ JSON number type represents all numeric values. However, C++ needs more specific ~~~~~~~~~~cpp assert(document["i"].IsNumber()); -// In this case, IsUint()/IsInt64()/IsUInt64() also return true. +// In this case, IsUint()/IsInt64()/IsUint64() also return true. assert(document["i"].IsInt()); printf("i = %d\n", document["i"].GetInt()); // Alternative (int)document["i"] diff --git a/doc/tutorial.zh-cn.md b/doc/tutorial.zh-cn.md index 3bacfb0..f7603a9 100644 --- a/doc/tutorial.zh-cn.md +++ b/doc/tutorial.zh-cn.md @@ -82,7 +82,7 @@ JSON Number 类型表示所有数值。然而,C++ 需要使用更专门的类 ~~~~~~~~~~cpp assert(document["i"].IsNumber()); -// 在此情况下,IsUint()/IsInt64()/IsUInt64() 也会返回 true +// 在此情况下,IsUint()/IsInt64()/IsUint64() 也会返回 true assert(document["i"].IsInt()); printf("i = %d\n", document["i"].GetInt()); // 另一种用法: (int)document["i"] diff --git a/example/tutorial/tutorial.cpp b/example/tutorial/tutorial.cpp index c8bfcc1..d6021c6 100644 --- a/example/tutorial/tutorial.cpp +++ b/example/tutorial/tutorial.cpp @@ -57,7 +57,7 @@ int main(int, char*[]) { printf("n = %s\n", document["n"].IsNull() ? "null" : "?"); assert(document["i"].IsNumber()); // Number is a JSON type, but C++ needs more specific type. - assert(document["i"].IsInt()); // In this case, IsUint()/IsInt64()/IsUInt64() also return true. + assert(document["i"].IsInt()); // In this case, IsUint()/IsInt64()/IsUint64() also return true. printf("i = %d\n", document["i"].GetInt()); // Alternative (int)document["i"] assert(document["pi"].IsNumber()); |