From cf3e6e9f15e11273083517ebfd7d0a94213d70f5 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 3 Jul 2018 22:04:37 +0100 Subject: [PATCH] Remove redundant #if conditional The whole file is guarded by the same check already. * include/bits/alloc_traits.h: Remove redundant preprocessor condition. From-SVN: r262359 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/alloc_traits.h | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 838887c1efd..8d5e849d6e3 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2018-07-03 Jonathan Wakely + + * include/bits/alloc_traits.h: Remove redundant preprocessor + condition. + 2018-07-03 François Dumont * include/bits/stl_algobase.h (__niter_wrap): New. 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 struct __is_allocator : false_type { }; @@ -612,10 +611,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template 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 -- 2.30.2