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
378 lines
9.6 KiB
C++
378 lines
9.6 KiB
C++
// Profiling bitset 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/bitset
|
|
* This file is a GNU profile extension to the Standard C++ Library.
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_PROFILE_BITSET
|
|
#define _GLIBCXX_PROFILE_BITSET
|
|
|
|
#include <bitset>
|
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
namespace __profile
|
|
{
|
|
/// Class std::bitset wrapper with performance instrumentation.
|
|
template<size_t _Nb>
|
|
class bitset
|
|
: public _GLIBCXX_STD_C::bitset<_Nb>
|
|
{
|
|
typedef _GLIBCXX_STD_C::bitset<_Nb> _Base;
|
|
|
|
public:
|
|
// bit reference:
|
|
class reference
|
|
: private _Base::reference
|
|
{
|
|
typedef typename _Base::reference _Base_ref;
|
|
|
|
friend class bitset;
|
|
reference();
|
|
|
|
reference(const _Base_ref& __base, bitset* __seq)
|
|
: _Base_ref(__base)
|
|
{ }
|
|
|
|
public:
|
|
reference(const reference& __x)
|
|
: _Base_ref(__x)
|
|
{ }
|
|
|
|
reference&
|
|
operator=(bool __x)
|
|
{
|
|
*static_cast<_Base_ref*>(this) = __x;
|
|
return *this;
|
|
}
|
|
|
|
reference&
|
|
operator=(const reference& __x)
|
|
{
|
|
*static_cast<_Base_ref*>(this) = __x;
|
|
return *this;
|
|
}
|
|
|
|
bool
|
|
operator~() const
|
|
{
|
|
return ~(*static_cast<const _Base_ref*>(this));
|
|
}
|
|
|
|
operator bool() const
|
|
{
|
|
return *static_cast<const _Base_ref*>(this);
|
|
}
|
|
|
|
reference&
|
|
flip()
|
|
{
|
|
_Base_ref::flip();
|
|
return *this;
|
|
}
|
|
};
|
|
|
|
// 23.3.5.1 constructors:
|
|
_GLIBCXX_CONSTEXPR bitset() : _Base() { }
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
constexpr bitset(unsigned long long __val)
|
|
#else
|
|
bitset(unsigned long __val)
|
|
#endif
|
|
: _Base(__val) { }
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
explicit
|
|
bitset(const std::basic_string<_CharT, _Traits, _Alloc>& __str,
|
|
typename std::basic_string<_CharT, _Traits, _Alloc>::size_type
|
|
__pos = 0,
|
|
typename std::basic_string<_CharT, _Traits, _Alloc>::size_type
|
|
__n = (std::basic_string<_CharT, _Traits, _Alloc>::npos))
|
|
: _Base(__str, __pos, __n) { }
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 396. what are characters zero and one.
|
|
template<class _CharT, class _Traits, class _Alloc>
|
|
bitset(const std::basic_string<_CharT, _Traits, _Alloc>& __str,
|
|
typename std::basic_string<_CharT, _Traits, _Alloc>::size_type
|
|
__pos,
|
|
typename std::basic_string<_CharT, _Traits, _Alloc>::size_type
|
|
__n,
|
|
_CharT __zero, _CharT __one = _CharT('1'))
|
|
: _Base(__str, __pos, __n, __zero, __one) { }
|
|
|
|
bitset(const _Base& __x) : _Base(__x) { }
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
template<typename _CharT>
|
|
explicit
|
|
bitset(const _CharT* __str,
|
|
typename std::basic_string<_CharT>::size_type __n
|
|
= std::basic_string<_CharT>::npos,
|
|
_CharT __zero = _CharT('0'), _CharT __one = _CharT('1'))
|
|
: _Base(__str, __n, __zero, __one) { }
|
|
#endif
|
|
|
|
// 23.3.5.2 bitset operations:
|
|
bitset<_Nb>&
|
|
operator&=(const bitset<_Nb>& __rhs)
|
|
{
|
|
_M_base() &= __rhs;
|
|
return *this;
|
|
}
|
|
|
|
bitset<_Nb>&
|
|
operator|=(const bitset<_Nb>& __rhs)
|
|
{
|
|
_M_base() |= __rhs;
|
|
return *this;
|
|
}
|
|
|
|
bitset<_Nb>&
|
|
operator^=(const bitset<_Nb>& __rhs)
|
|
{
|
|
_M_base() ^= __rhs;
|
|
return *this;
|
|
}
|
|
|
|
bitset<_Nb>&
|
|
operator<<=(size_t __pos)
|
|
{
|
|
_M_base() <<= __pos;
|
|
return *this;
|
|
}
|
|
|
|
bitset<_Nb>&
|
|
operator>>=(size_t __pos)
|
|
{
|
|
_M_base() >>= __pos;
|
|
return *this;
|
|
}
|
|
|
|
bitset<_Nb>&
|
|
set()
|
|
{
|
|
_Base::set();
|
|
return *this;
|
|
}
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 186. bitset::set() second parameter should be bool
|
|
bitset<_Nb>&
|
|
set(size_t __pos, bool __val = true)
|
|
{
|
|
_Base::set(__pos, __val);
|
|
return *this;
|
|
}
|
|
|
|
bitset<_Nb>&
|
|
reset()
|
|
{
|
|
_Base::reset();
|
|
return *this;
|
|
}
|
|
|
|
bitset<_Nb>&
|
|
reset(size_t __pos)
|
|
{
|
|
_Base::reset(__pos);
|
|
return *this;
|
|
}
|
|
|
|
bitset<_Nb> operator~() const { return bitset(~_M_base()); }
|
|
|
|
bitset<_Nb>&
|
|
flip()
|
|
{
|
|
_Base::flip();
|
|
return *this;
|
|
}
|
|
|
|
bitset<_Nb>&
|
|
flip(size_t __pos)
|
|
{
|
|
_Base::flip(__pos);
|
|
return *this;
|
|
}
|
|
|
|
// element access:
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 11. Bitset minor problems
|
|
reference
|
|
operator[](size_t __pos)
|
|
{
|
|
return reference(_M_base()[__pos], this);
|
|
}
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 11. Bitset minor problems
|
|
bool
|
|
operator[](size_t __pos) const
|
|
{
|
|
return _M_base()[__pos];
|
|
}
|
|
|
|
using _Base::to_ulong;
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
using _Base::to_ullong;
|
|
#endif
|
|
|
|
template <typename _CharT, typename _Traits, typename _Alloc>
|
|
std::basic_string<_CharT, _Traits, _Alloc>
|
|
to_string() const
|
|
{ return _M_base().template to_string<_CharT, _Traits, _Alloc>(); }
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 396. what are characters zero and one.
|
|
template<class _CharT, class _Traits, class _Alloc>
|
|
std::basic_string<_CharT, _Traits, _Alloc>
|
|
to_string(_CharT __zero, _CharT __one = _CharT('1')) const
|
|
{
|
|
return _M_base().template
|
|
to_string<_CharT, _Traits, _Alloc>(__zero, __one);
|
|
}
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 434. bitset::to_string() hard to use.
|
|
template<typename _CharT, typename _Traits>
|
|
std::basic_string<_CharT, _Traits, std::allocator<_CharT> >
|
|
to_string() const
|
|
{ return to_string<_CharT, _Traits, std::allocator<_CharT> >(); }
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 853. to_string needs updating with zero and one.
|
|
template<class _CharT, class _Traits>
|
|
std::basic_string<_CharT, _Traits, std::allocator<_CharT> >
|
|
to_string(_CharT __zero, _CharT __one = _CharT('1')) const
|
|
{ return to_string<_CharT, _Traits,
|
|
std::allocator<_CharT> >(__zero, __one); }
|
|
|
|
template<typename _CharT>
|
|
std::basic_string<_CharT, std::char_traits<_CharT>,
|
|
std::allocator<_CharT> >
|
|
to_string() const
|
|
{
|
|
return to_string<_CharT, std::char_traits<_CharT>,
|
|
std::allocator<_CharT> >();
|
|
}
|
|
|
|
template<class _CharT>
|
|
std::basic_string<_CharT, std::char_traits<_CharT>,
|
|
std::allocator<_CharT> >
|
|
to_string(_CharT __zero, _CharT __one = _CharT('1')) const
|
|
{
|
|
return to_string<_CharT, std::char_traits<_CharT>,
|
|
std::allocator<_CharT> >(__zero, __one);
|
|
}
|
|
|
|
std::basic_string<char, std::char_traits<char>, std::allocator<char> >
|
|
to_string() const
|
|
{
|
|
return to_string<char,std::char_traits<char>,std::allocator<char> >();
|
|
}
|
|
|
|
std::basic_string<char, std::char_traits<char>, std::allocator<char> >
|
|
to_string(char __zero, char __one = '1') const
|
|
{
|
|
return to_string<char, std::char_traits<char>,
|
|
std::allocator<char> >(__zero, __one);
|
|
}
|
|
|
|
using _Base::count;
|
|
using _Base::size;
|
|
|
|
bool
|
|
operator==(const bitset<_Nb>& __rhs) const
|
|
{ return _M_base() == __rhs; }
|
|
|
|
bool
|
|
operator!=(const bitset<_Nb>& __rhs) const
|
|
{ return _M_base() != __rhs; }
|
|
|
|
using _Base::test;
|
|
using _Base::all;
|
|
using _Base::any;
|
|
using _Base::none;
|
|
|
|
bitset<_Nb>
|
|
operator<<(size_t __pos) const
|
|
{ return bitset<_Nb>(_M_base() << __pos); }
|
|
|
|
bitset<_Nb>
|
|
operator>>(size_t __pos) const
|
|
{ return bitset<_Nb>(_M_base() >> __pos); }
|
|
|
|
_Base&
|
|
_M_base() { return *this; }
|
|
|
|
const _Base&
|
|
_M_base() const { return *this; }
|
|
};
|
|
|
|
template<size_t _Nb>
|
|
bitset<_Nb>
|
|
operator&(const bitset<_Nb>& __x, const bitset<_Nb>& __y)
|
|
{ return bitset<_Nb>(__x) &= __y; }
|
|
|
|
template<size_t _Nb>
|
|
bitset<_Nb>
|
|
operator|(const bitset<_Nb>& __x, const bitset<_Nb>& __y)
|
|
{ return bitset<_Nb>(__x) |= __y; }
|
|
|
|
template<size_t _Nb>
|
|
bitset<_Nb>
|
|
operator^(const bitset<_Nb>& __x, const bitset<_Nb>& __y)
|
|
{ return bitset<_Nb>(__x) ^= __y; }
|
|
|
|
template<typename _CharT, typename _Traits, size_t _Nb>
|
|
std::basic_istream<_CharT, _Traits>&
|
|
operator>>(std::basic_istream<_CharT, _Traits>& __is, bitset<_Nb>& __x)
|
|
{ return __is >> __x._M_base(); }
|
|
|
|
template<typename _CharT, typename _Traits, size_t _Nb>
|
|
std::basic_ostream<_CharT, _Traits>&
|
|
operator<<(std::basic_ostream<_CharT, _Traits>& __os,
|
|
const bitset<_Nb>& __x)
|
|
{ return __os << __x._M_base(); }
|
|
} // namespace __profile
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
// DR 1182.
|
|
/// std::hash specialization for bitset.
|
|
template<size_t _Nb>
|
|
struct hash<__profile::bitset<_Nb>>
|
|
: public __hash_base<size_t, __profile::bitset<_Nb>>
|
|
{
|
|
size_t
|
|
operator()(const __profile::bitset<_Nb>& __b) const
|
|
{ return std::hash<_GLIBCXX_STD_C::bitset<_Nb>>()(__b._M_base()); }
|
|
};
|
|
#endif
|
|
|
|
} // namespace std
|
|
|
|
#endif
|