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

formatter.h (__truth): Remove, unused. 

2010-11-18  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/debug/formatter.h (__truth): Remove, unused.
	(__is_same): Remove, include cpp_type_traits.h instead.
	(_Parameter::_Parameter(const _Safe_iterator<>&, const char*,
	_Is_iterator)): Adjust.
	* include/debug/safe_iterator.h (_Safe_iterator<>::_M_constant):
	Likewise.

From-SVN: r166900
This commit is contained in:
Paolo Carlini 2010-11-18 11:03:14 +00:00 committed by Paolo Carlini
parent f3764768fa
commit 67c495be79
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2010-11-18 Paolo Carlini <paolo.carlini@oracle.com>
* include/debug/formatter.h (__truth): Remove, unused.
(__is_same): Remove, include cpp_type_traits.h instead.
(_Parameter::_Parameter(const _Safe_iterator<>&, const char*,
_Is_iterator)): Adjust.
* include/debug/safe_iterator.h (_Safe_iterator<>::_M_constant):
Likewise.
2010-11-17 François Dumont <francois.cppdevs@free.fr>
* testsuite/lib/libstdc++.exp (check_v3_target_debug_mode): Clean

22
libstdc++-v3/include/debug/formatter.h
View File

@ -31,6 +31,7 @@
#define _GLIBCXX_DEBUG_FORMATTER_H 1
#include <bits/c++config.h>
#include <bits/cpp_type_traits.h>
#include <typeinfo>
namespace __gnu_debug
@ -40,21 +41,6 @@ namespace __gnu_debug
template<typename _Iterator>
bool __check_singular(_Iterator&);
/** Determine if the two types are the same. */
template<typename _Type1, typename _Type2>
struct __is_same
{
static const bool value = false;
};
template<typename _Type>
struct __is_same<_Type, _Type>
{
static const bool value = true;
};
template<bool> struct __truth { };
class _Safe_sequence_base;
template<typename _Iterator, typename _Sequence>
@ -225,9 +211,9 @@ namespace __gnu_debug
_M_variant._M_iterator._M_type = 0;
#endif
_M_variant._M_iterator._M_constness =
__is_same<_Safe_iterator<_Iterator, _Sequence>,
typename _Sequence::iterator>::
value? __mutable_iterator : __const_iterator;
std::__are_same<_Safe_iterator<_Iterator, _Sequence>,
typename _Sequence::iterator>::
__value ? __mutable_iterator : __const_iterator;
_M_variant._M_iterator._M_sequence = __it._M_get_sequence();
#ifdef __GXX_RTTI
_M_variant._M_iterator._M_seq_type = &typeid(_Sequence);

2
libstdc++-v3/include/debug/safe_iterator.h
View File

@ -95,7 +95,7 @@ namespace __gnu_debug
_M_constant() const
{
typedef typename _Sequence::const_iterator const_iterator;
return __is_same<const_iterator, _Safe_iterator>::value;
return std::__are_same<const_iterator, _Safe_iterator>::__value;
}
typedef std::iterator_traits<_Iterator> _Traits;