From ed12d15102655a1199f220adaab54c72a16034cb Mon Sep 17 00:00:00 2001 From: evoskuil Date: Thu, 28 Dec 2017 05:37:38 -0800 Subject: [PATCH 1/2] Build verison3 from version5/secp256k1. --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 81eedc68..851398ca 100755 --- a/install.sh +++ b/install.sh @@ -682,7 +682,7 @@ build_all() { build_from_tarball_boost $BOOST_URL $BOOST_ARCHIVE bzip2 . $PARALLEL "$BUILD_BOOST" "${BOOST_OPTIONS[@]}" build_from_github zeromq libzmq master $PARALLEL ${ZMQ_OPTIONS[@]} "$@" - build_from_github libbitcoin secp256k1 version4 $PARALLEL ${SECP256K1_OPTIONS[@]} "$@" + build_from_github libbitcoin secp256k1 version5 $PARALLEL ${SECP256K1_OPTIONS[@]} "$@" build_from_github libbitcoin libbitcoin version3 $PARALLEL ${BITCOIN_OPTIONS[@]} "$@" build_from_travis libbitcoin libbitcoin-protocol version3 $PARALLEL ${BITCOIN_PROTOCOL_OPTIONS[@]} "$@" } From 35c331534668eb9f729527bc9af1ad69a82f163d Mon Sep 17 00:00:00 2001 From: evoskuil Date: Tue, 26 Dec 2017 14:50:19 -0800 Subject: [PATCH 2/2] Fix up test warning in VS2017. --- test/zmq/identifiers.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/zmq/identifiers.cpp b/test/zmq/identifiers.cpp index b62f0ca6..d1e7dfd7 100644 --- a/test/zmq/identifiers.cpp +++ b/test/zmq/identifiers.cpp @@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(identifiers__contains__default__not_zero) BOOST_AUTO_TEST_CASE(identifiers__contains__one_value__expected) { - const auto expected = 42u; + const intptr_t expected = 42u; identifiers_fixture instance; instance.push(reinterpret_cast(expected)); BOOST_REQUIRE(instance.contains(expected)); @@ -63,8 +63,8 @@ BOOST_AUTO_TEST_CASE(identifiers__contains__one_value__expected) BOOST_AUTO_TEST_CASE(identifiers__contains__two_values__expected) { - const auto expected1 = 99u; - const auto expected2 = 42u; + const intptr_t expected1 = 99u; + const intptr_t expected2 = 42u; identifiers_fixture instance; instance.push(reinterpret_cast(expected1)); instance.push(reinterpret_cast(expected2));