diff options
| -rw-r--r-- | libcxx/include/__std_stream | 2 | ||||
| -rw-r--r-- | libcxx/include/type_traits | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libcxx/include/__std_stream b/libcxx/include/__std_stream index f867cd23bdd..fb5a346f10d 100644 --- a/libcxx/include/__std_stream +++ b/libcxx/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 diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits index f6a016d0b76..e2b537799dc 100644 --- a/libcxx/include/type_traits +++ b/libcxx/include/type_traits @@ -443,7 +443,8 @@ inline _LIBCPP_NO_CFI _LIBCPP_INLINE_VISIBILITY _Tp* addressof(_Tp& __x) _NOEXCEPT { - return (_Tp*)&reinterpret_cast<const volatile char&>(__x); + return reinterpret_cast<_Tp *>( + const_cast<char *>(&reinterpret_cast<const volatile char &>(__x))); } #endif // _LIBCPP_HAS_NO_BUILTIN_ADDRESSOF |
