Skip to content

Commit

Permalink
Merge bitcoin#3: Pull upstream
Browse files Browse the repository at this point in the history
5668ca3 Return const references from getKeys, getValues, get_str (Wladimir J. van der Laan)
9f0b997 [travis] Work around osx libtool issue (MarcoFalke)
  • Loading branch information
laanwj committed Sep 26, 2016
2 parents daf1285 + 3f03bfd commit 16a1f7f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

language: cpp

compiler:
Expand Down Expand Up @@ -26,6 +25,7 @@ addons:
- pkg-config

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
- test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh

Expand Down
6 changes: 3 additions & 3 deletions include/univalue.h
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ class UniValue {
public:
// Strict type-specific getters, these throw std::runtime_error if the
// value is of unexpected type
std::vector<std::string> getKeys() const;
std::vector<UniValue> getValues() const;
const std::vector<std::string>& getKeys() const;
const std::vector<UniValue>& getValues() const;
bool get_bool() const;
std::string get_str() const;
const std::string& get_str() const;
int get_int() const;
int64_t get_int64() const;
double get_real() const;
Expand Down
6 changes: 3 additions & 3 deletions lib/univalue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -283,14 +283,14 @@ const UniValue& find_value(const UniValue& obj, const std::string& name)
return NullUniValue;
}

std::vector<std::string> UniValue::getKeys() const
const std::vector<std::string>& UniValue::getKeys() const
{
if (typ != VOBJ)
throw std::runtime_error("JSON value is not an object as expected");
return keys;
}

std::vector<UniValue> UniValue::getValues() const
const std::vector<UniValue>& UniValue::getValues() const
{
if (typ != VOBJ && typ != VARR)
throw std::runtime_error("JSON value is not an object or array as expected");
Expand All @@ -304,7 +304,7 @@ bool UniValue::get_bool() const
return getBool();
}

std::string UniValue::get_str() const
const std::string& UniValue::get_str() const
{
if (typ != VSTR)
throw std::runtime_error("JSON value is not a string as expected");
Expand Down

0 comments on commit 16a1f7f

Please sign in to comment.