maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Squashed 'src/univalue/' changes from daf1285..16a1f7f

Browse source 
16a1f7f Merge #3: Pull upstream
3f03bfd Merge pull request #27 from laanwj/2016_09_const_refs
5668ca3 Return const references from getKeys, getValues, get_str
cedda14 Merge pull request #28 from MarcoFalke/patch-1
9f0b997 [travis] Work around osx libtool issue

git-subtree-dir: src/univalue
git-subtree-split: 16a1f7f6e9ed932bec7c7855003affea1e165fb5
This commit is contained in:
MarcoFalke 2016-09-30 19:58:11 +02:00
parent 3650668cdb
commit 2ca7faab42
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -1,4 +1,3 @@
language: cpp language: cpp
compiler: compiler:
@ -26,6 +25,7 @@ addons:
- pkg-config - pkg-config
before_script: before_script:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew uninstall libtool; brew install libtool; fi
- if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi - if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi
- test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh - test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh

6
include/univalue.h
View file

@ -142,10 +142,10 @@ private:
public: public:
// Strict type-specific getters, these throw std::runtime_error if the // Strict type-specific getters, these throw std::runtime_error if the
// value is of unexpected type // value is of unexpected type
std::vector<std::string> getKeys() const; const std::vector<std::string>& getKeys() const;
std::vector<UniValue> getValues() const; const std::vector<UniValue>& getValues() const;
bool get_bool() const; bool get_bool() const;
std::string get_str() const; const std::string& get_str() const;
int get_int() const; int get_int() const;
int64_t get_int64() const; int64_t get_int64() const;
double get_real() const; double get_real() const;

6
lib/univalue.cpp
View file

@ -283,14 +283,14 @@ const UniValue& find_value(const UniValue& obj, const std::string& name)
return NullUniValue; return NullUniValue;
} }
std::vector<std::string> UniValue::getKeys() const const std::vector<std::string>& UniValue::getKeys() const
{ {
if (typ != VOBJ) if (typ != VOBJ)
throw std::runtime_error("JSON value is not an object as expected"); throw std::runtime_error("JSON value is not an object as expected");
return keys; return keys;
} }
std::vector<UniValue> UniValue::getValues() const const std::vector<UniValue>& UniValue::getValues() const
{ {
if (typ != VOBJ && typ != VARR) if (typ != VOBJ && typ != VARR)
throw std::runtime_error("JSON value is not an object or array as expected"); throw std::runtime_error("JSON value is not an object or array as expected");
@ -304,7 +304,7 @@ bool UniValue::get_bool() const
return getBool(); return getBool();
} }
std::string UniValue::get_str() const const std::string& UniValue::get_str() const
{ {
if (typ != VSTR) if (typ != VSTR)
throw std::runtime_error("JSON value is not a string as expected"); throw std::runtime_error("JSON value is not a string as expected");