Merge pull request #24 from bitshares/abitmore-patch-1

Fix redefinition of default arg under macOS
This commit is contained in:
Abit 2018-03-22 15:27:36 +01:00 committed by GitHub
commit 3e7e0aa969
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -561,7 +561,7 @@ namespace fc
to_variant( val, *this, max_depth );
}
#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
template<typename T>
void to_variant( const std::shared_ptr<T>& var, variant& vo, uint32_t max_depth )