diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-08 19:39:03 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-08 19:39:03 +0000 |
| commit | aed8d94e97d1be8b4e26ce1ffb4d0547aee8ab1d (patch) | |
| tree | f4b32ab9e34cda2eead99ae084f0b02d0dab6891 /contrib/libc++/include/__std_stream | |
| parent | 657db61c2068b2bcc0d930546402284e2c9c9abd (diff) | |
| parent | 4a2db4d30e1653093d4d8b06e8221e2f8b723507 (diff) | |
| download | src-aed8d94e97d1be8b4e26ce1ffb4d0547aee8ab1d.tar.gz src-aed8d94e97d1be8b4e26ce1ffb4d0547aee8ab1d.zip | |
Merge libc++ r291274, and update the library Makefile.
Notes
Notes:
svn path=/projects/clang400-import/; revision=311696
Diffstat (limited to 'contrib/libc++/include/__std_stream')
| -rw-r--r-- | contrib/libc++/include/__std_stream | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/libc++/include/__std_stream b/contrib/libc++/include/__std_stream index f867cd23bdd5..fb5a346f10d8 100644 --- a/contrib/libc++/include/__std_stream +++ b/contrib/libc++/include/__std_stream @@ -297,7 +297,7 @@ __stdoutbuf<_CharT>::overflow(int_type __c) return traits_type::eof(); if (__r == codecvt_base::partial) { - pbase = (char_type*)__e; + pbase = const_cast<char_type*>(__e); } } else |