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

Merge beatrice to develop to align SON hardfork date (#399)

Browse source
This commit is contained in:
serkixenos 2020-11-03 14:45:05 +01:00 committed by GitHub
parent fc705e947f
commit 99c8c2dd51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -128,7 +128,7 @@ else( WIN32 ) # Apple AND Linux
endif( APPLE ) endif( APPLE )
if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" ) if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin-memcmp -Wno-parentheses -Wno-terminate -Wno-invalid-offsetof" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin-memcmp -Wno-parentheses -Wno-terminate -Wno-invalid-offsetof -Wno-sign-compare" )
elseif( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" ) elseif( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
if( CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0.0 ) if( CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0.0 )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-partial-specialization" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-partial-specialization" )

6
libraries/chain/hardfork.d/SON.hf
View file

@ -1,7 +1,5 @@
// SON HARDFORK Wednesday, January 1, 2020 12:00:00 AM - 1577836800 // SON HARDFORK Wednesday, October 28, 2020 0:00:00 GMT
// SON HARDFORK Monday, March 30, 2020 3:00:00 PM - 1585573200
// SON HARDFORK Monday, September 21, 2020 1:43:11 PM - 1600695791
#ifndef HARDFORK_SON_TIME #ifndef HARDFORK_SON_TIME
#include <ctime> #include <ctime>
#define HARDFORK_SON_TIME (fc::time_point_sec( 1585573200 )) #define HARDFORK_SON_TIME (fc::time_point_sec( 1603843200 ))
#endif #endif