Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 +1 -2
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 38191dcc00 - Show all commits

3
include/fc/crypto/sha256.hpp
View file

@ -3,6 +3,7 @@
#include <fc/string.hpp> #include <fc/string.hpp>
#include <fc/platform_independence.hpp> #include <fc/platform_independence.hpp>
#include <fc/io/raw_fwd.hpp> #include <fc/io/raw_fwd.hpp>
#include <boost/functional/hash.hpp>
namespace fc namespace fc
{ {
@ -133,7 +134,6 @@ namespace std
}; };
} }
/*
namespace boost namespace boost
{ {
template<> template<>
@ -145,7 +145,6 @@ namespace boost
} }
}; };
} }
*/
#include <fc/reflect/reflect.hpp> #include <fc/reflect/reflect.hpp>
FC_REFLECT_TYPENAME( fc::sha256 ) FC_REFLECT_TYPENAME( fc::sha256 )