diff options
author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-10-17 14:49:11 +0000 |
---|---|---|
committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-10-17 14:49:11 +0000 |
commit | 88c87359fa92a1869402a4f0b45517e071570174 (patch) | |
tree | 2ed7b273b695c9a48d924cc22f6df17c3ad2a509 /libstdc++-v3 | |
parent | c37d8c307c43a58b602a40b9f6ba19caac77b00a (diff) | |
download | gcc-88c87359fa92a1869402a4f0b45517e071570174.tar.gz |
re PR libstdc++/43554 (profile-mode version of forward_list missing)
2010-10-17 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/43554
* include/profile/forward_list: New file.
* include/std/forward_list: Include <profile/forward_list>.
* include/Makefile.am: Add.
* testsuite/23_containers/forward_list/capacity/1.cc: Adjust.
* include/Makefile.in: Regenerate.
From-SVN: r165587
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
-rw-r--r-- | libstdc++-v3/include/Makefile.am | 1 | ||||
-rw-r--r-- | libstdc++-v3/include/Makefile.in | 1 | ||||
-rw-r--r-- | libstdc++-v3/include/profile/forward_list | 179 | ||||
-rw-r--r-- | libstdc++-v3/include/std/forward_list | 4 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc | 12 |
6 files changed, 199 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ba5fb2b3df8..5b44105f488 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2010-10-17 Paolo Carlini <paolo.carlini@oracle.com> + + PR libstdc++/43554 + * include/profile/forward_list: New file. + * include/std/forward_list: Include <profile/forward_list>. + * include/Makefile.am: Add. + * testsuite/23_containers/forward_list/capacity/1.cc: Adjust. + * include/Makefile.in: Regenerate. + 2010-10-15 Paolo Carlini <paolo.carlini@oracle.com> * include/std/functional (function<>::operator==, operator!=): diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 3723f9f2102..8093425c06b 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -800,6 +800,7 @@ profile_headers = \ ${profile_srcdir}/vector \ ${profile_srcdir}/bitset \ ${profile_srcdir}/deque \ + ${profile_srcdir}/forward_list \ ${profile_srcdir}/list \ ${profile_srcdir}/map \ ${profile_srcdir}/map.h \ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 87f5b8f4397..256bac6e437 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1033,6 +1033,7 @@ profile_headers = \ ${profile_srcdir}/vector \ ${profile_srcdir}/bitset \ ${profile_srcdir}/deque \ + ${profile_srcdir}/forward_list \ ${profile_srcdir}/list \ ${profile_srcdir}/map \ ${profile_srcdir}/map.h \ diff --git a/libstdc++-v3/include/profile/forward_list b/libstdc++-v3/include/profile/forward_list new file mode 100644 index 00000000000..5ae5bd590fe --- /dev/null +++ b/libstdc++-v3/include/profile/forward_list @@ -0,0 +1,179 @@ +// <forward_list> -*- C++ -*- + +// Copyright (C) 2010 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// <http://www.gnu.org/licenses/>. + +/** @file profile/forward_list + * This file is a GNU debug extension to the Standard C++ Library. + */ + +#ifndef _GLIBCXX_PROFILE_FORWARD_LIST +#define _GLIBCXX_PROFILE_FORWARD_LIST 1 + +#ifndef __GXX_EXPERIMENTAL_CXX0X__ +# include <bits/c++0x_warning.h> +#else + +#include <forward_list> + +namespace std +{ +namespace __profile +{ + /// Class std::forward_list wrapper with performance instrumentation. + template<typename _Tp, typename _Alloc = std::allocator<_Tp> > + class forward_list + : public _GLIBCXX_STD_D::forward_list<_Tp, _Alloc> + { + typedef _GLIBCXX_STD_D::forward_list<_Tp, _Alloc> _Base; + + public: + typedef typename _Base::size_type size_type; + + public: + // 23.2.3.1 construct/copy/destroy: + explicit + forward_list(const _Alloc& __al = _Alloc()) + : _Base(__al) { } + + forward_list(const forward_list& __list, const _Alloc& __al) + : _Base(__list, __al) + { } + + forward_list(forward_list&& __list, const _Alloc& __al) + : _Base(std::move(__list), __al) + { } + + explicit + forward_list(size_type __n) + : _Base(__n) + { } + + forward_list(size_type __n, const _Tp& __value, + const _Alloc& __al = _Alloc()) + : _Base(__n, __value, __al) + { } + + template<typename _InputIterator> + forward_list(_InputIterator __first, _InputIterator __last, + const _Alloc& __al = _Alloc()) + : _Base(__first, __last, __al) + { } + + forward_list(const forward_list& __list) + : _Base(__list) + { } + + forward_list(forward_list&& __list) + : _Base(std::move(__list)) { } + + forward_list(std::initializer_list<_Tp> __il, + const _Alloc& __al = _Alloc()) + : _Base(__il, __al) + { } + + ~forward_list() + { } + + forward_list& + operator=(const forward_list& __list) + { + static_cast<_Base&>(*this) = __list; + return *this; + } + + forward_list& + operator=(forward_list&& __list) + { + // NB: DR 1204. + // NB: DR 675. + _Base::clear(); + _Base::swap(__list); + return *this; + } + + forward_list& + operator=(std::initializer_list<_Tp> __il) + { + static_cast<_Base&>(*this) = __il; + return *this; + } + + _Base& + _M_base() { return *this; } + + const _Base& + _M_base() const { return *this; } + }; + + template<typename _Tp, typename _Alloc> + inline bool + operator==(const forward_list<_Tp, _Alloc>& __lx, + const forward_list<_Tp, _Alloc>& __ly) + { return __lx._M_base() == __ly._M_base(); } + + template<typename _Tp, typename _Alloc> + inline bool + operator<(const forward_list<_Tp, _Alloc>& __lx, + const forward_list<_Tp, _Alloc>& __ly) + { return __lx._M_base() < __ly._M_base(); } + + template<typename _Tp, typename _Alloc> + inline bool + operator!=(const forward_list<_Tp, _Alloc>& __lx, + const forward_list<_Tp, _Alloc>& __ly) + { return !(__lx == __ly); } + + /// Based on operator< + template<typename _Tp, typename _Alloc> + inline bool + operator>(const forward_list<_Tp, _Alloc>& __lx, + const forward_list<_Tp, _Alloc>& __ly) + { return (__ly < __lx); } + + /// Based on operator< + template<typename _Tp, typename _Alloc> + inline bool + operator>=(const forward_list<_Tp, _Alloc>& __lx, + const forward_list<_Tp, _Alloc>& __ly) + { return !(__lx < __ly); } + + /// Based on operator< + template<typename _Tp, typename _Alloc> + inline bool + operator<=(const forward_list<_Tp, _Alloc>& __lx, + const forward_list<_Tp, _Alloc>& __ly) + { return !(__ly < __lx); } + + /// See std::forward_list::swap(). + template<typename _Tp, typename _Alloc> + inline void + swap(forward_list<_Tp, _Alloc>& __lx, + forward_list<_Tp, _Alloc>& __ly) + { __lx.swap(__ly); } + +} // namespace __profile +} // namespace std + +#endif // __GXX_EXPERIMENTAL_CXX0X__ + +#endif diff --git a/libstdc++-v3/include/std/forward_list b/libstdc++-v3/include/std/forward_list index 322235203e7..a4bc10dd243 100644 --- a/libstdc++-v3/include/std/forward_list +++ b/libstdc++-v3/include/std/forward_list @@ -46,6 +46,10 @@ # include <debug/forward_list> #endif +#ifdef _GLIBCXX_PROFILE +# include <profile/forward_list> +#endif + #endif // __GXX_EXPERIMENTAL_CXX0X__ #endif // _GLIBCXX_FORWARD_LIST diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc b/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc index 5bb9fb98b40..fec4fff46ac 100644 --- a/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc +++ b/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc @@ -22,13 +22,11 @@ #include <forward_list> #include <testsuite_hooks.h> -bool test __attribute__((unused)) = true; - -// This test verifies the following. -// void test01() { + bool test __attribute__((unused)) = true; + std::forward_list<double> fld; VERIFY(fld.empty() == true); @@ -38,10 +36,10 @@ test01() fld.resize(0); VERIFY(fld.empty() == true); -#ifndef _GLIBCXX_DEBUG - using std::_Fwd_list_node; -#else +#if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PROFILE) using std::_GLIBCXX_STD_D::_Fwd_list_node; +#else + using std::_Fwd_list_node; #endif VERIFY( (fld.max_size() |