Sync develop with master #4

Merged
RoshanSyed merged 144 commits from master into develop 2019-12-16 15:20:56 +00:00
Showing only changes of commit 360d86da80 - Show all commits

View file

@ -161,7 +161,7 @@ template<> struct reflector<ENUM> { \
} \
static ENUM from_string( const char* s ) { \
BOOST_PP_SEQ_FOR_EACH( FC_REFLECT_ENUM_FROM_STRING, ENUM, FIELDS ) \
int64_t i; \
int64_t i = 0; \
try \
{ \
i = boost::lexical_cast<int64_t>(s); \