summaryrefslogtreecommitdiffstats
path: root/libcxx/include/iterator
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2015-04-16 21:36:54 +0000
committerMarshall Clow <mclow.lists@gmail.com>2015-04-16 21:36:54 +0000
commit60d5e0e027da4bf5187b0221e8a06f5a8d072d8b (patch)
tree93574d60a447b5dfcd0d58548afa0deb0885bb34 /libcxx/include/iterator
parent19d704d13ce1d024de9c23336f331f9919af801c (diff)
downloadbcm5719-llvm-60d5e0e027da4bf5187b0221e8a06f5a8d072d8b.tar.gz
bcm5719-llvm-60d5e0e027da4bf5187b0221e8a06f5a8d072d8b.zip
A few bits of N2994 didn't get fully implemented a long time ago. Thanks to STL@microsoft.com for the bug report
llvm-svn: 235134
Diffstat (limited to 'libcxx/include/iterator')
-rw-r--r--libcxx/include/iterator4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/iterator b/libcxx/include/iterator
index 7f7e9ee1933..c06ef8f6777 100644
--- a/libcxx/include/iterator
+++ b/libcxx/include/iterator
@@ -214,7 +214,7 @@ public:
typedef traits traits_type;
typedef basic_istream<charT,traits> istream_type;
- istream_iterator();
+ constexpr istream_iterator();
istream_iterator(istream_type& s);
istream_iterator(const istream_iterator& x);
~istream_iterator();
@@ -765,7 +765,7 @@ private:
istream_type* __in_stream_;
_Tp __value_;
public:
- _LIBCPP_INLINE_VISIBILITY istream_iterator() : __in_stream_(0) {}
+ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR istream_iterator() : __in_stream_(0), __value_() {}
_LIBCPP_INLINE_VISIBILITY istream_iterator(istream_type& __s) : __in_stream_(&__s)
{
if (!(*__in_stream_ >> __value_))
OpenPOWER on IntegriCloud