From 50c1a273869dc505be5a2cbee244ade86fda0268 Mon Sep 17 00:00:00 2001 From: Beman Date: Sun, 12 May 2013 07:25:12 -0400 Subject: [PATCH] Change name convert_bytes to convert. Given the namespace, template parameters, and function arguments, it is obvious what is being converted, and "bytes" is too low level for this function. --- include/boost/endian/converters.hpp | 154 ++++++++++++++-------------- test/converter_test.cpp | 36 +++---- 2 files changed, 95 insertions(+), 95 deletions(-) diff --git a/include/boost/endian/converters.hpp b/include/boost/endian/converters.hpp index e670b39..8e3cba4 100644 --- a/include/boost/endian/converters.hpp +++ b/include/boost/endian/converters.hpp @@ -61,7 +61,7 @@ namespace endian // compile-time generic byte order conversion template - T convert_bytes(T from) BOOST_NOEXCEPT; + T convert(T from) BOOST_NOEXCEPT; // runtime actual byte-order determination inline BOOST_SCOPED_ENUM(order) actual_order(BOOST_SCOPED_ENUM(order) o) BOOST_NOEXCEPT; @@ -69,8 +69,8 @@ namespace endian // runtime byte-order conversion template - T convert_bytes(T from, BOOST_SCOPED_ENUM(order) from_order, - BOOST_SCOPED_ENUM(order) to_order) BOOST_NOEXCEPT; + T convert(T from, BOOST_SCOPED_ENUM(order) from_order, + BOOST_SCOPED_ENUM(order) to_order) BOOST_NOEXCEPT; //----------------------------------- implementation -----------------------------------// // -- reverse_bytes portable approach suggested by tymofey, with avoidance of @@ -201,93 +201,93 @@ namespace endian # endif } - template<> inline int16_t convert_bytes(int16_t x) BOOST_NOEXCEPT {return x;} - template<> inline int16_t convert_bytes(int16_t x) BOOST_NOEXCEPT {return x;} - template<> inline int16_t convert_bytes(int16_t x) BOOST_NOEXCEPT {return x;} + template<> inline int16_t convert(int16_t x) BOOST_NOEXCEPT {return x;} + template<> inline int16_t convert(int16_t x) BOOST_NOEXCEPT {return x;} + template<> inline int16_t convert(int16_t x) BOOST_NOEXCEPT {return x;} - template<> inline uint16_t convert_bytes(uint16_t x) BOOST_NOEXCEPT {return x;} - template<> inline uint16_t convert_bytes(uint16_t x) BOOST_NOEXCEPT {return x;} - template<> inline uint16_t convert_bytes(uint16_t x) BOOST_NOEXCEPT {return x;} + template<> inline uint16_t convert(uint16_t x) BOOST_NOEXCEPT {return x;} + template<> inline uint16_t convert(uint16_t x) BOOST_NOEXCEPT {return x;} + template<> inline uint16_t convert(uint16_t x) BOOST_NOEXCEPT {return x;} - template<> inline int32_t convert_bytes(int32_t x) BOOST_NOEXCEPT {return x;} - template<> inline int32_t convert_bytes(int32_t x) BOOST_NOEXCEPT {return x;} - template<> inline int32_t convert_bytes(int32_t x) BOOST_NOEXCEPT {return x;} + template<> inline int32_t convert(int32_t x) BOOST_NOEXCEPT {return x;} + template<> inline int32_t convert(int32_t x) BOOST_NOEXCEPT {return x;} + template<> inline int32_t convert(int32_t x) BOOST_NOEXCEPT {return x;} - template<> inline uint32_t convert_bytes(uint32_t x) BOOST_NOEXCEPT {return x;} - template<> inline uint32_t convert_bytes(uint32_t x) BOOST_NOEXCEPT {return x;} - template<> inline uint32_t convert_bytes(uint32_t x) BOOST_NOEXCEPT {return x;} + template<> inline uint32_t convert(uint32_t x) BOOST_NOEXCEPT {return x;} + template<> inline uint32_t convert(uint32_t x) BOOST_NOEXCEPT {return x;} + template<> inline uint32_t convert(uint32_t x) BOOST_NOEXCEPT {return x;} - template<> inline int64_t convert_bytes(int64_t x) BOOST_NOEXCEPT {return x;} - template<> inline int64_t convert_bytes(int64_t x) BOOST_NOEXCEPT {return x;} - template<> inline int64_t convert_bytes(int64_t x) BOOST_NOEXCEPT {return x;} + template<> inline int64_t convert(int64_t x) BOOST_NOEXCEPT {return x;} + template<> inline int64_t convert(int64_t x) BOOST_NOEXCEPT {return x;} + template<> inline int64_t convert(int64_t x) BOOST_NOEXCEPT {return x;} - template<> inline uint64_t convert_bytes(uint64_t x) BOOST_NOEXCEPT {return x;} - template<> inline uint64_t convert_bytes(uint64_t x) BOOST_NOEXCEPT {return x;} - template<> inline uint64_t convert_bytes(uint64_t x) BOOST_NOEXCEPT {return x;} + template<> inline uint64_t convert(uint64_t x) BOOST_NOEXCEPT {return x;} + template<> inline uint64_t convert(uint64_t x) BOOST_NOEXCEPT {return x;} + template<> inline uint64_t convert(uint64_t x) BOOST_NOEXCEPT {return x;} - template<> inline float convert_bytes(float x) BOOST_NOEXCEPT {return x;} - template<> inline float convert_bytes(float x) BOOST_NOEXCEPT {return x;} - template<> inline float convert_bytes(float x) BOOST_NOEXCEPT {return x;} + template<> inline float convert(float x) BOOST_NOEXCEPT {return x;} + template<> inline float convert(float x) BOOST_NOEXCEPT {return x;} + template<> inline float convert(float x) BOOST_NOEXCEPT {return x;} - template<> inline double convert_bytes(double x) BOOST_NOEXCEPT {return x;} - template<> inline double convert_bytes(double x) BOOST_NOEXCEPT {return x;} - template<> inline double convert_bytes(double x) BOOST_NOEXCEPT {return x;} + template<> inline double convert(double x) BOOST_NOEXCEPT {return x;} + template<> inline double convert(double x) BOOST_NOEXCEPT {return x;} + template<> inline double convert(double x) BOOST_NOEXCEPT {return x;} - template<> inline int16_t convert_bytes(int16_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline int16_t convert_bytes(int16_t x) BOOST_NOEXCEPT {return big(x);} - template<> inline int16_t convert_bytes(int16_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline int16_t convert_bytes(int16_t x) BOOST_NOEXCEPT {return little(x);} - template<> inline int16_t convert_bytes(int16_t x) BOOST_NOEXCEPT {return big(x);} - template<> inline int16_t convert_bytes(int16_t x) BOOST_NOEXCEPT {return little(x);} + template<> inline int16_t convert(int16_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline int16_t convert(int16_t x) BOOST_NOEXCEPT {return big(x);} + template<> inline int16_t convert(int16_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline int16_t convert(int16_t x) BOOST_NOEXCEPT {return little(x);} + template<> inline int16_t convert(int16_t x) BOOST_NOEXCEPT {return big(x);} + template<> inline int16_t convert(int16_t x) BOOST_NOEXCEPT {return little(x);} - template<> inline uint16_t convert_bytes(uint16_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline uint16_t convert_bytes(uint16_t x) BOOST_NOEXCEPT {return big(x);} - template<> inline uint16_t convert_bytes(uint16_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline uint16_t convert_bytes(uint16_t x) BOOST_NOEXCEPT {return little(x);} - template<> inline uint16_t convert_bytes(uint16_t x) BOOST_NOEXCEPT {return big(x);} - template<> inline uint16_t convert_bytes(uint16_t x) BOOST_NOEXCEPT {return little(x);} + template<> inline uint16_t convert(uint16_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline uint16_t convert(uint16_t x) BOOST_NOEXCEPT {return big(x);} + template<> inline uint16_t convert(uint16_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline uint16_t convert(uint16_t x) BOOST_NOEXCEPT {return little(x);} + template<> inline uint16_t convert(uint16_t x) BOOST_NOEXCEPT {return big(x);} + template<> inline uint16_t convert(uint16_t x) BOOST_NOEXCEPT {return little(x);} - template<> inline int32_t convert_bytes(int32_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline int32_t convert_bytes(int32_t x) BOOST_NOEXCEPT {return big(x);} - template<> inline int32_t convert_bytes(int32_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline int32_t convert_bytes(int32_t x) BOOST_NOEXCEPT {return little(x);} - template<> inline int32_t convert_bytes(int32_t x) BOOST_NOEXCEPT {return big(x);} - template<> inline int32_t convert_bytes(int32_t x) BOOST_NOEXCEPT {return little(x);} + template<> inline int32_t convert(int32_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline int32_t convert(int32_t x) BOOST_NOEXCEPT {return big(x);} + template<> inline int32_t convert(int32_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline int32_t convert(int32_t x) BOOST_NOEXCEPT {return little(x);} + template<> inline int32_t convert(int32_t x) BOOST_NOEXCEPT {return big(x);} + template<> inline int32_t convert(int32_t x) BOOST_NOEXCEPT {return little(x);} - template<> inline uint32_t convert_bytes(uint32_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline uint32_t convert_bytes(uint32_t x) BOOST_NOEXCEPT {return big(x);} - template<> inline uint32_t convert_bytes(uint32_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline uint32_t convert_bytes(uint32_t x) BOOST_NOEXCEPT {return little(x);} - template<> inline uint32_t convert_bytes(uint32_t x) BOOST_NOEXCEPT {return big(x);} - template<> inline uint32_t convert_bytes(uint32_t x) BOOST_NOEXCEPT {return little(x);} + template<> inline uint32_t convert(uint32_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline uint32_t convert(uint32_t x) BOOST_NOEXCEPT {return big(x);} + template<> inline uint32_t convert(uint32_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline uint32_t convert(uint32_t x) BOOST_NOEXCEPT {return little(x);} + template<> inline uint32_t convert(uint32_t x) BOOST_NOEXCEPT {return big(x);} + template<> inline uint32_t convert(uint32_t x) BOOST_NOEXCEPT {return little(x);} - template<> inline int64_t convert_bytes(int64_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline int64_t convert_bytes(int64_t x) BOOST_NOEXCEPT {return big(x);} - template<> inline int64_t convert_bytes(int64_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline int64_t convert_bytes(int64_t x) BOOST_NOEXCEPT {return little(x);} - template<> inline int64_t convert_bytes(int64_t x) BOOST_NOEXCEPT {return big(x);} - template<> inline int64_t convert_bytes(int64_t x) BOOST_NOEXCEPT {return little(x);} + template<> inline int64_t convert(int64_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline int64_t convert(int64_t x) BOOST_NOEXCEPT {return big(x);} + template<> inline int64_t convert(int64_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline int64_t convert(int64_t x) BOOST_NOEXCEPT {return little(x);} + template<> inline int64_t convert(int64_t x) BOOST_NOEXCEPT {return big(x);} + template<> inline int64_t convert(int64_t x) BOOST_NOEXCEPT {return little(x);} - template<> inline uint64_t convert_bytes(uint64_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline uint64_t convert_bytes(uint64_t x) BOOST_NOEXCEPT {return big(x);} - template<> inline uint64_t convert_bytes(uint64_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline uint64_t convert_bytes(uint64_t x) BOOST_NOEXCEPT {return little(x);} - template<> inline uint64_t convert_bytes(uint64_t x) BOOST_NOEXCEPT {return big(x);} - template<> inline uint64_t convert_bytes(uint64_t x) BOOST_NOEXCEPT {return little(x);} + template<> inline uint64_t convert(uint64_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline uint64_t convert(uint64_t x) BOOST_NOEXCEPT {return big(x);} + template<> inline uint64_t convert(uint64_t x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline uint64_t convert(uint64_t x) BOOST_NOEXCEPT {return little(x);} + template<> inline uint64_t convert(uint64_t x) BOOST_NOEXCEPT {return big(x);} + template<> inline uint64_t convert(uint64_t x) BOOST_NOEXCEPT {return little(x);} - template<> inline float convert_bytes(float x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline float convert_bytes(float x) BOOST_NOEXCEPT {return big(x);} - template<> inline float convert_bytes(float x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline float convert_bytes(float x) BOOST_NOEXCEPT {return little(x);} - template<> inline float convert_bytes(float x) BOOST_NOEXCEPT {return big(x);} - template<> inline float convert_bytes(float x) BOOST_NOEXCEPT {return little(x);} + template<> inline float convert(float x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline float convert(float x) BOOST_NOEXCEPT {return big(x);} + template<> inline float convert(float x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline float convert(float x) BOOST_NOEXCEPT {return little(x);} + template<> inline float convert(float x) BOOST_NOEXCEPT {return big(x);} + template<> inline float convert(float x) BOOST_NOEXCEPT {return little(x);} - template<> inline double convert_bytes(double x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline double convert_bytes(double x) BOOST_NOEXCEPT {return big(x);} - template<> inline double convert_bytes(double x) BOOST_NOEXCEPT {return reverse_bytes(x);} - template<> inline double convert_bytes(double x) BOOST_NOEXCEPT {return little(x);} - template<> inline double convert_bytes(double x) BOOST_NOEXCEPT {return big(x);} - template<> inline double convert_bytes(double x) BOOST_NOEXCEPT {return little(x);} + template<> inline double convert(double x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline double convert(double x) BOOST_NOEXCEPT {return big(x);} + template<> inline double convert(double x) BOOST_NOEXCEPT {return reverse_bytes(x);} + template<> inline double convert(double x) BOOST_NOEXCEPT {return little(x);} + template<> inline double convert(double x) BOOST_NOEXCEPT {return big(x);} + template<> inline double convert(double x) BOOST_NOEXCEPT {return little(x);} inline BOOST_SCOPED_ENUM(order) actual_order(BOOST_SCOPED_ENUM(order) o) BOOST_NOEXCEPT { @@ -301,8 +301,8 @@ namespace endian } template - T convert_bytes(T from, BOOST_SCOPED_ENUM(order) from_order, - BOOST_SCOPED_ENUM(order) to_order) BOOST_NOEXCEPT + T convert(T from, BOOST_SCOPED_ENUM(order) from_order, + BOOST_SCOPED_ENUM(order) to_order) BOOST_NOEXCEPT { if (actual_order(from_order) == order::big) return actual_order(to_order) == order::big ? from : reverse_bytes(from); diff --git a/test/converter_test.cpp b/test/converter_test.cpp index 9340234..125e0fa 100644 --- a/test/converter_test.cpp +++ b/test/converter_test.cpp @@ -211,29 +211,29 @@ namespace // compile time order determination - BOOST_TEST_EQ((be::convert_bytes(big)), big); - BOOST_TEST_EQ((be::convert_bytes(little)), little); - BOOST_TEST_EQ((be::convert_bytes(native)), native); + BOOST_TEST_EQ((be::convert(big)), big); + BOOST_TEST_EQ((be::convert(little)), little); + BOOST_TEST_EQ((be::convert(native)), native); - BOOST_TEST_EQ((be::convert_bytes(big)), little); - BOOST_TEST_EQ((be::convert_bytes(big)), native); - BOOST_TEST_EQ((be::convert_bytes(little)), big); - BOOST_TEST_EQ((be::convert_bytes(little)), native); - BOOST_TEST_EQ((be::convert_bytes(native)), big); - BOOST_TEST_EQ((be::convert_bytes(native)), native); + BOOST_TEST_EQ((be::convert(big)), little); + BOOST_TEST_EQ((be::convert(big)), native); + BOOST_TEST_EQ((be::convert(little)), big); + BOOST_TEST_EQ((be::convert(little)), native); + BOOST_TEST_EQ((be::convert(native)), big); + BOOST_TEST_EQ((be::convert(native)), native); // runtime order determination - BOOST_TEST_EQ((be::convert_bytes(big, be::order::big, be::order::big)), big); - BOOST_TEST_EQ((be::convert_bytes(little, be::order::little, be::order::little)), little); - BOOST_TEST_EQ((be::convert_bytes(native, be::order::native, be::order::native)), native); + BOOST_TEST_EQ((be::convert(big, be::order::big, be::order::big)), big); + BOOST_TEST_EQ((be::convert(little, be::order::little, be::order::little)), little); + BOOST_TEST_EQ((be::convert(native, be::order::native, be::order::native)), native); - BOOST_TEST_EQ((be::convert_bytes(big, be::order::big, be::order::little)), little); - BOOST_TEST_EQ((be::convert_bytes(big, be::order::big, be::order::native)), native); - BOOST_TEST_EQ((be::convert_bytes(little, be::order::little, be::order::big)), big); - BOOST_TEST_EQ((be::convert_bytes(little, be::order::little, be::order::native)), native); - BOOST_TEST_EQ((be::convert_bytes(native, be::order::native, be::order::big)), big); - BOOST_TEST_EQ((be::convert_bytes(native, be::order::native, be::order::little)), native); + BOOST_TEST_EQ((be::convert(big, be::order::big, be::order::little)), little); + BOOST_TEST_EQ((be::convert(big, be::order::big, be::order::native)), native); + BOOST_TEST_EQ((be::convert(little, be::order::little, be::order::big)), big); + BOOST_TEST_EQ((be::convert(little, be::order::little, be::order::native)), native); + BOOST_TEST_EQ((be::convert(native, be::order::native, be::order::big)), big); + BOOST_TEST_EQ((be::convert(native, be::order::native, be::order::little)), native); } } // unnamed namespace