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

Rename "runtime_conditional_reverse" to "conditional_reverse". The differing number of arguments is sufficient to disambiguate the compile-time and run-time overloads.

Browse Source
This commit is contained in:
Beman
2014-12-10 09:26:47 -05:00
parent 51b990eb50
commit 2cbcd6f7d3
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/conversion.html
View File

@@ -118,7 +118,7 @@ namespace endian
template <order O1, order O2, class Reversible> template <order O1, order O2, class Reversible>
Reversible conditional_reverse(Reversible x) noexcept; Reversible conditional_reverse(Reversible x) noexcept;
template <class Reversible> template <class Reversible>
Reversible runtime_conditional_reverse(Reversible x, Reversible conditional_reverse(Reversible x,
order order1, order order2) noexcept; order order1, order order2) noexcept;
template <class Reversible> template <class Reversible>
@@ -135,7 +135,7 @@ namespace endian
template <order O1, order O2, class Reversible> template <order O1, order O2, class Reversible>
void conditional_reverse_in_place(Reversible& x) noexcept; void conditional_reverse_in_place(Reversible& x) noexcept;
template <class Reversible> template <class Reversible>
void runtime_conditional_reverse_in_place(Reversible& x, void conditional_reverse_in_place(Reversible& x,
order order1, order order2) noexcept; order order1, order order2) noexcept;
} // namespace endian } // namespace endian
@@ -266,7 +266,7 @@ Reversible conditional_reverse(Reversible x) noexcept; </pre>
is to be returned shall be determined at compile time.</p> is to be returned shall be determined at compile time.</p>
</blockquote> </blockquote>
<pre>template &lt;class Reversible&gt; <pre>template &lt;class Reversible&gt;
Reversible runtime_conditional_reverse(Reversible x, Reversible conditional_reverse(Reversible x,
order order1, order order2) noexcept; </pre> order order1, order order2) noexcept; </pre>
<blockquote> <blockquote>
<p><i>Returns:</i> <code>order1 == order2 ? x : endian_reverse(x)</code>.</p> <p><i>Returns:</i> <code>order1 == order2 ? x : endian_reverse(x)</code>.</p>
@@ -314,7 +314,7 @@ void conditional_reverse_in_place(Reversible&amp; x) noexcept; </pre>
<p><i>Remarks: </i>Which effect applies shall be determined at compile time.</p> <p><i>Remarks: </i>Which effect applies shall be determined at compile time.</p>
</blockquote> </blockquote>
<pre>template &lt;class Reversible&gt; <pre>template &lt;class Reversible&gt;
void runtime_conditional_reverse_in_place(Reversible&amp; x, void conditional_reverse_in_place(Reversible&amp; x,
order order1, order order2) noexcept; </pre> order order1, order order2) noexcept; </pre>

2
example/udt_conversion_example.cpp
View File

@@ -73,7 +73,7 @@ int main(int, char* [])
conditional_reverse_in_place<order::little, order::big>(x); conditional_reverse_in_place<order::little, order::big>(x);
cout << "(4) " << x.id() << ' ' << x.value() << ' ' << x.desc() << endl; 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; cout << "(5) " << x.id() << ' ' << x.value() << ' ' << x.desc() << endl;
} }

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

@@ -91,7 +91,7 @@ namespace endian
// runtime conditional reverse byte order // runtime conditional reverse byte order
template <class Reversible > template <class Reversible >
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; BOOST_SCOPED_ENUM(order) from_order, BOOST_SCOPED_ENUM(order) to_order) BOOST_NOEXCEPT;
// Returns: from_order == to_order ? from : endian_reverse(from). // Returns: from_order == to_order ? from : endian_reverse(from).
@@ -149,7 +149,7 @@ namespace endian
// runtime reverse in place // runtime reverse in place
template <class Reversible> template <class Reversible>
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_SCOPED_ENUM(order) from_order, BOOST_SCOPED_ENUM(order) to_order)
BOOST_NOEXCEPT; BOOST_NOEXCEPT;
@@ -364,7 +364,7 @@ namespace endian
// runtime conditional reverse // runtime conditional reverse
template <class Reversible > template <class Reversible >
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 BOOST_SCOPED_ENUM(order) from_order, BOOST_SCOPED_ENUM(order) to_order) BOOST_NOEXCEPT
{ {
return from_order == to_order ? from : endian_reverse(from); return from_order == to_order ? from : endian_reverse(from);
@@ -445,7 +445,7 @@ namespace endian
// runtime reverse in place // runtime reverse in place
template <class Reversible> template <class Reversible>
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_SCOPED_ENUM(order) from_order, BOOST_SCOPED_ENUM(order) to_order)
BOOST_NOEXCEPT BOOST_NOEXCEPT
{ {

36
test/conversion_test.cpp
View File

@@ -177,23 +177,23 @@ namespace
be::order::little>(native)), little); be::order::little>(native)), little);
// runtime conditional reverse // 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); 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); 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); 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); 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); 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); 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); 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); 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); be::order::little)), little);
// modify-in-place tests // modify-in-place tests
@@ -232,31 +232,31 @@ namespace
// runtime conditional reverse // runtime conditional reverse
x = big; 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); BOOST_TEST_EQ(x, big);
x = little; 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); BOOST_TEST_EQ(x, little);
x = native; 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); BOOST_TEST_EQ(x, native);
x = big; 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); BOOST_TEST_EQ(x, little);
x = big; 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); BOOST_TEST_EQ(x, native);
x = little; 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); BOOST_TEST_EQ(x, big);
x = little; 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); BOOST_TEST_EQ(x, native);
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); BOOST_TEST_EQ(x, big);
x = native; 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); BOOST_TEST_EQ(x, little);
} }