diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2016-10-20 12:37:19 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-10-20 12:37:19 +0100 |
| commit | 88b3e631506a51e5e1ae04224efe0b5ac5f7d0ca (patch) | |
| tree | 02b7eb7957fcfedfe7d1d988afeabffa8cc8fd03 /libstdc++-v3 | |
| parent | 2e20345f137fe5116140ba78193f88dd57e2b8a6 (diff) | |
| download | gcc-88b3e631506a51e5e1ae04224efe0b5ac5f7d0ca.zip gcc-88b3e631506a51e5e1ae04224efe0b5ac5f7d0ca.tar.gz gcc-88b3e631506a51e5e1ae04224efe0b5ac5f7d0ca.tar.bz2 | |
Tweak whitespace in std::allocator files
* include/bits/allocator.h: Remove trailing whitespace, tab-indent.
* include/ext/new_allocator.h: Likewise.
From-SVN: r241371
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/allocator.h | 18 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/new_allocator.h | 26 |
3 files changed, 25 insertions, 22 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cca33773..f0360c5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2016-10-20 Jonathan Wakely <jwakely@redhat.com> + * include/bits/allocator.h: Remove trailing whitespace, tab-indent. + * include/ext/new_allocator.h: Likewise. + PR libstdc++/78052 * include/bits/allocator.h (allocator<void>::construct) (allocator<void>::destroy): Define. diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h index 9fb5842..327e250 100644 --- a/libstdc++-v3/include/bits/allocator.h +++ b/libstdc++-v3/include/bits/allocator.h @@ -75,8 +75,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef void value_type; template<typename _Tp1> - struct rebind - { typedef allocator<_Tp1> other; }; + struct rebind + { typedef allocator<_Tp1> other; }; #if __cplusplus >= 201103L // _GLIBCXX_RESOLVE_LIB_DEFECTS @@ -86,13 +86,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef true_type is_always_equal; template<typename _Up, typename... _Args> - void - construct(_Up* __p, _Args&&... __args) + void + construct(_Up* __p, _Args&&... __args) { ::new((void *)__p) _Up(std::forward<_Args>(__args)...); } template<typename _Up> - void - destroy(_Up* __p) { __p->~_Up(); } + void + destroy(_Up* __p) { __p->~_Up(); } #endif }; @@ -117,8 +117,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef _Tp value_type; template<typename _Tp1> - struct rebind - { typedef allocator<_Tp1> other; }; + struct rebind + { typedef allocator<_Tp1> other; }; #if __cplusplus >= 201103L // _GLIBCXX_RESOLVE_LIB_DEFECTS @@ -134,7 +134,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : __allocator_base<_Tp>(__a) { } template<typename _Tp1> - allocator(const allocator<_Tp1>&) throw() { } + allocator(const allocator<_Tp1>&) throw() { } ~allocator() throw() { } diff --git a/libstdc++-v3/include/ext/new_allocator.h b/libstdc++-v3/include/ext/new_allocator.h index 2ff4780..7633029 100644 --- a/libstdc++-v3/include/ext/new_allocator.h +++ b/libstdc++-v3/include/ext/new_allocator.h @@ -48,7 +48,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * @brief An allocator that uses global new, as per [20.4]. * @ingroup allocators * - * This is precisely the allocator defined in the C++ Standard. + * This is precisely the allocator defined in the C++ Standard. * - all allocation calls operator new * - all deallocation calls operator delete * @@ -67,8 +67,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef _Tp value_type; template<typename _Tp1> - struct rebind - { typedef new_allocator<_Tp1> other; }; + struct rebind + { typedef new_allocator<_Tp1> other; }; #if __cplusplus >= 201103L // _GLIBCXX_RESOLVE_LIB_DEFECTS @@ -81,7 +81,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION new_allocator(const new_allocator&) _GLIBCXX_USE_NOEXCEPT { } template<typename _Tp1> - new_allocator(const new_allocator<_Tp1>&) _GLIBCXX_USE_NOEXCEPT { } + new_allocator(const new_allocator<_Tp1>&) _GLIBCXX_USE_NOEXCEPT { } ~new_allocator() _GLIBCXX_USE_NOEXCEPT { } @@ -97,7 +97,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // about what the return value is when __n == 0. pointer allocate(size_type __n, const void* = 0) - { + { if (__n > this->max_size()) std::__throw_bad_alloc(); @@ -131,21 +131,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __cplusplus >= 201103L template<typename _Up, typename... _Args> - void - construct(_Up* __p, _Args&&... __args) + void + construct(_Up* __p, _Args&&... __args) { ::new((void *)__p) _Up(std::forward<_Args>(__args)...); } template<typename _Up> - void - destroy(_Up* __p) { __p->~_Up(); } + void + destroy(_Up* __p) { __p->~_Up(); } #else // _GLIBCXX_RESOLVE_LIB_DEFECTS // 402. wrong new expression in [some_] allocator::construct - void - construct(pointer __p, const _Tp& __val) + void + construct(pointer __p, const _Tp& __val) { ::new((void *)__p) _Tp(__val); } - void + void destroy(pointer __p) { __p->~_Tp(); } #endif }; @@ -154,7 +154,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline bool operator==(const new_allocator<_Tp>&, const new_allocator<_Tp>&) { return true; } - + template<typename _Tp> inline bool operator!=(const new_allocator<_Tp>&, const new_allocator<_Tp>&) |