git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jonathan Wakely 2018-07-03 22:04:37 +01:00 committed by Jonathan Wakely
parent 2dac4037aa
commit cf3e6e9f15
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -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> 2018-07-03 François Dumont <fdumont@gcc.gnu.org>
* include/bits/stl_algobase.h (__niter_wrap): New. * include/bits/stl_algobase.h (__niter_wrap): New.

7
libstdc++-v3/include/bits/alloc_traits.h
View File

@ -598,7 +598,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
: is_copy_constructible<_Tp> : is_copy_constructible<_Tp>
{ }; { };
#if __cplusplus >= 201103L
// Trait to detect Allocator-like types. // Trait to detect Allocator-like types.
template<typename _Alloc, typename = void> template<typename _Alloc, typename = void>
struct __is_allocator : false_type { }; struct __is_allocator : false_type { };
@ -612,10 +611,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Alloc> template<typename _Alloc>
using _RequireAllocator using _RequireAllocator
= typename enable_if<__is_allocator<_Alloc>::value, _Alloc>::type; = typename enable_if<__is_allocator<_Alloc>::value, _Alloc>::type;
#endif
_GLIBCXX_END_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++11
#endif #endif // _ALLOC_TRAITS_H
#endif