From 8af97236b44c01761e1294025653d7f19dac7dd9 Mon Sep 17 00:00:00 2001
From: theraven <theraven@FreeBSD.org>
Date: Tue, 13 Nov 2012 03:27:43 +0000
Subject: Import new version of libc++ into base.

---
 contrib/libc++/include/istream | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'contrib/libc++/include/istream')

diff --git a/contrib/libc++/include/istream b/contrib/libc++/include/istream
index 72b2004..dc1c52b 100644
--- a/contrib/libc++/include/istream
+++ b/contrib/libc++/include/istream
@@ -1189,7 +1189,11 @@ basic_istream<_CharT, _Traits>::peek()
 #endif  // _LIBCPP_NO_EXCEPTIONS
         sentry __sen(*this, true);
         if (__sen)
+        {
             __r = this->rdbuf()->sgetc();
+            if (traits_type::eq_int_type(__r, traits_type::eof()))
+                this->setstate(ios_base::eofbit);
+        }
 #ifndef _LIBCPP_NO_EXCEPTIONS
     }
     catch (...)
@@ -1706,9 +1710,9 @@ operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x)
     return __is;
 }
 
-extern template class basic_istream<char>;
-extern template class basic_istream<wchar_t>;
-extern template class basic_iostream<char>;
+_LIBCPP_EXTERN_TEMPLATE(class basic_istream<char>)
+_LIBCPP_EXTERN_TEMPLATE(class basic_istream<wchar_t>)
+_LIBCPP_EXTERN_TEMPLATE(class basic_iostream<char>)
 
 _LIBCPP_END_NAMESPACE_STD
 
-- 
cgit v1.1