diff options
Diffstat (limited to 'libcxx/include/__std_stream')
| -rw-r--r-- | libcxx/include/__std_stream | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libcxx/include/__std_stream b/libcxx/include/__std_stream index 7dfb0c99bf1..6ab0fd6077d 100644 --- a/libcxx/include/__std_stream +++ b/libcxx/include/__std_stream @@ -97,7 +97,7 @@ typename __stdinbuf<_CharT>::int_type __stdinbuf<_CharT>::__getchar(bool __consume) { char __extbuf[__limit]; - int __nread = _STD::max(1, __encoding_); + int __nread = _VSTD::max(1, __encoding_); for (int __i = 0; __i < __nread; ++__i) { char __c = getc(__file_); @@ -120,7 +120,7 @@ __stdinbuf<_CharT>::__getchar(bool __consume) &__1buf, &__1buf + 1, __inxt); switch (__r) { - case _STD::codecvt_base::ok: + case _VSTD::codecvt_base::ok: break; case codecvt_base::partial: __st_ = __sv_st; @@ -136,11 +136,11 @@ __stdinbuf<_CharT>::__getchar(bool __consume) break; case codecvt_base::error: return traits_type::eof(); - case _STD::codecvt_base::noconv: + case _VSTD::codecvt_base::noconv: __1buf = static_cast<char_type>(__extbuf[0]); break; } - } while (__r == _STD::codecvt_base::partial); + } while (__r == _VSTD::codecvt_base::partial); } if (!__consume) { @@ -166,9 +166,9 @@ __stdinbuf<_CharT>::pbackfail(int_type __c) switch (__cv_->out(__st_, &__ci, &__ci + 1, __inxt, __extbuf, __extbuf + sizeof(__extbuf), __enxt)) { - case _STD::codecvt_base::ok: + case _VSTD::codecvt_base::ok: break; - case _STD::codecvt_base::noconv: + case _VSTD::codecvt_base::noconv: __extbuf[0] = static_cast<char>(__c); __enxt = __extbuf + 1; break; |
