Commit 9073b2ca authored by Niels's avatar Niels

hopefully removed some warnings

parent 62f81a60
......@@ -757,7 +757,7 @@ class basic_json
/// assignment
type_data_t& operator=(value_t rhs)
{
bits.type = static_cast<uint16_t>(rhs);
bits.type = static_cast<uint16_t>(rhs) & 15; // avoid overflow
return *this;
}
......@@ -765,7 +765,7 @@ class basic_json
type_data_t(value_t t) noexcept
{
*reinterpret_cast<uint16_t*>(this) = 0;
bits.type = static_cast<uint16_t>(t);
bits.type = static_cast<uint16_t>(t) & 15; // avoid overflow
}
/// default constructor
......@@ -6082,7 +6082,7 @@ class basic_json
{
return (v < 10)
? ('0' + static_cast<char>(v))
: ('a' + static_cast<char>(v - 10));
: ('a' + static_cast<char>((v - 10) & 0xff));
};
// print character c as \uxxxx
......
......@@ -757,7 +757,7 @@ class basic_json
/// assignment
type_data_t& operator=(value_t rhs)
{
bits.type = static_cast<uint16_t>(rhs);
bits.type = static_cast<uint16_t>(rhs) & 15; // avoid overflow
return *this;
}
......@@ -765,7 +765,7 @@ class basic_json
type_data_t(value_t t) noexcept
{
*reinterpret_cast<uint16_t*>(this) = 0;
bits.type = static_cast<uint16_t>(t);
bits.type = static_cast<uint16_t>(t) & 15; // avoid overflow
}
/// default constructor
......@@ -6082,7 +6082,7 @@ class basic_json
{
return (v < 10)
? ('0' + static_cast<char>(v))
: ('a' + static_cast<char>(v - 10));
: ('a' + static_cast<char>((v - 10) & 0xff));
};
// print character c as \uxxxx
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment