commit 5334ba74948dfa1a130facbc91c1a6c88268e8bc
author Saleem Abdulrasool <compnerd@compnerd.org> Sat Dec 31 18:13:34 2016 +0000
committer Saleem Abdulrasool <compnerd@compnerd.org> Sat Dec 31 18:13:34 2016 +0000
tree 6ba6b4db718a38f2082cbb0166345f9b3f531a4d
parent c6aee64c5d7bd5dabd5e1f5770c4f3e0388b5534

clean up some qualifier casting

This cleans up the `-Wqual-cast` warnings from gcc 6 when building
libc++.  NFC.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@290789 91177308-0d34-0410-b5e6-96231b3b80d8

include/__std_stream

diff --git a/include/__std_stream b/include/__std_stream
index f867cd2..fb5a346 100644
--- a/include/__std_stream
+++ b/include/__std_stream
@@ -297,7 +297,7 @@
                         return traits_type::eof();
                     if (__r == codecvt_base::partial)
                     {
-                        pbase = (char_type*)__e;
+                        pbase = const_cast<char_type*>(__e);
                     }
                 }
                 else

include/type_traits

diff --git a/include/type_traits b/include/type_traits
index f6a016d..e2b5377 100644
--- a/include/type_traits
+++ b/include/type_traits
@@ -443,7 +443,8 @@
 _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