Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

libp2p/UDP.h

@@ -65,8 +65,8 @@ protected:
  */
 struct RLPXDatagramFace: public UDPDatagram
 {
-	static uint32_t futureFromEpoch(std::chrono::seconds _sec) { return std::chrono::duration_cast<std::chrono::seconds>((std::chrono::system_clock::now() + _sec).time_since_epoch()).count(); }
-	static uint32_t secondsSinceEpoch() { return std::chrono::duration_cast<std::chrono::seconds>((std::chrono::system_clock::now()).time_since_epoch()).count(); }
+	static uint32_t futureFromEpoch(std::chrono::seconds _sec) { return static_cast<uint32_t>(std::chrono::duration_cast<std::chrono::seconds>((std::chrono::system_clock::now() + _sec).time_since_epoch()).count()); }
+	static uint32_t secondsSinceEpoch() { return static_cast<uint32_t>(std::chrono::duration_cast<std::chrono::seconds>((std::chrono::system_clock::now()).time_since_epoch()).count()); }
 	static Public authenticate(bytesConstRef _sig, bytesConstRef _rlp);
 
 	virtual uint8_t packetType() = 0;
@@ -115,7 +115,7 @@ class UDPSocket: UDPSocketFace, public std::enable_shared_from_this<UDPSocket<Ha
 {
 public:
 	enum { maxDatagramSize = MaxDatagramSize };
-	static_assert(maxDatagramSize < 65507, "UDP datagrams cannot be larger than 65507 bytes");
+	static_assert(unsigned(maxDatagramSize) < 65507, "UDP datagrams cannot be larger than 65507 bytes");
 
 	/// Create socket for specific endpoint.
 	UDPSocket(ba::io_service& _io, UDPSocketEvents& _host, bi::udp::endpoint _endpoint): m_host(_host), m_endpoint(_endpoint), m_socket(_io) { m_started.store(false); m_closed.store(true); };

test/CMakeLists.txt

@@ -25,6 +25,7 @@ add_subdirectory(libethereum)
 add_subdirectory(libevm)
 add_subdirectory(libnatspec)
 add_subdirectory(libp2p)
+add_subdirectory(external-dependencies)
 
 if (JSCONSOLE)
 	add_subdirectory(libjsengine)

test/external-dependencies/CMakeLists.txt

@@ -0,0 +1,5 @@
+cmake_policy(SET CMP0015 NEW)
+
+aux_source_directory(. SRCS)
+
+add_sources(${SRCS})

test/external-dependencies/boost.cpp

@@ -0,0 +1,37 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file boost.cpp
+ * @author Lefteris Karapetsas <lefteris@ethdev.com>
+ * @date 2015
+ * Tests for external dependencies: Boost
+ */
+
+#include <boost/test/unit_test.hpp>
+#include <libdevcore/Common.h>
+
+BOOST_AUTO_TEST_SUITE(ExtDepBoost)
+
+// test that reproduces issue https://github.com/ethereum/cpp-ethereum/issues/1977
+BOOST_AUTO_TEST_CASE(u256_overflow_test)
+{
+	dev::u256 a = 14;
+	dev::bigint b = dev::bigint("115792089237316195423570985008687907853269984665640564039457584007913129639948");
+	// to fix cast `a` to dev::bigint
+	BOOST_CHECK(a < b);
+}
+
+BOOST_AUTO_TEST_SUITE_END()