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 -1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6e42194f72 - Show all commits

2
include/fc/variant.hpp
View file

@ -561,7 +561,7 @@ namespace fc
to_variant( val, *this, max_depth ); to_variant( val, *this, max_depth );
} }
#ifdef __APPLE__ #ifdef __APPLE__
inline void to_variant( size_t s, variant& v, uint32_t max_depth = 1 ) { v = variant(uint64_t(s)); } inline void to_variant( size_t s, variant& v, uint32_t max_depth ) { v = variant(uint64_t(s)); }
#endif #endif
template<typename T> template<typename T>
void to_variant( const std::shared_ptr<T>& var, variant& vo, uint32_t max_depth ) void to_variant( const std::shared_ptr<T>& var, variant& vo, uint32_t max_depth )