From 6c3b31873cc48d3ea267408cc6f475bb23440cab Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 13 Aug 2013 05:24:41 +0000 Subject: [PATCH] linux port --- include/fc/variant.hpp | 3 +++ src/uint128.cpp | 1 + src/variant.cpp | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/include/fc/variant.hpp b/include/fc/variant.hpp index bf4ba0c..4de03c5 100644 --- a/include/fc/variant.hpp +++ b/include/fc/variant.hpp @@ -58,6 +58,9 @@ namespace fc void from_variant( const variant& var, time_point_sec& vo ); #ifdef __APPLE__ void to_variant( size_t s, variant& v ); + #elif !defined(_MSC_VER) + void to_variant( long long int s, variant& v ); + void to_variant( unsigned long long int s, variant& v ); #endif void to_variant( const std::string& s, variant& v ); diff --git a/src/uint128.cpp b/src/uint128.cpp index ab559d0..21a0713 100644 --- a/src/uint128.cpp +++ b/src/uint128.cpp @@ -4,6 +4,7 @@ #ifdef WIN32 #include #endif +#include namespace fc { diff --git a/src/variant.cpp b/src/variant.cpp index 3aabb00..8110c12 100644 --- a/src/variant.cpp +++ b/src/variant.cpp @@ -652,5 +652,10 @@ string format_string( const string& format, const variant_object& args ) } return ss.str(); } + #ifdef __APPLE__ + #elif !defined(_MSC_VER) + void to_variant( long long int s, variant& v ) { v = variant( int64_t(s) ); } + void to_variant( unsigned long long int s, variant& v ) { v = variant( uint16_t(s)); } + #endif } // namespace fc