diff options
| author | fanquake <fanquake@gmail.com> | 2022-05-13 10:29:59 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-05-13 10:36:05 +0100 |
| commit | 225e5b57b2ee2bc1acd7f09c89ccccc15ef8c85f (patch) | |
| tree | 1b79a5a95871654d5c327f9bfd37a45eed7ad1b5 /src/univalue/lib/univalue_read.cpp | |
| parent | 25dd4d85136c286adf7eca60df89a28d43b313b2 (diff) | |
| parent | fac2c796cb4137e025a4a783f7460e5db9c74bc2 (diff) | |
Merge bitcoin/bitcoin#25113: Bump univalue subtree
f403531f97cb80930e9a8e70a6f0dbde4cc8a866 Squashed 'src/univalue/' changes from a44caf65fe..6c19d050a9 (MacroFake)
Pull request description:
Only change is some header-shuffling and adding `getInt`.
ACKs for top commit:
fanquake:
ACK fac2c796cb4137e025a4a783f7460e5db9c74bc2
Tree-SHA512: 8bdf7d88ce06f0851f99f30c30fc926a13b79ae72bcebd5e170ed0e1d882b184d9279f96488e234fbe560036e31cb180aa1e5666aebd9833b9a119c6b214fa30
Diffstat (limited to 'src/univalue/lib/univalue_read.cpp')
| -rw-r--r-- | src/univalue/lib/univalue_read.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/univalue/lib/univalue_read.cpp b/src/univalue/lib/univalue_read.cpp index be39bfe57a..a6ed75e57a 100644 --- a/src/univalue/lib/univalue_read.cpp +++ b/src/univalue/lib/univalue_read.cpp @@ -2,19 +2,22 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://opensource.org/licenses/mit-license.php. -#include <string.h> -#include <vector> -#include <stdio.h> -#include "univalue.h" +#include <univalue.h> #include "univalue_utffilter.h" +#include <cstdio> +#include <cstdint> +#include <cstring> +#include <string> +#include <vector> + /* * According to stackexchange, the original json test suite wanted * to limit depth to 22. Widely-deployed PHP bails at depth 512, * so we will follow PHP's lead, which should be more than sufficient * (further stackexchange comments indicate depth > 32 rarely occurs). */ -static const size_t MAX_JSON_DEPTH = 512; +static constexpr size_t MAX_JSON_DEPTH = 512; static bool json_isdigit(int ch) { |