LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Squashed 'src/univalue/' changes from fe805ea74f..07947ff2da

Browse source 
07947ff2da Merge #9: [tests] Fix BOOST_CHECK_THROW macro
ec849d9a28 [tests] Fix BOOST_CHECK_THROW macro
31bc9f5a49 Merge #8: Remove unused Homebrew workaround
fa042093d1 Remove HomeBrew workaround
a523e08ae4 Merge #7: Declare single-argument (non-converting) constructors "explicit"
a9e53b38ba Merge #4: Pull upstream
16a1f7f6e9 Merge #3: Pull upstream
daf1285af6 Merge pull request #2 from jgarzik/master
f32df99e96 Merge branch '2016_04_unicode' into bitcoin
280b191cb1 Merge remote-tracking branch 'jgarzik/master' into bitcoin
2740c4f712 Merge branch '2015_11_escape_plan' into bitcoin

git-subtree-dir: src/univalue
git-subtree-split: 07947ff2da9ef02a9dfa13346bc5545708e3ebe7
This commit is contained in:
MarcoFalke 2017-12-19 16:44:08 -05:00
parent 619bb05037
commit 88411e98e5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.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
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) { \