From 2cbcd6f7d37ca74f8be46c5e644a500b3d934fec Mon Sep 17 00:00:00 2001 From: Beman Date: Wed, 10 Dec 2014 09:26:47 -0500 Subject: [PATCH] Rename "runtime_conditional_reverse" to "conditional_reverse". The differing number of arguments is sufficient to disambiguate the compile-time and run-time overloads. --- doc/conversion.html | 8 +++---- example/udt_conversion_example.cpp | 2 +- include/boost/endian/conversion.hpp | 8 +++---- test/conversion_test.cpp | 36 ++++++++++++++--------------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/doc/conversion.html b/doc/conversion.html index b149ffb..a460af1 100644 --- a/doc/conversion.html +++ b/doc/conversion.html @@ -118,7 +118,7 @@ namespace endian template <order O1, order O2, class Reversible> Reversible conditional_reverse(Reversible x) noexcept; template <class Reversible> - Reversible runtime_conditional_reverse(Reversible x, + Reversible conditional_reverse(Reversible x, order order1, order order2) noexcept; template <class Reversible> @@ -135,7 +135,7 @@ namespace endian template <order O1, order O2, class Reversible> void conditional_reverse_in_place(Reversible& x) noexcept; template <class Reversible> - void runtime_conditional_reverse_in_place(Reversible& x, + void conditional_reverse_in_place(Reversible& x, order order1, order order2) noexcept; } // namespace endian @@ -266,7 +266,7 @@ Reversible conditional_reverse(Reversible x) noexcept; is to be returned shall be determined at compile time.

template <class Reversible>
-Reversible runtime_conditional_reverse(Reversible x,
+Reversible conditional_reverse(Reversible x,
       order order1, order order2) noexcept;

Returns: order1 == order2 ? x : endian_reverse(x).

@@ -314,7 +314,7 @@ void conditional_reverse_in_place(Reversible& x) noexcept;

Remarks: Which effect applies shall be determined at compile time.

template <class Reversible>
-void runtime_conditional_reverse_in_place(Reversible& x,
+void conditional_reverse_in_place(Reversible& x,
      order order1, order order2) noexcept;
diff --git a/example/udt_conversion_example.cpp b/example/udt_conversion_example.cpp index 6696350..234557e 100644 --- a/example/udt_conversion_example.cpp +++ b/example/udt_conversion_example.cpp @@ -73,7 +73,7 @@ int main(int, char* []) conditional_reverse_in_place(x); cout << "(4) " << x.id() << ' ' << x.value() << ' ' << x.desc() << endl; - runtime_conditional_reverse_in_place(x, order::big, order::little); + conditional_reverse_in_place(x, order::big, order::little); cout << "(5) " << x.id() << ' ' << x.value() << ' ' << x.desc() << endl; } diff --git a/include/boost/endian/conversion.hpp b/include/boost/endian/conversion.hpp index f29c313..ebaca80 100644 --- a/include/boost/endian/conversion.hpp +++ b/include/boost/endian/conversion.hpp @@ -91,7 +91,7 @@ namespace endian // runtime conditional reverse byte order template - inline Reversible runtime_conditional_reverse(Reversible from, + inline Reversible conditional_reverse(Reversible from, BOOST_SCOPED_ENUM(order) from_order, BOOST_SCOPED_ENUM(order) to_order) BOOST_NOEXCEPT; // Returns: from_order == to_order ? from : endian_reverse(from). @@ -149,7 +149,7 @@ namespace endian // runtime reverse in place template - inline void runtime_conditional_reverse_in_place(Reversible& x, + inline void conditional_reverse_in_place(Reversible& x, BOOST_SCOPED_ENUM(order) from_order, BOOST_SCOPED_ENUM(order) to_order) BOOST_NOEXCEPT; @@ -364,7 +364,7 @@ namespace endian // runtime conditional reverse template - inline Reversible runtime_conditional_reverse(Reversible from, + inline Reversible conditional_reverse(Reversible from, BOOST_SCOPED_ENUM(order) from_order, BOOST_SCOPED_ENUM(order) to_order) BOOST_NOEXCEPT { return from_order == to_order ? from : endian_reverse(from); @@ -445,7 +445,7 @@ namespace endian // runtime reverse in place template - inline void runtime_conditional_reverse_in_place(Reversible& x, + inline void conditional_reverse_in_place(Reversible& x, BOOST_SCOPED_ENUM(order) from_order, BOOST_SCOPED_ENUM(order) to_order) BOOST_NOEXCEPT { diff --git a/test/conversion_test.cpp b/test/conversion_test.cpp index f705a1a..2af3899 100644 --- a/test/conversion_test.cpp +++ b/test/conversion_test.cpp @@ -177,23 +177,23 @@ namespace be::order::little>(native)), little); // runtime conditional reverse - BOOST_TEST_EQ((be::runtime_conditional_reverse(big, be::order::big, be::order::big)), + BOOST_TEST_EQ((be::conditional_reverse(big, be::order::big, be::order::big)), big); - BOOST_TEST_EQ((be::runtime_conditional_reverse(little, be::order::little, + BOOST_TEST_EQ((be::conditional_reverse(little, be::order::little, be::order::little)), little); - BOOST_TEST_EQ((be::runtime_conditional_reverse(native, be::order::native, + BOOST_TEST_EQ((be::conditional_reverse(native, be::order::native, be::order::native)), native); - BOOST_TEST_EQ((be::runtime_conditional_reverse(big, be::order::big, + BOOST_TEST_EQ((be::conditional_reverse(big, be::order::big, be::order::little)), little); - BOOST_TEST_EQ((be::runtime_conditional_reverse(big, be::order::big, + BOOST_TEST_EQ((be::conditional_reverse(big, be::order::big, be::order::native)), native); - BOOST_TEST_EQ((be::runtime_conditional_reverse(little, be::order::little, + BOOST_TEST_EQ((be::conditional_reverse(little, be::order::little, be::order::big)), big); - BOOST_TEST_EQ((be::runtime_conditional_reverse(little, be::order::little, + BOOST_TEST_EQ((be::conditional_reverse(little, be::order::little, be::order::native)), native); - BOOST_TEST_EQ((be::runtime_conditional_reverse(native, be::order::native, + BOOST_TEST_EQ((be::conditional_reverse(native, be::order::native, be::order::big)), big); - BOOST_TEST_EQ((be::runtime_conditional_reverse(native, be::order::native, + BOOST_TEST_EQ((be::conditional_reverse(native, be::order::native, be::order::little)), little); // modify-in-place tests @@ -232,31 +232,31 @@ namespace // runtime conditional reverse x = big; - be::runtime_conditional_reverse_in_place(x, be::order::big, be::order::big); + be::conditional_reverse_in_place(x, be::order::big, be::order::big); BOOST_TEST_EQ(x, big); x = little; - be::runtime_conditional_reverse_in_place(x, be::order::little, be::order::little); + be::conditional_reverse_in_place(x, be::order::little, be::order::little); BOOST_TEST_EQ(x, little); x = native; - be::runtime_conditional_reverse_in_place(x, be::order::native, be::order::native); + be::conditional_reverse_in_place(x, be::order::native, be::order::native); BOOST_TEST_EQ(x, native); x = big; - be::runtime_conditional_reverse_in_place(x, be::order::big, be::order::little); + be::conditional_reverse_in_place(x, be::order::big, be::order::little); BOOST_TEST_EQ(x, little); x = big; - be::runtime_conditional_reverse_in_place(x, be::order::big, be::order::native); + be::conditional_reverse_in_place(x, be::order::big, be::order::native); BOOST_TEST_EQ(x, native); x = little; - be::runtime_conditional_reverse_in_place(x, be::order::little, be::order::big); + be::conditional_reverse_in_place(x, be::order::little, be::order::big); BOOST_TEST_EQ(x, big); x = little; - be::runtime_conditional_reverse_in_place(x, be::order::little, be::order::native); + be::conditional_reverse_in_place(x, be::order::little, be::order::native); BOOST_TEST_EQ(x, native); x = native; - be::runtime_conditional_reverse_in_place(x, be::order::native, be::order::big); + be::conditional_reverse_in_place(x, be::order::native, be::order::big); BOOST_TEST_EQ(x, big); x = native; - be::runtime_conditional_reverse_in_place(x, be::order::native, be::order::little); + be::conditional_reverse_in_place(x, be::order::native, be::order::little); BOOST_TEST_EQ(x, little); }