Browse Source

msvc compilation/warnings

cl-refactor
arkady.paronyan@gmail.com 10 years ago
parent
commit
8689bc8164
  1. 1
      libethash-cl/CMakeLists.txt
  2. 2
      libethash-cl/ethash_cl_miner.cpp
  3. 2
      libethcore/Common.h
  4. 1
      libethereum/TransactionQueue.h

1
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) set(HEADERS ${OUR_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/ethash_cl_miner_kernel.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${Boost_INCLUDE_DIRS})
include_directories(${OpenCL_INCLUDE_DIRS}) include_directories(${OpenCL_INCLUDE_DIRS})
include_directories(..) include_directories(..)
add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})

2
libethash-cl/ethash_cl_miner.cpp

@ -323,7 +323,7 @@ bool ethash_cl_miner::init(
ETHCL_LOG("Printing program log"); ETHCL_LOG("Printing program log");
ETHCL_LOG(program.getBuildInfo<CL_PROGRAM_BUILD_LOG>(device).c_str()); ETHCL_LOG(program.getBuildInfo<CL_PROGRAM_BUILD_LOG>(device).c_str());
} }
catch (cl::Error const& err) catch (cl::Error const&)
{ {
ETHCL_LOG(program.getBuildInfo<CL_PROGRAM_BUILD_LOG>(device).c_str()); ETHCL_LOG(program.getBuildInfo<CL_PROGRAM_BUILD_LOG>(device).c_str());
return false; return false;

2
libethcore/Common.h

@ -171,7 +171,7 @@ public:
void operator()(Args&... _args) { for (auto const& f: m_fire) f.second->fire(std::forward<Args>(_args)...); } void operator()(Args&... _args) { for (auto const& f: m_fire) f.second->fire(std::forward<Args>(_args)...); }
private: private:
std::map<unsigned, std::shared_ptr<Signal::HandlerAux>> m_fire; std::map<unsigned, std::shared_ptr<typename Signal::HandlerAux>> m_fire;
}; };
template<class... Args> using Handler = std::shared_ptr<typename Signal<Args...>::HandlerAux>; template<class... Args> using Handler = std::shared_ptr<typename Signal<Args...>::HandlerAux>;

1
libethereum/TransactionQueue.h

@ -24,6 +24,7 @@
#include <functional> #include <functional>
#include <condition_variable> #include <condition_variable>
#include <thread> #include <thread>
#include <deque>
#include <libdevcore/Common.h> #include <libdevcore/Common.h>
#include <libdevcore/Guards.h> #include <libdevcore/Guards.h>
#include <libdevcore/Log.h> #include <libdevcore/Log.h>

Loading…
Cancel
Save