diff options
| author | Doug Gregor <dgregor@apple.com> | 2003-06-23 16:18:53 +0000 |
|---|---|---|
| committer | Doug Gregor <dgregor@gcc.gnu.org> | 2003-06-23 16:18:53 +0000 |
| commit | 2b491e3a3b2126c32b3d77932a2d1a09592b088f (patch) | |
| tree | 3cb00d233eac150fc38886126c9295a909a704bf | |
| parent | b20b352b6b81a51dd1c573f7d95616fef5fc0da7 (diff) | |
| download | gcc-2b491e3a3b2126c32b3d77932a2d1a09592b088f.zip gcc-2b491e3a3b2126c32b3d77932a2d1a09592b088f.tar.gz gcc-2b491e3a3b2126c32b3d77932a2d1a09592b088f.tar.bz2 | |
Types _D -> _Diff, _R -> _Ref
From-SVN: r68375
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/boost_concept_check.h | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d2993e4..f215985 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2003-06-20 Doug Gregor <dgregor@apple.com> + + * include/bits/boost_concept_check.h: Don't use _D or _R for type + names. + 2003-06-22 Paolo Carlini <pcarlini@unitus.it> Nathan C. Myers <ncm-nospam@cantrip.org> diff --git a/libstdc++-v3/include/bits/boost_concept_check.h b/libstdc++-v3/include/bits/boost_concept_check.h index d91c2e8..a6a94a2 100644 --- a/libstdc++-v3/include/bits/boost_concept_check.h +++ b/libstdc++-v3/include/bits/boost_concept_check.h @@ -412,9 +412,9 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; }; void __constraints() { __function_requires< _TrivialIteratorConcept<_Tp> >(); // require iterator_traits typedef's - typedef typename std::iterator_traits<_Tp>::difference_type _D; -// __function_requires< _SignedIntegerConcept<_D> >(); - typedef typename std::iterator_traits<_Tp>::reference _R; + typedef typename std::iterator_traits<_Tp>::difference_type _Diff; +// __function_requires< _SignedIntegerConcept<_Diff> >(); + typedef typename std::iterator_traits<_Tp>::reference _Ref; typedef typename std::iterator_traits<_Tp>::pointer _Pt; typedef typename std::iterator_traits<_Tp>::iterator_category _Cat; __function_requires< _ConvertibleConcept< @@ -447,8 +447,8 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; }; __function_requires< _ConvertibleConcept< typename std::iterator_traits<_Tp>::iterator_category, std::forward_iterator_tag> >(); - typedef typename std::iterator_traits<_Tp>::reference _R; - _R __r _IsUnused = *__i; + typedef typename std::iterator_traits<_Tp>::reference _Ref; + _Ref __r _IsUnused = *__i; } _Tp __i; }; @@ -498,8 +498,8 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; }; __function_requires< _ConvertibleConcept< typename std::iterator_traits<_Tp>::iterator_category, std::random_access_iterator_tag> >(); - // ??? We don't use _R, are we just checking for "referenceability"? - typedef typename std::iterator_traits<_Tp>::reference _R; + // ??? We don't use _Ref, are we just checking for "referenceability"? + typedef typename std::iterator_traits<_Tp>::reference _Ref; __i += __n; // require assignment addition operator __i = __i + __n; __i = __n + __i; // require addition with difference type @@ -828,7 +828,7 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; }; typedef typename _SimpleAssociativeContainer::key_type _Key_type; typedef typename _SimpleAssociativeContainer::value_type _Value_type; typedef typename _Aux_require_same<_Key_type, _Value_type>::_Type - _Requqired; + _Required; } }; |