diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2018-07-03 22:04:37 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-07-03 22:04:37 +0100 |
| commit | cf3e6e9f15e11273083517ebfd7d0a94213d70f5 (patch) | |
| tree | 838d431e91fb300c6f067e0d06a7253fb63148c0 | |
| parent | 2dac4037aa79029c73444ef73667621e0cbac3bf (diff) | |
| download | gcc-cf3e6e9f15e11273083517ebfd7d0a94213d70f5.zip gcc-cf3e6e9f15e11273083517ebfd7d0a94213d70f5.tar.gz gcc-cf3e6e9f15e11273083517ebfd7d0a94213d70f5.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 838887c..8d5e849 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2018-07-03 Jonathan Wakely <jwakely@redhat.com> + + * include/bits/alloc_traits.h: Remove redundant preprocessor + condition. + 2018-07-03 François Dumont <fdumont@gcc.gnu.org> * 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 eee9d85..742fdd0 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 |