Date: Sun, 24 Dec 2017 01:16:28 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r327139 - projects/clang600-import/contrib/libc++/include Message-ID: <201712240116.vBO1GShe082853@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sun Dec 24 01:16:28 2017 New Revision: 327139 URL: https://svnweb.freebsd.org/changeset/base/327139 Log: Merge libc++ trunk r321414 to contrib/libc++. Modified: projects/clang600-import/contrib/libc++/include/sstream projects/clang600-import/contrib/libc++/include/string_view Directory Properties: projects/clang600-import/contrib/libc++/ (props changed) Modified: projects/clang600-import/contrib/libc++/include/sstream ============================================================================== --- projects/clang600-import/contrib/libc++/include/sstream Sun Dec 24 01:15:12 2017 (r327138) +++ projects/clang600-import/contrib/libc++/include/sstream Sun Dec 24 01:16:28 2017 (r327139) @@ -577,6 +577,7 @@ basic_stringbuf<_CharT, _Traits, _Allocator>::seekoff( if ((__wch & (ios_base::in | ios_base::out)) == (ios_base::in | ios_base::out) && __way == ios_base::cur) return pos_type(-1); + const ptrdiff_t __hm = __hm_ == nullptr ? 0 : __hm_ - __str_.data(); off_type __noff; switch (__way) { @@ -590,13 +591,13 @@ basic_stringbuf<_CharT, _Traits, _Allocator>::seekoff( __noff = this->pptr() - this->pbase(); break; case ios_base::end: - __noff = __hm_ - __str_.data(); + __noff = __hm; break; default: return pos_type(-1); } __noff += __off; - if (__noff < 0 || __hm_ - __str_.data() < __noff) + if (__noff < 0 || __hm < __noff) return pos_type(-1); if (__noff != 0) { Modified: projects/clang600-import/contrib/libc++/include/string_view ============================================================================== --- projects/clang600-import/contrib/libc++/include/string_view Sun Dec 24 01:15:12 2017 (r327138) +++ projects/clang600-import/contrib/libc++/include/string_view Sun Dec 24 01:16:28 2017 (r327139) @@ -196,9 +196,9 @@ class _LIBCPP_TEMPLATE_VIS basic_string_view { (public // types typedef _Traits traits_type; typedef _CharT value_type; - typedef const _CharT* pointer; + typedef _CharT* pointer; typedef const _CharT* const_pointer; - typedef const _CharT& reference; + typedef _CharT& reference; typedef const _CharT& const_reference; typedef const_pointer const_iterator; // See [string.view.iterators] typedef const_iterator iterator;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712240116.vBO1GShe082853>