Remove redundant #if conditional

Message ID 20180703210533.GA14059@redhat.com
State New
Headers show
Series
  • Remove redundant #if conditional
Related show

Commit Message

Jonathan Wakely July 3, 2018, 9:05 p.m.
The whole file is guarded by the same check already.

	* include/bits/alloc_traits.h: Remove redundant preprocessor
	condition.

Tested powerpc64le-linux, committed to trunk.
commit 76fd352d2bccd2a7399f6693cb5c7a8e9c65274b
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Jul 3 00:26:07 2018 +0100

    Remove redundant #if conditional
    
    The whole file is guarded by the same check already.
    
            * include/bits/alloc_traits.h: Remove redundant preprocessor
            condition.

Patch

diff --git a/libstdc++-v3/include/bits/alloc_traits.h b/libstdc++-v3/include/bits/alloc_traits.h
index eee9d8502e4..742fdd0447d 100644
--- a/libstdc++-v3/include/bits/alloc_traits.h
+++ b/libstdc++-v3/include/bits/alloc_traits.h
@@ -598,7 +598,6 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
     : is_copy_constructible<_Tp>
     { };
 
-#if __cplusplus >= 201103L
   // Trait to detect Allocator-like types.
   template<typename _Alloc, typename = void>
     struct __is_allocator : false_type { };
@@ -612,10 +611,8 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
   template<typename _Alloc>
     using _RequireAllocator
       = typename enable_if<__is_allocator<_Alloc>::value, _Alloc>::type;
-#endif
 
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std
-
-#endif
-#endif
+#endif // C++11
+#endif // _ALLOC_TRAITS_H