[gcc/devel/omp/gcc-9] Relocate std::endian from <type_traits> to <bit>

Tobias Burnus burnus@gcc.gnu.org
Thu Mar 5 14:12:00 GMT 2020


https://gcc.gnu.org/g:cdcfcb733bfd2b8bfdfdd189d8117102ec1d2fd1

commit cdcfcb733bfd2b8bfdfdd189d8117102ec1d2fd1
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Jul 26 14:36:56 2019 +0100

    Relocate std::endian from <type_traits> to <bit>
    
    This change to an early C++2a feature was just approved (P1612R1).
    
    Backport from mainline
    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.
    
    From-SVN: r273837

Diff:
---
 libstdc++-v3/ChangeLog                                      | 10 ++++++++++
 libstdc++-v3/include/std/bit                                |  7 +++++++
 libstdc++-v3/include/std/type_traits                        |  8 --------
 libstdc++-v3/testsuite/{20_util => 26_numerics}/endian/1.cc |  2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4a26702..68490bf 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,6 +1,16 @@
 2019-07-26  Jonathan Wakely  <jwakely@redhat.com>
 
 	Backport from mainline
+	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-26  Jonathan Wakely  <jwakely@redhat.com>
+
+	Backport from mainline
 	2019-07-22  Jonathan Wakely  <jwakely@redhat.com>
 
 	* include/std/bit (__rotl, __rotr): Change second parameter from
diff --git a/libstdc++-v3/include/std/bit b/libstdc++-v3/include/std/bit
index 417aa4a..4331255 100644
--- a/libstdc++-v3/include/std/bit
+++ b/libstdc++-v3/include/std/bit
@@ -325,6 +325,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 cc9cb24..440813d 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -2992,14 +2992,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
similarity index 98%
rename from libstdc++-v3/testsuite/20_util/endian/1.cc
rename to 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 );



More information about the Libstdc++-cvs mailing list