Skip to content

some gcc 4.4 warning fix #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
j16sdiz wants to merge 2 commits into
base: master
Choose a base branch
from
+61 −15
Open

some gcc 4.4 warning fix #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8dd4b4
Fix GCC 4.4 warning on large unsigned integer
j16sdiz Dec 14, 2010
121a0a5
Use system Crypto++ if availiable (with fallback)
j16sdiz Dec 16, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ SET(BITCOIN_BASE_SRC
${CMAKE_SOURCE_DIR}/src/script.cpp
${CMAKE_SOURCE_DIR}/src/sha256.cpp
${CMAKE_SOURCE_DIR}/src/util.cpp
${CMAKE_SOURCE_DIR}/src/cryptopp/cpu.cpp
${CMAKE_SOURCE_DIR}/src/cryptopp/sha.cpp
${CMAKE_SOURCE_DIR}/src/gpucommon/gpucommon.cpp
${CMAKE_SOURCE_DIR}/src/json/json_spirit_reader.cpp
${CMAKE_SOURCE_DIR}/src/json/json_spirit_value.cpp
Expand Down Expand Up @@ -62,6 +60,17 @@ ENDIF(NOT BITCOIN_BUILD_GUI AND NOT BITCOIN_BUILD_DAEMON AND NOT BITCOIN_BUILD_R



FIND_PACKAGE(Crypto++)
IF(CRYPTO++_FOUND)
INCLUDE_DIRECTORIES(${CRYPTO++_INCLUDE_DIR})
ELSE(CRYPTO++_FOUND)
SET(BITCOIN_CRYPTOPP_SRC
${CMAKE_SOURCE_DIR}/src/cryptopp/cpu.cpp
${CMAKE_SOURCE_DIR}/src/cryptopp/sha.cpp
)
ENDIF(CRYPTO++_FOUND)





Expand Down
8 changes: 4 additions & 4 deletions cmake-bitcoin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ ENDIF(WIN32)

IF(BITCOIN_ENABLE_CUDA)
ADD_DEFINITIONS(-D_BITCOIN_MINER_CUDA_)
CUDA_ADD_EXECUTABLE(bitcoin WIN32 ${BITCOIN_BASE_SRC} ${BITCOIN_GUI_SRC} ${BITCOIN_CUDA_SRC})
CUDA_ADD_EXECUTABLE(bitcoin WIN32 ${BITCOIN_BASE_SRC} ${BITCOIN_GUI_SRC} ${BITCOIN_CUDA_SRC} ${BITCOIN_CRYPTOPP_SRC})
ELSE(BITCOIN_ENABLE_CUDA)
IF(BITCOIN_ENABLE_OPENCL)
ADD_DEFINITIONS(-D_BITCOIN_MINER_OPENCL_)
ADD_EXECUTABLE(bitcoin WIN32 ${BITCOIN_BASE_SRC} ${BITCOIN_GUI_SRC} ${BITCOIN_OPENCL_SRC})
ADD_EXECUTABLE(bitcoin WIN32 ${BITCOIN_BASE_SRC} ${BITCOIN_GUI_SRC} ${BITCOIN_OPENCL_SRC} ${BITCOIN_CRYPTOPP_SRC})
ELSE(BITCOIN_ENABLE_OPENCL)
ADD_EXECUTABLE(bitcoin WIN32 ${BITCOIN_BASE_SRC} ${BITCOIN_GUI_SRC})
ADD_EXECUTABLE(bitcoin WIN32 ${BITCOIN_BASE_SRC} ${BITCOIN_GUI_SRC} ${BITCOIN_CRYPTOPP_SRC})
ENDIF(BITCOIN_ENABLE_OPENCL)
ENDIF(BITCOIN_ENABLE_CUDA)

Expand All @@ -23,7 +23,7 @@ IF(BITCOIN_ENABLE_REMOTE_SERVER)
ENDIF(WIN32)
ENDIF(BITCOIN_ENABLE_REMOTE_SERVER)

TARGET_LINK_LIBRARIES(bitcoin ${Boost_LIBRARIES} ${wxWidgets_LIBRARIES} ${OPENSSL_LIBRARIES} ${DB_LIBRARIES})
TARGET_LINK_LIBRARIES(bitcoin ${Boost_LIBRARIES} ${wxWidgets_LIBRARIES} ${OPENSSL_LIBRARIES} ${DB_LIBRARIES} ${CRYPTO++_LIBRARIES})
IF(BITCOIN_ENABLE_CUDA)
TARGET_LINK_LIBRARIES(bitcoin ${CUDA_LIBRARIES})
ENDIF(BITCOIN_ENABLE_CUDA)
Expand Down
8 changes: 4 additions & 4 deletions cmake-bitcoind/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ ENDIF(WIN32)

IF(BITCOIN_ENABLE_CUDA)
ADD_DEFINITIONS(-D_BITCOIN_MINER_CUDA_)
CUDA_ADD_EXECUTABLE(bitcoind ${BITCOIN_BASE_SRC} ${BITCOIN_CUDA_SRC})
CUDA_ADD_EXECUTABLE(bitcoind ${BITCOIN_BASE_SRC} ${BITCOIN_CUDA_SRC} ${BITCOIN_CRYPTOPP_SRC})
ELSE(BITCOIN_ENABLE_CUDA)
IF(BITCOIN_ENABLE_OPENCL)
ADD_DEFINITIONS(-D_BITCOIN_MINER_OPENCL_)
ADD_EXECUTABLE(bitcoind ${BITCOIN_BASE_SRC} ${BITCOIN_OPENCL_SRC})
ADD_EXECUTABLE(bitcoind ${BITCOIN_BASE_SRC} ${BITCOIN_OPENCL_SRC} ${BITCOIN_CRYPTOPP_SRC})
ELSE(BITCOIN_ENABLE_OPENCL)
ADD_EXECUTABLE(bitcoind ${BITCOIN_BASE_SRC})
ADD_EXECUTABLE(bitcoind ${BITCOIN_BASE_SRC} ${BITCOIN_CRYPTOPP_SRC})
ENDIF(BITCOIN_ENABLE_OPENCL)
ENDIF(BITCOIN_ENABLE_CUDA)

Expand All @@ -22,7 +22,7 @@ IF(BITCOIN_ENABLE_REMOTE_SERVER)
ENDIF(WIN32)
ENDIF(BITCOIN_ENABLE_REMOTE_SERVER)

TARGET_LINK_LIBRARIES(bitcoind ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${DB_LIBRARIES})
TARGET_LINK_LIBRARIES(bitcoind ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${DB_LIBRARIES} ${CRYPTO++_LIBRARIES})
IF(BITCOIN_ENABLE_CUDA)
TARGET_LINK_LIBRARIES(bitcoind ${CUDA_LIBRARIES})
ENDIF(BITCOIN_ENABLE_CUDA)
Expand Down
10 changes: 6 additions & 4 deletions cmake-bitcoinr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ IF(WIN32)
ADD_DEFINITIONS(-D__WXMSW__)
ENDIF(WIN32)

INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} /usr/include/crypto++/)

SET(BITCOIN_REMOTE_MINER_SRC
${CMAKE_SOURCE_DIR}/src/remoteminermain.cpp
${CMAKE_SOURCE_DIR}/src/cryptopp/cpu.cpp
Expand All @@ -29,17 +31,17 @@ SET(BITCOIN_REMOTE_MINER_OPENCL_SRC

IF(BITCOIN_ENABLE_CUDA)
ADD_DEFINITIONS(-D_BITCOIN_MINER_CUDA_)
CUDA_ADD_EXECUTABLE(bitcoinr WIN32 ${BITCOIN_REMOTE_MINER_SRC} ${BITCOIN_REMOTE_MINER_CUDA_SRC})
CUDA_ADD_EXECUTABLE(bitcoinr WIN32 ${BITCOIN_REMOTE_MINER_SRC} ${BITCOIN_REMOTE_MINER_CUDA_SRC} ${BITCOIN_CRYPTOPP_SRC})
ELSE(BITCOIN_ENABLE_CUDA)
IF(BITCOIN_ENABLE_OPENCL)
ADD_DEFINITIONS(-D_BITCOIN_MINER_OPENCL_)
ADD_EXECUTABLE(bitcoinr ${BITCOIN_REMOTE_MINER_SRC} ${BITCOIN_REMOTE_MINER_OPENCL_SRC})
ADD_EXECUTABLE(bitcoinr ${BITCOIN_REMOTE_MINER_SRC} ${BITCOIN_REMOTE_MINER_OPENCL_SRC} ${BITCOIN_CRYPTOPP_SRC})
ELSE(BITCOIN_ENABLE_OPENCL)
ADD_EXECUTABLE(bitcoinr ${BITCOIN_REMOTE_MINER_SRC})
ADD_EXECUTABLE(bitcoinr ${BITCOIN_REMOTE_MINER_SRC} ${BITCOIN_CRYPTOPP_SRC})
ENDIF(BITCOIN_ENABLE_OPENCL)
ENDIF(BITCOIN_ENABLE_CUDA)

TARGET_LINK_LIBRARIES(bitcoinr ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES})
TARGET_LINK_LIBRARIES(bitcoinr ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTO++_LIBRARIES})
IF(WIN32)
TARGET_LINK_LIBRARIES(bitcoinr winmm.lib shlwapi.lib)
ELSE(WIN32)
Expand Down
35 changes: 35 additions & 0 deletions cmake-modules/FindCrypto++.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# - Find Crypto++

if(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
set(CRYPTO++_FOUND TRUE)

else(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
find_path(CRYPTO++_INCLUDE_DIR cryptlib.h
/usr/include/crypto++
/usr/include/cryptopp
/usr/local/include/crypto++
/usr/local/include/cryptopp
/opt/local/include/crypto++
/opt/local/include/cryptopp
$ENV{SystemDrive}/Crypto++/include
)

find_library(CRYPTO++_LIBRARIES NAMES cryptopp
PATHS
/usr/lib
/usr/local/lib
/opt/local/lib
$ENV{SystemDrive}/Crypto++/lib
)

if(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
set(CRYPTO++_FOUND TRUE)
message(STATUS "Found Crypto++: ${CRYPTO++_INCLUDE_DIR}, ${CRYPTO++_LIBRARIES}")
else(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
set(CRYPTO++_FOUND FALSE)
message(STATUS "Crypto++ not found.")
endif(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)

mark_as_advanced(CRYPTO++_INCLUDE_DIR CRYPTO++_LIBRARIES)

endif(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
2 changes: 1 addition & 1 deletion src/remote/remoteminerclient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ void RemoteMinerClient::Run(const std::string &server, const std::string &port,
//std::cout << "sent result " << hresult.m_blockid << " " << hresult.m_metahashstartnonce << " " << hresult.m_besthashnonce << std::endl;
hashcount+=m_metahashsize;

if(hresult.m_metahashstartnonce>4000000000 && (lastrequestedwork+5000)<GetTimeMillis())
if(hresult.m_metahashstartnonce>4000000000u && (lastrequestedwork+5000)<GetTimeMillis())
{
std::cout << "Requesting a new block " << GetTimeMillis() << std::endl;
SendWorkRequest();
Expand Down