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

libethential/CMakeLists.txt

@@ -26,6 +26,9 @@ if(${TARGET_PLATFORM} STREQUAL "w64")
 	target_link_libraries(${EXECUTABLE} shlwapi)
 elseif (APPLE)
 	# Latest mavericks boost libraries only come with -mt
+	target_link_libraries(${EXECUTABLE} boost_system-mt)
+	target_link_libraries(${EXECUTABLE} boost_filesystem-mt)
+	target_link_libraries(${EXECUTABLE} boost_thread-mt)
 	find_package(Threads REQUIRED)
 	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT})
 elseif (UNIX)

test/trie.cpp

@@ -268,7 +268,7 @@ BOOST_AUTO_TEST_CASE(trieStess)
 				m.erase(k);
 				if (!d.check(true))
 				{
-					cwarn << m;
+					// cwarn << m;
 					for (auto i: d)
 						cwarn << i.first.toString() << i.second.toString();