BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

UniValue: export NullUniValue global constant

This commit is contained in:
Jeff Garzik 2014-08-20 11:13:52 -04:00 committed by Jonas Schnelli
parent efc7883772
commit 5e3060c0d1
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/univalue/univalue.cpp
View File

@ -9,7 +9,7 @@
using namespace std; using namespace std;
static const UniValue nullValue; const UniValue NullUniValue;
void UniValue::clear() void UniValue::clear()
{ {
@ -175,11 +175,11 @@ bool UniValue::checkObject(const std::map<std::string,UniValue::VType>& t)
const UniValue& UniValue::operator[](const std::string& key) const const UniValue& UniValue::operator[](const std::string& key) const
{ {
if (typ != VOBJ) if (typ != VOBJ)
return nullValue; return NullUniValue;
int index = findKey(key); int index = findKey(key);
if (index < 0) if (index < 0)
return nullValue; return NullUniValue;
return values[index]; return values[index];
} }
@ -187,9 +187,9 @@ const UniValue& UniValue::operator[](const std::string& key) const
const UniValue& UniValue::operator[](unsigned int index) const const UniValue& UniValue::operator[](unsigned int index) const
{ {
if (typ != VOBJ && typ != VARR) if (typ != VOBJ && typ != VARR)
return nullValue; return NullUniValue;
if (index >= values.size()) if (index >= values.size())
return nullValue; return NullUniValue;
return values[index]; return values[index];
} }

2
src/univalue/univalue.h
View File

@ -152,4 +152,6 @@ extern enum jtokentype getJsonToken(std::string& tokenVal,
unsigned int& consumed, const char *raw); unsigned int& consumed, const char *raw);
extern const char *uvTypeName(UniValue::VType t); extern const char *uvTypeName(UniValue::VType t);
extern const UniValue NullUniValue;
#endif // BITCOIN_UNIVALUE_UNIVALUE_H #endif // BITCOIN_UNIVALUE_UNIVALUE_H