diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/bit | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/type_traits | 8 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/26_numerics/endian/1.cc (renamed from libstdc++-v3/testsuite/20_util/endian/1.cc) | 2 |
4 files changed, 15 insertions, 9 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a92e7a7..21f352a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2019-07-25 Jonathan Wakely <jwakely@redhat.com> + + * include/std/bit (endian): Move definition here as per P1612R1. + * include/std/type_traits (endian): Remove definition from here. + * testsuite/20_util/endian/1.cc: Rename to ... + * testsuite/26_numerics/endian/1.cc: ... here. Adjust header. + 2019-07-25 Martin Liska <mliska@suse.cz> Dominik Infuhr <dominik.infuehr@theobroma-systems.com> diff --git a/libstdc++-v3/include/std/bit b/libstdc++-v3/include/std/bit index f17d2f1..d57433c 100644 --- a/libstdc++-v3/include/std/bit +++ b/libstdc++-v3/include/std/bit @@ -315,6 +315,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION log2p1(_Tp __x) noexcept { return std::__log2p1(__x); } + /// Byte order + enum class endian + { + little = __ORDER_LITTLE_ENDIAN__, + big = __ORDER_BIG_ENDIAN__, + native = __BYTE_ORDER__ + }; #endif // C++2a _GLIBCXX_END_NAMESPACE_VERSION diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index d8ed1ce..9428dad 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -3226,14 +3226,6 @@ template <typename _From, typename _To> #endif // C++17 #if __cplusplus > 201703L - /// Byte order - enum class endian - { - little = __ORDER_LITTLE_ENDIAN__, - big = __ORDER_BIG_ENDIAN__, - native = __BYTE_ORDER__ - }; - /// Remove references and cv-qualifiers. template<typename _Tp> struct remove_cvref diff --git a/libstdc++-v3/testsuite/20_util/endian/1.cc b/libstdc++-v3/testsuite/26_numerics/endian/1.cc index 4faaba8..896a14c 100644 --- a/libstdc++-v3/testsuite/20_util/endian/1.cc +++ b/libstdc++-v3/testsuite/26_numerics/endian/1.cc @@ -18,7 +18,7 @@ // { dg-options "-std=gnu++2a" } // { dg-do compile { target c++2a } } -#include <type_traits> +#include <bit> static_assert( std::is_enum_v<std::endian> ); static_assert( std::endian::little != std::endian::big ); |