From 8689bc8164d2eaf54907e335a033fc180b3fe9e4 Mon Sep 17 00:00:00 2001 From: "arkady.paronyan@gmail.com" Date: Mon, 6 Jul 2015 00:34:10 +0200 Subject: [PATCH] msvc compilation/warnings --- libethash-cl/CMakeLists.txt | 1 + libethash-cl/ethash_cl_miner.cpp | 2 +- libethcore/Common.h | 2 +- libethereum/TransactionQueue.h | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libethash-cl/CMakeLists.txt b/libethash-cl/CMakeLists.txt index 6da254cfb..9dc45fcf5 100644 --- a/libethash-cl/CMakeLists.txt +++ b/libethash-cl/CMakeLists.txt @@ -20,6 +20,7 @@ file(GLOB OUR_HEADERS "*.h") set(HEADERS ${OUR_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/ethash_cl_miner_kernel.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${Boost_INCLUDE_DIRS}) include_directories(${OpenCL_INCLUDE_DIRS}) include_directories(..) add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) diff --git a/libethash-cl/ethash_cl_miner.cpp b/libethash-cl/ethash_cl_miner.cpp index 3a72810fa..9e2d51286 100644 --- a/libethash-cl/ethash_cl_miner.cpp +++ b/libethash-cl/ethash_cl_miner.cpp @@ -323,7 +323,7 @@ bool ethash_cl_miner::init( ETHCL_LOG("Printing program log"); ETHCL_LOG(program.getBuildInfo(device).c_str()); } - catch (cl::Error const& err) + catch (cl::Error const&) { ETHCL_LOG(program.getBuildInfo(device).c_str()); return false; diff --git a/libethcore/Common.h b/libethcore/Common.h index ba8c554fb..190774126 100644 --- a/libethcore/Common.h +++ b/libethcore/Common.h @@ -171,7 +171,7 @@ public: void operator()(Args&... _args) { for (auto const& f: m_fire) f.second->fire(std::forward(_args)...); } private: - std::map> m_fire; + std::map> m_fire; }; template using Handler = std::shared_ptr::HandlerAux>; diff --git a/libethereum/TransactionQueue.h b/libethereum/TransactionQueue.h index 000681363..407250530 100644 --- a/libethereum/TransactionQueue.h +++ b/libethereum/TransactionQueue.h @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include