diff options
| author | dim <dim@FreeBSD.org> | 2012-10-22 18:25:04 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-10-22 18:25:04 +0000 |
| commit | 708d8e446e991358da23bb52ec5320440221f12f (patch) | |
| tree | 3a061d75674cd5b60d9f6df45d0b8d755da3782f /contrib/libc++/include/istream | |
| parent | b8c74d455d2690e710a0802a98a9d310995a52eb (diff) | |
| parent | 13334223d751d249ccd6475b8cba36ff71ddc972 (diff) | |
| download | FreeBSD-src-708d8e446e991358da23bb52ec5320440221f12f.zip FreeBSD-src-708d8e446e991358da23bb52ec5320440221f12f.tar.gz | |
Import libc++ trunk r165949. Among other improvements and bug fixes,
this has many visibility problems fixed, which should help with
compiling certain ports that exercise C++11 mode (i.e. Firefox).
Also, belatedly add the LICENSE.TXT and accompanying CREDITS.TXT files,
which are referred to in all the source files.
MFC after: 1 month
Diffstat (limited to 'contrib/libc++/include/istream')
| -rw-r--r-- | contrib/libc++/include/istream | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/libc++/include/istream b/contrib/libc++/include/istream index 7312425..72b2004 100644 --- a/contrib/libc++/include/istream +++ b/contrib/libc++/include/istream @@ -194,7 +194,7 @@ protected: public: // 27.7.1.1.3 Prefix/suffix: - class sentry; + class _LIBCPP_VISIBLE sentry; // 27.7.1.2 Formatted input: basic_istream& operator>>(basic_istream& (*__pf)(basic_istream&)); @@ -1263,6 +1263,7 @@ basic_istream<_CharT, _Traits>::putback(char_type __c) try { #endif // _LIBCPP_NO_EXCEPTIONS + this->clear(this->rdstate() & ~ios_base::eofbit); sentry __sen(*this, true); if (__sen) { @@ -1290,6 +1291,7 @@ basic_istream<_CharT, _Traits>::unget() try { #endif // _LIBCPP_NO_EXCEPTIONS + this->clear(this->rdstate() & ~ios_base::eofbit); sentry __sen(*this, true); if (__sen) { @@ -1368,6 +1370,7 @@ basic_istream<_CharT, _Traits>::seekg(pos_type __pos) try { #endif // _LIBCPP_NO_EXCEPTIONS + this->clear(this->rdstate() & ~ios_base::eofbit); sentry __sen(*this, true); if (__sen) if (this->rdbuf()->pubseekpos(__pos, ios_base::in) == pos_type(-1)) |
