Browse Source

UniValue: export NullUniValue global constant

0.13
Jeff Garzik 10 years ago committed by Jonas Schnelli
parent
commit
5e3060c0d1
  1. 10
      src/univalue/univalue.cpp
  2. 2
      src/univalue/univalue.h

10
src/univalue/univalue.cpp

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

2
src/univalue/univalue.h

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

Loading…
Cancel
Save