Skip to content

Commit ddd4629

Browse files
author
MarcoFalke
committed
Merge #17324: Update univalue subtree
fa0b3da Squashed 'src/univalue/' changes from 7890db99d6..5a58a46671 (MarcoFalke) Pull request description: Only change is a performance improvement. See bitcoin-core/univalue-subtree#21 (comment) and bitcoin-core/univalue-subtree#15 (comment) ACKs for top commit: jnewbery: ACK fa439e8 laanwj: ACK fa439e8 Tree-SHA512: 35ea8f76ea4806182949c8eb5a8b652d1aaeec03ee023838e7cb29abcb81c61d59b38f15708564a78574722df57d13f61ef17d0f670a4056819705ef892321e0
2 parents b54666c + fa439e8 commit ddd4629

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

src/univalue/README.md

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,10 @@ an arbitrary depth.
1212
This class is aligned with the JSON standard, [RFC
1313
7159](https://tools.ietf.org/html/rfc7159.html).
1414

15-
## Installation
15+
## Library usage
1616

17-
This project is a standard GNU
18-
[autotools](https://www.gnu.org/software/automake/manual/html_node/Autotools-Introduction.html)
19-
project. Build and install instructions are available in the `INSTALL`
20-
file provided with GNU autotools.
21-
22-
```
23-
$ ./autogen.sh
24-
$ ./configure
25-
$ make
26-
```
27-
28-
## Design
29-
30-
UniValue provides a single dynamic RAII C++ object class,
31-
and minimizes template use (contra json_spirit).
17+
This is a fork of univalue used by Bitcoin Core. It is not maintained for usage
18+
by other projects. Notably, the API may break in non-backward-compatible ways.
3219

20+
Other projects looking for a maintained library should use the upstream
21+
univalue at https://github.com/jgarzik/univalue.

src/univalue/include/univalue.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ class UniValue {
4747
std::string s(val_);
4848
setStr(s);
4949
}
50-
~UniValue() {}
5150

5251
void clear();
5352

src/univalue/lib/univalue_get.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ bool ParseInt32(const std::string& str, int32_t *out)
3535
errno = 0; // strtol will not set errno if valid
3636
long int n = strtol(str.c_str(), &endp, 10);
3737
if(out) *out = (int32_t)n;
38-
// Note that strtol returns a *long int*, so even if strtol doesn't report a over/underflow
38+
// Note that strtol returns a *long int*, so even if strtol doesn't report an over/underflow
3939
// we still have to check that the returned value is within the range of an *int32_t*. On 64-bit
4040
// platforms the size of these types may be different.
4141
return endp && *endp == 0 && !errno &&

0 commit comments

Comments
 (0)