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

Merge pull request #194 from bitshares/update-variant-size-t-macos-openbsd

Browse source 
Update to_variant(size_t) for macOS and OpenBSD
This commit is contained in:
Abit 2020-03-31 17:42:23 +02:00 committed by GitHub
commit 60d7946dbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/fc/variant.hpp
View file

@ -581,9 +581,7 @@ namespace fc
memset( this, 0, sizeof(*this) ); memset( this, 0, sizeof(*this) );
to_variant( val, *this, max_depth ); to_variant( val, *this, max_depth );
} }
#ifdef __APPLE__
inline void to_variant( size_t s, variant& v, uint32_t max_depth ) { v = variant(uint64_t(s)); }
#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 )
{ {

5
src/variant.cpp
View file

@ -701,9 +701,8 @@ void from_variant( const variant& var, uint128_t& vo, uint32_t max_depth )
#endif #endif
} }
#if defined(__APPLE__) #if defined(__APPLE__) or defined(__OpenBSD__)
#elif defined(__OpenBSD__) void to_variant( size_t s, variant& v, uint32_t max_depth ) { v = variant( uint64_t(s) ); }
void to_variant( size_t s, variant& v, uint32_t max_depth ) { v = variant( int64_t(s) ); }
#elif !defined(_WIN32) #elif !defined(_WIN32)
void to_variant( long long int s, variant& v, uint32_t max_depth ) { v = variant( int64_t(s) ); } void to_variant( long long int s, variant& v, uint32_t max_depth ) { v = variant( int64_t(s) ); }
void to_variant( unsigned long long int s, variant& v, uint32_t max_depth ) { v = variant( uint64_t(s)); } void to_variant( unsigned long long int s, variant& v, uint32_t max_depth ) { v = variant( uint64_t(s)); }