generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed two problems found by Chris Jefferson: Made operator>> for char consistent with gcc. Opened an LWG issue on this one. 2) Renamed some private typedefs which are causing boost grief.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@126576 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2011-02-27 18:02:02 +00:00
parent e7c8da6f2d
commit df85e57f4a
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/__hash_table
View File

@ -29,9 +29,9 @@ template <class _NodePtr>
struct __hash_node_base struct __hash_node_base
{ {
typedef __hash_node_base __first_node; typedef __hash_node_base __first_node;
typedef _NodePtr pointer; // typedef _NodePtr pointer;
pointer __next_; _NodePtr __next_;
_LIBCPP_INLINE_VISIBILITY __hash_node_base() : __next_(nullptr) {} _LIBCPP_INLINE_VISIBILITY __hash_node_base() : __next_(nullptr) {}
}; };

8
include/istream
View File

@ -801,6 +801,13 @@ operator>>(basic_istream<_CharT, _Traits>& __is, _CharT& __c)
typename basic_istream<_CharT, _Traits>::sentry __sen(__is); typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
if (__sen) if (__sen)
{ {
#if 1
typename _Traits::int_type __i = __is.rdbuf()->sbumpc();
if (_Traits::eq_int_type(__i, _Traits::eof()))
__is.setstate(ios_base::eofbit | ios_base::failbit);
else
__c = _Traits::to_char_type(__i);
#else
typedef istreambuf_iterator<_CharT, _Traits> _I; typedef istreambuf_iterator<_CharT, _Traits> _I;
_I __i(__is); _I __i(__is);
_I __eof; _I __eof;
@ -812,6 +819,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is, _CharT& __c)
} }
else else
__is.setstate(ios_base::eofbit | ios_base::failbit); __is.setstate(ios_base::eofbit | ios_base::failbit);
#endif
} }
#ifndef _LIBCPP_NO_EXCEPTIONS #ifndef _LIBCPP_NO_EXCEPTIONS
} }

12
include/map
View File

@ -493,11 +493,11 @@ class _LIBCPP_VISIBLE __map_iterator
_TreeIterator __i_; _TreeIterator __i_;
typedef typename _TreeIterator::__pointer_traits __pointer_traits; typedef typename _TreeIterator::__pointer_traits __pointer_traits;
typedef const typename _TreeIterator::value_type::first_type key_type; typedef const typename _TreeIterator::value_type::first_type __key_type;
typedef typename _TreeIterator::value_type::second_type mapped_type; typedef typename _TreeIterator::value_type::second_type __mapped_type;
public: public:
typedef bidirectional_iterator_tag iterator_category; typedef bidirectional_iterator_tag iterator_category;
typedef pair<key_type, mapped_type> value_type; typedef pair<__key_type, __mapped_type> value_type;
typedef typename _TreeIterator::difference_type difference_type; typedef typename _TreeIterator::difference_type difference_type;
typedef value_type& reference; typedef value_type& reference;
typedef typename __pointer_traits::template typedef typename __pointer_traits::template
@ -558,11 +558,11 @@ class _LIBCPP_VISIBLE __map_const_iterator
_TreeIterator __i_; _TreeIterator __i_;
typedef typename _TreeIterator::__pointer_traits __pointer_traits; typedef typename _TreeIterator::__pointer_traits __pointer_traits;
typedef const typename _TreeIterator::value_type::first_type key_type; typedef const typename _TreeIterator::value_type::first_type __key_type;
typedef typename _TreeIterator::value_type::second_type mapped_type; typedef typename _TreeIterator::value_type::second_type __mapped_type;
public: public:
typedef bidirectional_iterator_tag iterator_category; typedef bidirectional_iterator_tag iterator_category;
typedef pair<key_type, mapped_type> value_type; typedef pair<__key_type, __mapped_type> value_type;
typedef typename _TreeIterator::difference_type difference_type; typedef typename _TreeIterator::difference_type difference_type;
typedef const value_type& reference; typedef const value_type& reference;
typedef typename __pointer_traits::template typedef typename __pointer_traits::template