feedc0de/boost_endian
1
0
Fork 0
forked from boostorg/endian
Code Pull Requests Activity

Eliminate gcc -Wconversion warnings.

Browse Source
This commit is contained in:
Beman
2014-12-10 15:03:06 -05:00
parent dcde9463fc
commit 6c173766e3
3 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/endian/buffers.hpp
View File

@@ -236,19 +236,19 @@ namespace endian
typedef unrolled_byte_loops<T, n_bytes - 1, sign> next; typedef unrolled_byte_loops<T, n_bytes - 1, sign> next;
static T load_big(const unsigned char* bytes) BOOST_NOEXCEPT static T load_big(const unsigned char* bytes) BOOST_NOEXCEPT
{ return *(bytes - 1) | (next::load_big(bytes - 1) << 8); } { return static_cast<T>(*(bytes - 1) | (next::load_big(bytes - 1) << 8)); }
static T load_little(const unsigned char* bytes) BOOST_NOEXCEPT static T load_little(const unsigned char* bytes) BOOST_NOEXCEPT
{ return *bytes | (next::load_little(bytes + 1) << 8); } { return static_cast<T>(*bytes | (next::load_little(bytes + 1) << 8)); }
static void store_big(char* bytes, T value) BOOST_NOEXCEPT static void store_big(char* bytes, T value) BOOST_NOEXCEPT
{ {
*(bytes - 1) = static_cast<char>(value); *(bytes - 1) = static_cast<char>(value);
next::store_big(bytes - 1, value >> 8); next::store_big(bytes - 1, static_cast<T>(value >> 8));
} }
static void store_little(char* bytes, T value) BOOST_NOEXCEPT static void store_little(char* bytes, T value) BOOST_NOEXCEPT
{ {
*bytes = static_cast<char>(value); *bytes = static_cast<char>(value);
next::store_little(bytes + 1, value >> 8); next::store_little(bytes + 1, static_cast<T>(value >> 8));
} }
}; };

36
include/boost/endian/detail/cover_operators.hpp
View File

@@ -62,20 +62,32 @@ namespace boost
# endif # endif
// The basic arithmetic operations. // The basic arithmetic operations.
friend D& operator+=(D& x, ArithmeticT y) BOOST_NOEXCEPT { return x = +x + y; } friend D& operator+=(D& x, ArithmeticT y) BOOST_NOEXCEPT
friend D& operator-=(D& x, ArithmeticT y) BOOST_NOEXCEPT { return x = +x - y; } { return x = static_cast<ArithmeticT>(+x + y); }
friend D& operator*=(D& x, ArithmeticT y) BOOST_NOEXCEPT { return x = +x * y; } friend D& operator-=(D& x, ArithmeticT y) BOOST_NOEXCEPT
friend D& operator/=(D& x, ArithmeticT y) BOOST_NOEXCEPT { return x = +x / y; } { return x = static_cast<ArithmeticT>(+x - y); }
friend D& operator%=(D& x, ArithmeticT y) BOOST_NOEXCEPT { return x = +x % y; } friend D& operator*=(D& x, ArithmeticT y) BOOST_NOEXCEPT
friend D& operator&=(D& x, ArithmeticT y) BOOST_NOEXCEPT { return x = +x & y; } { return x = static_cast<ArithmeticT>(+x * y); }
friend D& operator|=(D& x, ArithmeticT y) BOOST_NOEXCEPT { return x = +x | y; } friend D& operator/=(D& x, ArithmeticT y) BOOST_NOEXCEPT
friend D& operator^=(D& x, ArithmeticT y) BOOST_NOEXCEPT { return x = +x ^ y; } { return x = static_cast<ArithmeticT>(+x / y); }
friend D& operator<<=(D& x, ArithmeticT y) BOOST_NOEXCEPT { return x = +x << y; } friend D& operator%=(D& x, ArithmeticT y) BOOST_NOEXCEPT
friend D& operator>>=(D& x, ArithmeticT y) BOOST_NOEXCEPT { return x = +x >> y; } { return x = static_cast<ArithmeticT>(+x % y); }
friend D& operator&=(D& x, ArithmeticT y) BOOST_NOEXCEPT
{ return x = static_cast<ArithmeticT>(+x & y); }
friend D& operator|=(D& x, ArithmeticT y) BOOST_NOEXCEPT
{ return x = static_cast<ArithmeticT>(+x | y); }
friend D& operator^=(D& x, ArithmeticT y) BOOST_NOEXCEPT
{ return x = static_cast<ArithmeticT>(+x ^ y); }
friend D& operator<<=(D& x, ArithmeticT y) BOOST_NOEXCEPT
{ return x = static_cast<ArithmeticT>(+x << y); }
friend D& operator>>=(D& x, ArithmeticT y) BOOST_NOEXCEPT
{ return x = static_cast<ArithmeticT>(+x >> y); }
// A few binary arithmetic operations not covered by operators base class. // A few binary arithmetic operations not covered by operators base class.
friend ArithmeticT operator<<(const D& x, ArithmeticT y) BOOST_NOEXCEPT { return +x << y; } friend ArithmeticT operator<<(const D& x, ArithmeticT y) BOOST_NOEXCEPT
friend ArithmeticT operator>>(const D& x, ArithmeticT y) BOOST_NOEXCEPT { return +x >> y; } { return static_cast<ArithmeticT>(+x << y); }
friend ArithmeticT operator>>(const D& x, ArithmeticT y) BOOST_NOEXCEPT
{ return static_cast<ArithmeticT>(+x >> y); }
// Auto-increment and auto-decrement can be defined in terms of the // Auto-increment and auto-decrement can be defined in terms of the
// arithmetic operations. // arithmetic operations.

2
test/endian_test.cpp
View File

@@ -74,7 +74,7 @@ namespace
++v; // verify integer_cover_operators being applied to this type - ++v; // verify integer_cover_operators being applied to this type -
// will fail to compile if no endian<> specialization is present // will fail to compile if no endian<> specialization is present
Endian x(v+v); Endian x(static_cast<typename Endian::value_type>(v+v));
if ( x == x ) // silence warning if ( x == x ) // silence warning
return; return;
} }