diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-10-30 16:22:42 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-10-30 16:22:42 -0400 |
| commit | fa0b3da36cd7cf0aada22f2d459296b81274c2f9 (patch) | |
| tree | 861eba80062c81139528c3ee7ebfbdece3bda5e6 | |
| parent | dc287c98f8b33576f3c71db02a232106ef0e57d9 (diff) | |
| download | bitcoin-fa0b3da36cd7cf0aada22f2d459296b81274c2f9.tar.xz | |
Squashed 'src/univalue/' changes from 7890db99d6..5a58a46671
5a58a46671 Merge #21: Remove hand-coded UniValue destructor.
b4cdfc4f47 Remove hand-coded UniValue destructor.
7fba60b5ad Merge #17: [docs] Update readme
4577454e7e Merge #13: Fix typo
ac7e73cda8 [docs] Update readme
4a4964729b Fix typo
git-subtree-dir: src/univalue
git-subtree-split: 5a58a46671d3c1711e93d2fc7961085515c8c7a7
| -rw-r--r-- | README.md | 21 | ||||
| -rw-r--r-- | include/univalue.h | 1 | ||||
| -rw-r--r-- | lib/univalue_get.cpp | 2 |
3 files changed, 6 insertions, 18 deletions
@@ -12,21 +12,10 @@ an arbitrary depth. This class is aligned with the JSON standard, [RFC 7159](https://tools.ietf.org/html/rfc7159.html). -## Installation +## Library usage -This project is a standard GNU -[autotools](https://www.gnu.org/software/automake/manual/html_node/Autotools-Introduction.html) -project. Build and install instructions are available in the `INSTALL` -file provided with GNU autotools. - -``` -$ ./autogen.sh -$ ./configure -$ make -``` - -## Design - -UniValue provides a single dynamic RAII C++ object class, -and minimizes template use (contra json_spirit). +This is a fork of univalue used by Bitcoin Core. It is not maintained for usage +by other projects. Notably, the API may break in non-backward-compatible ways. +Other projects looking for a maintained library should use the upstream +univalue at https://github.com/jgarzik/univalue. diff --git a/include/univalue.h b/include/univalue.h index 91b104e56e..6080516353 100644 --- a/include/univalue.h +++ b/include/univalue.h @@ -47,7 +47,6 @@ public: std::string s(val_); setStr(s); } - ~UniValue() {} void clear(); diff --git a/lib/univalue_get.cpp b/lib/univalue_get.cpp index eabcf2dad1..0ad6146545 100644 --- a/lib/univalue_get.cpp +++ b/lib/univalue_get.cpp @@ -35,7 +35,7 @@ bool ParseInt32(const std::string& str, int32_t *out) errno = 0; // strtol will not set errno if valid long int n = strtol(str.c_str(), &endp, 10); if(out) *out = (int32_t)n; - // Note that strtol returns a *long int*, so even if strtol doesn't report a over/underflow + // Note that strtol returns a *long int*, so even if strtol doesn't report an over/underflow // we still have to check that the returned value is within the range of an *int32_t*. On 64-bit // platforms the size of these types may be different. return endp && *endp == 0 && !errno && |