highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-17 08:06:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

univalue: Bump subtree

Browse Source
This commit is contained in:
MarcoFalke
2017-12-19 16:49:01 -05:00
parent 2971fd030f 88411e98e5
commit fad349c507
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/univalue/.travis.yml
View File

@@ -25,7 +25,6 @@ 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

3
src/univalue/test/object.cpp
View File

@@ -19,9 +19,10 @@
#define BOOST_CHECK_THROW(stmt, excMatch) { \ #define BOOST_CHECK_THROW(stmt, excMatch) { \
try { \ try { \
(stmt); \ (stmt); \
assert(0 && "No exception caught"); \
} catch (excMatch & e) { \ } catch (excMatch & e) { \
} catch (...) { \ } catch (...) { \
assert(0); \ assert(0 && "Wrong exception caught"); \
} \ } \
} }
#define BOOST_CHECK_NO_THROW(stmt) { \ #define BOOST_CHECK_NO_THROW(stmt) { \