From 29e67189d547d7886ed8042f19464ad55ef25adf Mon Sep 17 00:00:00 2001 From: bemandawes Date: Sat, 3 Sep 2011 15:14:53 +0000 Subject: [PATCH] Change to more explicit conversion names git-svn-id: http://svn.boost.org/svn/boost/sandbox/endian@74206 b8fc166d-592f-0410-95f2-cb63ce0dd405 --- boost/endian/conversion.hpp | 54 ++++++++-------- libs/endian/test/conversion_test.cpp | 96 ++++++++++++++-------------- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/boost/endian/conversion.hpp b/boost/endian/conversion.hpp index 0b825b2..1bb5ed4 100644 --- a/boost/endian/conversion.hpp +++ b/boost/endian/conversion.hpp @@ -38,19 +38,19 @@ namespace endian // conditional modifying (i.e. in-place) endianness reversal; // no effect if native endianness and specified endianness are the same - template inline void to_big(T& x); // if different, convert native to big - template inline void to_little(T& x); // if different, convert native to little - template inline void from_big(T& x); // if different, convert big to native - template inline void from_little(T& x); // if different, convert little to native + template inline void native_to_big(T& x); + template inline void native_to_little(T& x); + template inline void big_to_native(T& x); + template inline void little_to_native(T& x); - // non-modifying copy, conditionally reversing endianness; - // copy the first argument to the second argument, converting to or from the - // specified endianness if different than native endianness + // non-modifying copy conditionally reversing endianness; + // copy the source argument to the target argument, converting to or from the + // indicated endianness if different than native endianness - template inline void to_big(T native, T& big); - template inline void to_little(T native, T& little); - template inline void from_big(T big, T& native); - template inline void from_little(T little, T& native); + template inline void native_to_big(T source, T& target); + template inline void native_to_little(T source, T& target); + template inline void big_to_native(T source, T& target); + template inline void little_to_native(T source, T& target); //----------------------------------- implementation -----------------------------------// @@ -197,23 +197,23 @@ namespace endian } #ifdef BOOST_LITTLE_ENDIAN - template inline void to_big(T& x) { flip(x); } - template inline void to_little(T&) {} - template inline void from_big(T& x) { flip(x); } - template inline void from_little(T&) {} - template inline void to_big(T native, T& big) { flip(native, big); } - template inline void to_little(T native, T& little) { little = native; } - template inline void from_big(T big, T& native) { flip(big, native); } - template inline void from_little(T little, T& native) { native = little; } + template inline void native_to_big(T& x) { flip(x); } + template inline void native_to_little(T&) {} + template inline void big_to_native(T& x) { flip(x); } + template inline void little_to_native(T&) {} + template inline void native_to_big(T source, T& target) { flip(source, target); } + template inline void native_to_little(T source, T& target) { target = source; } + template inline void big_to_native(T source, T& target) { flip(source, target); } + template inline void little_to_native(T source, T& target) { target = source; } #else - template inline void to_big(T&) {} - template inline void to_little(T& x) { flip(x); } - template inline void from_big(T&) {} - template inline void from_little(T& x) { flip(x); } - template inline void to_big(T native, T& big) { big = native; } - template inline void to_little(T native, T& little) { flip(native, little); } - template inline void from_big(T big, T& native) { native = big; } - template inline void from_little(T little, T& native) { flip(little, native); } + template inline void native_to_big(T&) {} + template inline void native_to_little(T& x) { flip(x); } + template inline void big_to_native(T&) {} + template inline void little_to_native(T& x) { flip(x); } + template inline void native_to_big(T native, T& big) { target = source; } + template inline void native_to_little(T native, T& little) { flip(source, target); } + template inline void big_to_native(T big, T& native) { target = source; } + template inline void little_to_native(T little, T& native) { flip(source, target); } #endif } // namespace endian diff --git a/libs/endian/test/conversion_test.cpp b/libs/endian/test/conversion_test.cpp index 5fc7131..f69a9f4 100644 --- a/libs/endian/test/conversion_test.cpp +++ b/libs/endian/test/conversion_test.cpp @@ -203,109 +203,109 @@ namespace boost::int64_t i64; i64 = ni64; - be::to_big(i64); + be::native_to_big(i64); BOOST_TEST_EQ(i64, bi64); i64 = ni64; - be::to_little(i64); + be::native_to_little(i64); BOOST_TEST_EQ(i64, li64); i64 = bi64; - be::from_big(i64); + be::big_to_native(i64); BOOST_TEST_EQ(i64, ni64); i64 = li64; - be::from_little(i64); + be::little_to_native(i64); BOOST_TEST_EQ(i64, ni64); boost::uint64_t ui64; ui64 = nui64; - be::to_big(ui64); + be::native_to_big(ui64); BOOST_TEST_EQ(ui64, bui64); ui64 = nui64; - be::to_little(ui64); + be::native_to_little(ui64); BOOST_TEST_EQ(ui64, lui64); ui64 = bui64; - be::from_big(ui64); + be::big_to_native(ui64); BOOST_TEST_EQ(ui64, nui64); ui64 = lui64; - be::from_little(ui64); + be::little_to_native(ui64); BOOST_TEST_EQ(ui64, nui64); boost::int32_t i32; i32 = ni32; - be::to_big(i32); + be::native_to_big(i32); BOOST_TEST_EQ(i32, bi32); i32 = ni32; - be::to_little(i32); + be::native_to_little(i32); BOOST_TEST_EQ(i32, li32); i32 = bi32; - be::from_big(i32); + be::big_to_native(i32); BOOST_TEST_EQ(i32, ni32); i32 = li32; - be::from_little(i32); + be::little_to_native(i32); BOOST_TEST_EQ(i32, ni32); boost::uint32_t ui32; ui32 = nui32; - be::to_big(ui32); + be::native_to_big(ui32); BOOST_TEST_EQ(ui32, bui32); ui32 = nui32; - be::to_little(ui32); + be::native_to_little(ui32); BOOST_TEST_EQ(ui32, lui32); ui32 = bui32; - be::from_big(ui32); + be::big_to_native(ui32); BOOST_TEST_EQ(ui32, nui32); ui32 = lui32; - be::from_little(ui32); + be::little_to_native(ui32); BOOST_TEST_EQ(ui32, nui32); boost::int16_t i16; i16 = ni16; - be::to_big(i16); + be::native_to_big(i16); BOOST_TEST_EQ(i16, bi16); i16 = ni16; - be::to_little(i16); + be::native_to_little(i16); BOOST_TEST_EQ(i16, li16); i16 = bi16; - be::from_big(i16); + be::big_to_native(i16); BOOST_TEST_EQ(i16, ni16); i16 = li16; - be::from_little(i16); + be::little_to_native(i16); BOOST_TEST_EQ(i16, ni16); boost::uint16_t ui16; ui16 = nui16; - be::to_big(ui16); + be::native_to_big(ui16); BOOST_TEST_EQ(ui16, bui16); ui16 = nui16; - be::to_little(ui16); + be::native_to_little(ui16); BOOST_TEST_EQ(ui16, lui16); ui16 = bui16; - be::from_big(ui16); + be::big_to_native(ui16); BOOST_TEST_EQ(ui16, nui16); ui16 = lui16; - be::from_little(ui16); + be::little_to_native(ui16); BOOST_TEST_EQ(ui16, nui16); std::cout << " test_in_place_conditional_flip complete\n"; @@ -318,109 +318,109 @@ namespace boost::int64_t i64, ti64; i64 = ni64; - be::to_big(i64, ti64); + be::native_to_big(i64, ti64); BOOST_TEST_EQ(ti64, bi64); i64 = ni64; - be::to_little(i64, ti64); + be::native_to_little(i64, ti64); BOOST_TEST_EQ(ti64, li64); i64 = bi64; - be::from_big(i64, ti64); + be::big_to_native(i64, ti64); BOOST_TEST_EQ(ti64, ni64); i64 = li64; - be::from_little(i64, ti64); + be::little_to_native(i64, ti64); BOOST_TEST_EQ(ti64, ni64); boost::uint64_t ui64, tui64; ui64 = nui64; - be::to_big(ui64, tui64); + be::native_to_big(ui64, tui64); BOOST_TEST_EQ(tui64, bui64); ui64 = nui64; - be::to_little(ui64, tui64); + be::native_to_little(ui64, tui64); BOOST_TEST_EQ(tui64, lui64); ui64 = bui64; - be::from_big(ui64, tui64); + be::big_to_native(ui64, tui64); BOOST_TEST_EQ(tui64, nui64); ui64 = lui64; - be::from_little(ui64, tui64); + be::little_to_native(ui64, tui64); BOOST_TEST_EQ(tui64, nui64); boost::int32_t i32, ti32; i32 = ni32; - be::to_big(i32, ti32); + be::native_to_big(i32, ti32); BOOST_TEST_EQ(ti32, bi32); i32 = ni32; - be::to_little(i32, ti32); + be::native_to_little(i32, ti32); BOOST_TEST_EQ(ti32, li32); i32 = bi32; - be::from_big(i32, ti32); + be::big_to_native(i32, ti32); BOOST_TEST_EQ(ti32, ni32); i32 = li32; - be::from_little(i32, ti32); + be::little_to_native(i32, ti32); BOOST_TEST_EQ(ti32, ni32); boost::uint32_t ui32, tui32; ui32 = nui32; - be::to_big(ui32, tui32); + be::native_to_big(ui32, tui32); BOOST_TEST_EQ(tui32, bui32); ui32 = nui32; - be::to_little(ui32, tui32); + be::native_to_little(ui32, tui32); BOOST_TEST_EQ(tui32, lui32); ui32 = bui32; - be::from_big(ui32, tui32); + be::big_to_native(ui32, tui32); BOOST_TEST_EQ(tui32, nui32); ui32 = lui32; - be::from_little(ui32, tui32); + be::little_to_native(ui32, tui32); BOOST_TEST_EQ(tui32, nui32); boost::int16_t i16, ti16; i16 = ni16; - be::to_big(i16, ti16); + be::native_to_big(i16, ti16); BOOST_TEST_EQ(ti16, bi16); i16 = ni16; - be::to_little(i16, ti16); + be::native_to_little(i16, ti16); BOOST_TEST_EQ(ti16, li16); i16 = bi16; - be::from_big(i16, ti16); + be::big_to_native(i16, ti16); BOOST_TEST_EQ(ti16, ni16); i16 = li16; - be::from_little(i16, ti16); + be::little_to_native(i16, ti16); BOOST_TEST_EQ(ti16, ni16); boost::uint16_t ui16, tui16; ui16 = nui16; - be::to_big(ui16, tui16); + be::native_to_big(ui16, tui16); BOOST_TEST_EQ(tui16, bui16); ui16 = nui16; - be::to_little(ui16, tui16); + be::native_to_little(ui16, tui16); BOOST_TEST_EQ(tui16, lui16); ui16 = bui16; - be::from_big(ui16, tui16); + be::big_to_native(ui16, tui16); BOOST_TEST_EQ(tui16, nui16); ui16 = lui16; - be::from_little(ui16, tui16); + be::little_to_native(ui16, tui16); BOOST_TEST_EQ(tui16, nui16); std::cout << " test_copying_conditional_flip complete\n";