Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Fixes

Browse source 
Remove boost::signals from build system; it's header-only so it's not
listed in cmake anymore.

Also remove some unused hashing code
This commit is contained in:
Nathan Hourt 2020-08-18 19:37:41 -05:00
parent 13a76d25ac
commit 9ac63ce0b3
No known key found for this signature in database
GPG key ID: B4344309A110851E
3 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -8,6 +8,7 @@ set( CLI_CLIENT_EXECUTABLE_NAME graphene_client )
set( GUI_CLIENT_EXECUTABLE_NAME BitShares ) set( GUI_CLIENT_EXECUTABLE_NAME BitShares )
set( CUSTOM_URL_SCHEME "gcs" ) set( CUSTOM_URL_SCHEME "gcs" )
set( INSTALLER_APP_ID "68ad7005-8eee-49c9-95ce-9eed97e5b347" ) set( INSTALLER_APP_ID "68ad7005-8eee-49c9-95ce-9eed97e5b347" )
set( CMAKE_CXX_VERSION 14 )
# http://stackoverflow.com/a/18369825 # http://stackoverflow.com/a/18369825
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
@ -46,7 +47,6 @@ LIST(APPEND BOOST_COMPONENTS thread
system system
filesystem filesystem
program_options program_options
signals
serialization serialization
chrono chrono
unit_test_framework unit_test_framework
@ -113,11 +113,11 @@ else( WIN32 ) # Apple AND Linux
if( APPLE ) if( APPLE )
# Apple Specific Options Here # Apple Specific Options Here
message( STATUS "Configuring BitShares on OS X" ) message( STATUS "Configuring BitShares on OS X" )
set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11 -stdlib=libc++ -Wall" ) set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -stdlib=libc++ -Wall" )
else( APPLE ) else( APPLE )
# Linux Specific Options Here # Linux Specific Options Here
message( STATUS "Configuring BitShares on Linux" ) message( STATUS "Configuring BitShares on Linux" )
set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11 -Wall" ) set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall" )
set( rt_library rt ) set( rt_library rt )
#set( pthread_library pthread) #set( pthread_library pthread)
set(CMAKE_LINKER_FLAGS "-pthread" CACHE STRING "Linker Flags" FORCE) set(CMAKE_LINKER_FLAGS "-pthread" CACHE STRING "Linker Flags" FORCE)

13
libraries/chain/include/graphene/chain/protocol/address.hpp
View file

@ -78,19 +78,6 @@ namespace fc
void from_variant( const fc::variant& var, graphene::chain::address& vo, uint32_t max_depth = 1 ); void from_variant( const fc::variant& var, graphene::chain::address& vo, uint32_t max_depth = 1 );
} }
namespace std
{
template<>
struct hash<graphene::chain::address>
{
public:
size_t operator()(const graphene::chain::address &a) const
{
return (uint64_t(a.addr._hash[0])<<32) | uint64_t( a.addr._hash[0] );
}
};
}
#include <fc/reflect/reflect.hpp> #include <fc/reflect/reflect.hpp>
FC_REFLECT( graphene::chain::address, (addr) ) FC_REFLECT( graphene::chain::address, (addr) )

8
libraries/db/include/graphene/db/flat_index.hpp
View file

@ -93,14 +93,6 @@ namespace graphene { namespace db {
} FC_CAPTURE_AND_RETHROW() } FC_CAPTURE_AND_RETHROW()
} }
virtual fc::uint128 hash()const override {
fc::uint128 result;
for( const auto& ptr : _objects )
result += ptr.hash();
return result;
}
class const_iterator class const_iterator
{ {
public: public: