From d5270ff95e88e9f2e4d2b8fed1a981c44b54eb0d Mon Sep 17 00:00:00 2001 From: ljfa-ag Date: Tue, 28 Jul 2015 18:21:09 +0200 Subject: Cast values in init-list to uint8_t so the compiler shuts up about narrowing conversions --- src/endian_str.cpp | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/endian_str.cpp b/src/endian_str.cpp index 104a11312b..f03ebf2743 100644 --- a/src/endian_str.cpp +++ b/src/endian_str.cpp @@ -122,32 +122,32 @@ void write_little(std::ostream& os, uint8_t x) void write_little(std::ostream& os, uint16_t x) { uint8_t tmp[2] { - x & 0x00FF, - (x & 0xFF00) >> 8}; + uint8_t( x & 0x00FF), + uint8_t((x & 0xFF00) >> 8)}; os.write(reinterpret_cast(tmp), 2); } void write_little(std::ostream& os, uint32_t x) { uint8_t tmp[4] { - x & 0x000000FFUL, - (x & 0x0000FF00UL) >> 8, - (x & 0x00FF0000UL) >> 16, - (x & 0xFF000000UL) >> 24}; + uint8_t( x & 0x000000FFUL), + uint8_t((x & 0x0000FF00UL) >> 8), + uint8_t((x & 0x00FF0000UL) >> 16), + uint8_t((x & 0xFF000000UL) >> 24)}; os.write(reinterpret_cast(tmp), 4); } void write_little(std::ostream& os, uint64_t x) { uint8_t tmp[8] { - x & 0x00000000000000FFULL, - (x & 0x000000000000FF00ULL) >> 8, - (x & 0x0000000000FF0000ULL) >> 16, - (x & 0x00000000FF000000ULL) >> 24, - (x & 0x000000FF00000000ULL) >> 32, - (x & 0x0000FF0000000000ULL) >> 40, - (x & 0x00FF000000000000ULL) >> 48, - (x & 0xFF00000000000000ULL) >> 56}; + uint8_t( x & 0x00000000000000FFULL), + uint8_t((x & 0x000000000000FF00ULL) >> 8), + uint8_t((x & 0x0000000000FF0000ULL) >> 16), + uint8_t((x & 0x00000000FF000000ULL) >> 24), + uint8_t((x & 0x000000FF00000000ULL) >> 32), + uint8_t((x & 0x0000FF0000000000ULL) >> 40), + uint8_t((x & 0x00FF000000000000ULL) >> 48), + uint8_t((x & 0xFF00000000000000ULL) >> 56)}; os.write(reinterpret_cast(tmp), 8); } @@ -166,32 +166,32 @@ void write_big(std::ostream& os, uint8_t x) void write_big(std::ostream& os, uint16_t x) { uint8_t tmp[2] { - (x & 0xFF00) >> 8, - x & 0x00FF}; + uint8_t((x & 0xFF00) >> 8), + uint8_t( x & 0x00FF)}; os.write(reinterpret_cast(tmp), 2); } void write_big(std::ostream& os, uint32_t x) { uint8_t tmp[4] { - (x & 0xFF000000UL) >> 24, - (x & 0x00FF0000UL) >> 16, - (x & 0x0000FF00UL) >> 8, - x & 0x000000FFUL}; + uint8_t((x & 0xFF000000UL) >> 24), + uint8_t((x & 0x00FF0000UL) >> 16), + uint8_t((x & 0x0000FF00UL) >> 8), + uint8_t( x & 0x000000FFUL)}; os.write(reinterpret_cast(tmp), 4); } void write_big(std::ostream& os, uint64_t x) { uint8_t tmp[8] { - (x & 0xFF00000000000000ULL) >> 56, - (x & 0x00FF000000000000ULL) >> 48, - (x & 0x0000FF0000000000ULL) >> 40, - (x & 0x000000FF00000000ULL) >> 32, - (x & 0x00000000FF000000ULL) >> 24, - (x & 0x0000000000FF0000ULL) >> 16, - (x & 0x000000000000FF00ULL) >> 8, - x & 0x00000000000000FFULL}; + uint8_t((x & 0xFF00000000000000ULL) >> 56), + uint8_t((x & 0x00FF000000000000ULL) >> 48), + uint8_t((x & 0x0000FF0000000000ULL) >> 40), + uint8_t((x & 0x000000FF00000000ULL) >> 32), + uint8_t((x & 0x00000000FF000000ULL) >> 24), + uint8_t((x & 0x0000000000FF0000ULL) >> 16), + uint8_t((x & 0x000000000000FF00ULL) >> 8), + uint8_t( x & 0x00000000000000FFULL)}; os.write(reinterpret_cast(tmp), 8); } -- cgit 0.0.5-2-1-g0f52