monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 08:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6395

Browse source 
ad13a4b Fixing static_asserts in ZMQ JSON (vtnerd)
This commit is contained in:
luigi1111 2020-04-04 13:17:54 -05:00
commit bbceb31044
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/serialization/json_object.cpp
View file

@ -207,7 +207,7 @@ void fromJsonValue(const rapidjson::Value& val, int& i)
void toJsonValue(rapidjson::Writer<rapidjson::StringBuffer>& dest, const unsigned long long i) void toJsonValue(rapidjson::Writer<rapidjson::StringBuffer>& dest, const unsigned long long i)
{ {
static_assert(std::numeric_limits<unsigned long long>::max() <= std::numeric_limits<std::uint64_t>::max(), "bad uint64 conversion"); static_assert(!precision_loss<unsigned long long, std::uint64_t>(), "bad uint64 conversion");
dest.Uint64(i); dest.Uint64(i);
} }
@ -218,8 +218,7 @@ void fromJsonValue(const rapidjson::Value& val, unsigned long long& i)
void toJsonValue(rapidjson::Writer<rapidjson::StringBuffer>& dest, const long long i) void toJsonValue(rapidjson::Writer<rapidjson::StringBuffer>& dest, const long long i)
{ {
static_assert(std::numeric_limits<std::uint64_t>::min() <= std::numeric_limits<long long>::min(), "bad int64 conversion"); static_assert(!precision_loss<long long, std::int64_t>(), "bad int64 conversion");
static_assert(std::numeric_limits<long long>::max() <= std::numeric_limits<std::uint64_t>::max(), "bad int64 conversion");
dest.Int64(i); dest.Int64(i);
} }