12ffa22844
2011-01-30 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/36104 part four * include/bits/c++config (_GLIBCXX_STD): Remove. (_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C. (_GLIBCXX_P): Now _GLIBCXX_STD_A. (_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL, _GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove. (_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL, _GLIBCXX_INLINE_PROFILE): Remove. (_GLIBCXX_BEGIN_NAMESPACE(X)): Remove. (_GLIBCXX_END_NAMESPACE): Remove. (_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove. (_GLIBCXX_END_NESTED_NAMESPACE): Remove. (_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add. (_GLIBCXX_END_NAMESPACE_ALGO): Add. (_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add. (_GLIBCXX_END_NAMESPACE_CONTAINER): Add. (_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add. (_GLIBCXX_END_NAMESPACE_VERSION): Add. (_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL. (_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL. (_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY. * include/*: Use new macros for namespace scope. * config/*: Same. * src/*: Same. * src/Makefile.am (sources): Remove debug_list.cc, add compatibility-debug_list-2.cc. (parallel_sources): Remove parallel_list.cc, add compatibility-parallel_list-2.cc. (compatibility-parallel_list-2.[o,lo]): New rule. * src/Makefile.in: Regenerate. * src/debug_list.cc: Remove. * src/parallel_list.cc: Remove. * src/compatibility-list-2.cc: New. * src/compatibility-debug_list-2.cc: New. * src/compatibility-parallel_list-2.cc: New. * doc/doxygen/user.cfg.in: Adjust macros. * testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros. * testsuite/20_util/declval/requirements/1_neg.cc: Same. * testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same. * testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same. * testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same. * testsuite/20_util/forward/c_neg.cc: Same. * testsuite/20_util/forward/f_neg.cc: Same. * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same. * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same. * testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same. * testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same. * testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same. * testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same. * testsuite/23_containers/forward_list/capacity/1.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ assign_neg.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ insert_neg.cc: Same. * testsuite/23_containers/list/capacity/29134.cc: Same. * testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same. * testsuite/23_containers/vector/bool/capacity/29134.cc: Same. * testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same. * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same. * testsuite/25_algorithms/sort/35588.cc: Same. * testsuite/27_io/ios_base/cons/assign_neg.cc: Same. * testsuite/27_io/ios_base/cons/copy_neg.cc: Same. * testsuite/ext/profile/mutex_extensions_neg.cc: Same. * testsuite/ext/profile/profiler_algos.cc: Same. * testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same. * testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same. * testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same. * testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same. * testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same. From-SVN: r169421
275 lines
8.8 KiB
C++
275 lines
8.8 KiB
C++
// Profiling iterator implementation -*- C++ -*-
|
|
|
|
// Copyright (C) 2009, 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/iterator_tracker.h
|
|
* This file is a GNU profile extension to the Standard C++ Library.
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_PROFILE_ITERATOR_TRACKER
|
|
#define _GLIBCXX_PROFILE_ITERATOR_TRACKER 1
|
|
|
|
#include <ext/type_traits.h>
|
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
namespace __profile
|
|
{
|
|
|
|
template<typename _Iterator, typename _Sequence>
|
|
class __iterator_tracker
|
|
{
|
|
typedef __iterator_tracker _Self;
|
|
|
|
// The underlying iterator
|
|
_Iterator _M_current;
|
|
|
|
// The underlying data structure
|
|
const _Sequence* _M_ds;
|
|
typedef std::iterator_traits<_Iterator> _Traits;
|
|
|
|
public:
|
|
typedef _Iterator _Base_iterator;
|
|
typedef typename _Traits::iterator_category iterator_category;
|
|
typedef typename _Traits::value_type value_type;
|
|
typedef typename _Traits::difference_type difference_type;
|
|
typedef typename _Traits::reference reference;
|
|
typedef typename _Traits::pointer pointer;
|
|
|
|
__iterator_tracker()
|
|
: _M_current(), _M_ds(0) { }
|
|
|
|
__iterator_tracker(const _Iterator& __i, const _Sequence* __seq)
|
|
: _M_current(__i), _M_ds(__seq) { }
|
|
|
|
__iterator_tracker(const __iterator_tracker& __x)
|
|
: _M_current(__x._M_current), _M_ds(__x._M_ds) { }
|
|
|
|
template<typename _MutableIterator>
|
|
__iterator_tracker(const __iterator_tracker<_MutableIterator,
|
|
typename __gnu_cxx::__enable_if
|
|
<(std::__are_same<_MutableIterator, typename
|
|
_Sequence::iterator::_Base_iterator>::__value),
|
|
_Sequence>::__type>& __x)
|
|
: _M_current(__x.base()), _M_ds(__x._M_get_sequence()) { }
|
|
|
|
_Iterator
|
|
base() const { return _M_current; }
|
|
|
|
/**
|
|
* @brief Conversion to underlying non-debug iterator to allow
|
|
* better interaction with non-profile containers.
|
|
*/
|
|
operator _Iterator() const { return _M_current; }
|
|
|
|
pointer
|
|
operator->() const { return &*_M_current; }
|
|
|
|
__iterator_tracker&
|
|
operator++()
|
|
{
|
|
_M_ds->_M_profile_iterate();
|
|
++_M_current;
|
|
return *this;
|
|
}
|
|
|
|
__iterator_tracker&
|
|
operator++(int)
|
|
{
|
|
_M_ds->_M_profile_iterate();
|
|
__iterator_tracker __tmp(*this);
|
|
++_M_current;
|
|
return __tmp;
|
|
}
|
|
|
|
__iterator_tracker&
|
|
operator--()
|
|
{
|
|
_M_ds->_M_profile_iterate(1);
|
|
--_M_current;
|
|
return *this;
|
|
}
|
|
|
|
__iterator_tracker&
|
|
operator--(int)
|
|
{
|
|
_M_ds->_M_profile_iterate(1);
|
|
__iterator_tracker __tmp(*this);
|
|
--_M_current;
|
|
return __tmp;
|
|
}
|
|
|
|
__iterator_tracker&
|
|
operator=(const __iterator_tracker& __x)
|
|
{
|
|
_M_current = __x._M_current;
|
|
return *this;
|
|
}
|
|
|
|
reference
|
|
operator*() const
|
|
{ return *_M_current; }
|
|
|
|
// ------ Random access iterator requirements ------
|
|
reference
|
|
operator[](const difference_type& __n) const
|
|
{ return _M_current[__n]; }
|
|
|
|
__iterator_tracker&
|
|
operator+=(const difference_type& __n)
|
|
{
|
|
_M_current += __n;
|
|
return *this;
|
|
}
|
|
|
|
__iterator_tracker
|
|
operator+(const difference_type& __n) const
|
|
{
|
|
__iterator_tracker __tmp(*this);
|
|
__tmp += __n;
|
|
return __tmp;
|
|
}
|
|
|
|
__iterator_tracker&
|
|
operator-=(const difference_type& __n)
|
|
{
|
|
_M_current += -__n;
|
|
return *this;
|
|
}
|
|
|
|
__iterator_tracker
|
|
operator-(const difference_type& __n) const
|
|
{
|
|
__iterator_tracker __tmp(*this);
|
|
__tmp -= __n;
|
|
return __tmp;
|
|
}
|
|
|
|
void
|
|
_M_find()
|
|
{ _M_ds->_M_profile_find(); }
|
|
|
|
const _Sequence*
|
|
_M_get_sequence() const
|
|
{ return static_cast<const _Sequence*>(_M_ds); }
|
|
};
|
|
|
|
template<typename _IteratorL, typename _IteratorR, typename _Sequence>
|
|
inline bool
|
|
operator==(const __iterator_tracker<_IteratorL, _Sequence>& __lhs,
|
|
const __iterator_tracker<_IteratorR, _Sequence>& __rhs)
|
|
{ return __lhs.base() == __rhs.base(); }
|
|
|
|
template<typename _Iterator, typename _Sequence>
|
|
inline bool
|
|
operator==(const __iterator_tracker<_Iterator, _Sequence>& __lhs,
|
|
const __iterator_tracker<_Iterator, _Sequence>& __rhs)
|
|
{ return __lhs.base() == __rhs.base(); }
|
|
|
|
template<typename _IteratorL, typename _IteratorR, typename _Sequence>
|
|
inline bool
|
|
operator!=(const __iterator_tracker<_IteratorL, _Sequence>& __lhs,
|
|
const __iterator_tracker<_IteratorR, _Sequence>& __rhs)
|
|
{ return __lhs.base() != __rhs.base(); }
|
|
|
|
template<typename _Iterator, typename _Sequence>
|
|
inline bool
|
|
operator!=(const __iterator_tracker<_Iterator, _Sequence>& __lhs,
|
|
const __iterator_tracker<_Iterator, _Sequence>& __rhs)
|
|
{ return __lhs.base() != __rhs.base(); }
|
|
|
|
template<typename _IteratorL, typename _IteratorR, typename _Sequence>
|
|
inline bool
|
|
operator<(const __iterator_tracker<_IteratorL, _Sequence>& __lhs,
|
|
const __iterator_tracker<_IteratorR, _Sequence>& __rhs)
|
|
{ return __lhs.base() < __rhs.base(); }
|
|
|
|
template<typename _Iterator, typename _Sequence>
|
|
inline bool
|
|
operator<(const __iterator_tracker<_Iterator, _Sequence>& __lhs,
|
|
const __iterator_tracker<_Iterator, _Sequence>& __rhs)
|
|
{ return __lhs.base() < __rhs.base(); }
|
|
|
|
template<typename _IteratorL, typename _IteratorR, typename _Sequence>
|
|
inline bool
|
|
operator<=(const __iterator_tracker<_IteratorL, _Sequence>& __lhs,
|
|
const __iterator_tracker<_IteratorR, _Sequence>& __rhs)
|
|
{ return __lhs.base() <= __rhs.base(); }
|
|
|
|
template<typename _Iterator, typename _Sequence>
|
|
inline bool
|
|
operator<=(const __iterator_tracker<_Iterator, _Sequence>& __lhs,
|
|
const __iterator_tracker<_Iterator, _Sequence>& __rhs)
|
|
{ return __lhs.base() <= __rhs.base(); }
|
|
|
|
template<typename _IteratorL, typename _IteratorR, typename _Sequence>
|
|
inline bool
|
|
operator>(const __iterator_tracker<_IteratorL, _Sequence>& __lhs,
|
|
const __iterator_tracker<_IteratorR, _Sequence>& __rhs)
|
|
{ return __lhs.base() > __rhs.base(); }
|
|
|
|
template<typename _Iterator, typename _Sequence>
|
|
inline bool
|
|
operator>(const __iterator_tracker<_Iterator, _Sequence>& __lhs,
|
|
const __iterator_tracker<_Iterator, _Sequence>& __rhs)
|
|
{ return __lhs.base() > __rhs.base(); }
|
|
|
|
template<typename _IteratorL, typename _IteratorR, typename _Sequence>
|
|
inline bool
|
|
operator>=(const __iterator_tracker<_IteratorL, _Sequence>& __lhs,
|
|
const __iterator_tracker<_IteratorR, _Sequence>& __rhs)
|
|
{ return __lhs.base() >= __rhs.base(); }
|
|
|
|
template<typename _Iterator, typename _Sequence>
|
|
inline bool
|
|
operator>=(const __iterator_tracker<_Iterator, _Sequence>& __lhs,
|
|
const __iterator_tracker<_Iterator, _Sequence>& __rhs)
|
|
{ return __lhs.base() >= __rhs.base(); }
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// According to the resolution of DR179 not only the various comparison
|
|
// operators but also operator- must accept mixed iterator/const_iterator
|
|
// parameters.
|
|
template<typename _IteratorL, typename _IteratorR, typename _Sequence>
|
|
inline typename __iterator_tracker<_IteratorL, _Sequence>::difference_type
|
|
operator-(const __iterator_tracker<_IteratorL, _Sequence>& __lhs,
|
|
const __iterator_tracker<_IteratorR, _Sequence>& __rhs)
|
|
{ return __lhs.base() - __rhs.base(); }
|
|
|
|
template<typename _Iterator, typename _Sequence>
|
|
inline typename __iterator_tracker<_Iterator, _Sequence>::difference_type
|
|
operator-(const __iterator_tracker<_Iterator, _Sequence>& __lhs,
|
|
const __iterator_tracker<_Iterator, _Sequence>& __rhs)
|
|
{ return __lhs.base() - __rhs.base(); }
|
|
|
|
template<typename _Iterator, typename _Sequence>
|
|
inline __iterator_tracker<_Iterator, _Sequence>
|
|
operator+(typename __iterator_tracker<_Iterator,_Sequence>::difference_type
|
|
__n,
|
|
const __iterator_tracker<_Iterator, _Sequence>& __i)
|
|
{ return __i + __n; }
|
|
|
|
} // namespace __profile
|
|
} // namespace std
|
|
#endif
|