diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-11-18 11:03:14 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-11-18 11:03:14 +0000 |
| commit | 67c495be7987f6e96097a13cce084f4dd8cc5e17 (patch) | |
| tree | 11da2b79076f9f70fa46e9904f0306798ca3ca7f | |
| parent | f3764768faee7d25f100e7d60e18c3fef25a65fb (diff) | |
| download | gcc-67c495be7987f6e96097a13cce084f4dd8cc5e17.zip gcc-67c495be7987f6e96097a13cce084f4dd8cc5e17.tar.gz gcc-67c495be7987f6e96097a13cce084f4dd8cc5e17.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/include/debug/formatter.h | 22 | ||||
| -rw-r--r-- | libstdc++-v3/include/debug/safe_iterator.h | 2 |
3 files changed, 14 insertions, 19 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index efd7969..71e63c7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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 diff --git a/libstdc++-v3/include/debug/formatter.h b/libstdc++-v3/include/debug/formatter.h index 3aa5a8a..69f622a 100644 --- a/libstdc++-v3/include/debug/formatter.h +++ b/libstdc++-v3/include/debug/formatter.h @@ -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); diff --git a/libstdc++-v3/include/debug/safe_iterator.h b/libstdc++-v3/include/debug/safe_iterator.h index 1d47945..4bcca09 100644 --- a/libstdc++-v3/include/debug/safe_iterator.h +++ b/libstdc++-v3/include/debug/safe_iterator.h @@ -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; |