[gcc r13-7266] libstdc++: Simplify preprocessor/namespace nesting in <bits/move.h>

Jonathan Wakely redi@gcc.gnu.org
Fri Apr 28 13:10:42 GMT 2023


https://gcc.gnu.org/g:0d9f00612a81046f112cd7a17849ddfa9b5510b2

commit r13-7266-g0d9f00612a81046f112cd7a17849ddfa9b5510b2
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Apr 28 11:07:40 2023 +0100

    libstdc++: Simplify preprocessor/namespace nesting in <bits/move.h>
    
    There's no good reason to conditionally close and reopen namespace std
    within an #if block. Just include the <type_traits> header at the top
    instead.
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/move.h: Simplify opening/closing namespace std.
    
    (cherry picked from commit 5c8b154c56a65faf64dfc5f8852e801150cb2f26)

Diff:
---
 libstdc++-v3/include/bits/move.h | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/libstdc++-v3/include/bits/move.h b/libstdc++-v3/include/bits/move.h
index 6bc70e8e724..4a8fceff96a 100644
--- a/libstdc++-v3/include/bits/move.h
+++ b/libstdc++-v3/include/bits/move.h
@@ -33,6 +33,8 @@
 #include <bits/c++config.h>
 #if __cplusplus < 201103L
 # include <bits/concept_check.h>
+#else
+# include <type_traits> // Brings in std::declval too.
 #endif
 
 namespace std _GLIBCXX_VISIBILITY(default)
@@ -51,15 +53,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
 #if __cplusplus >= 201103L
 
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#include <type_traits> // Brings in std::declval too.
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
   /**
    *  @addtogroup utilities
    *  @{


More information about the Libstdc++-cvs mailing list