[libcxxabi] r236861 - Merging r231852:

[Tom Stellard]

Author: tstellar
Date: Fri May  8 09:59:40 2015
New Revision: 236861

URL: http://llvm.org/viewvc/llvm-project?rev=236861&view=rev
Log:
Merging r231852:
------------------------------------------------------------------------
r231852 | ericwf | 2015-03-10 14:32:53 -0700 (Tue, 10 Mar 2015) | 1 line

Remove unneeded const_cast in readPointerHelper. Pointed out by jroelofs
------------------------------------------------------------------------

Modified:
    libcxxabi/branches/release_36/   (props changed)
    libcxxabi/branches/release_36/src/cxa_personality.cpp

Propchange: libcxxabi/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May  8 09:59:40 2015
@@ -1 +1 @@
-/libcxxabi/trunk:226818-226820,226822-226824,228359,231839
+/libcxxabi/trunk:226818-226820,226822-226824,228359,231839,231852

Modified: libcxxabi/branches/release_36/src/cxa_personality.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/branches/release_36/src/cxa_personality.cpp?rev=236861&r1=236860&r2=236861&view=diff
==============================================================================
--- libcxxabi/branches/release_36/src/cxa_personality.cpp (original)
+++ libcxxabi/branches/release_36/src/cxa_personality.cpp Fri May  8 09:59:40 2015
@@ -148,7 +148,7 @@ namespace
 template <class AsType>
 uintptr_t readPointerHelper(const uint8_t*& p) {
     AsType value;
-    memcpy(&value, const_cast<uint8_t*>(p), sizeof(AsType));
+    memcpy(&value, p, sizeof(AsType));
     p += sizeof(AsType);
     return static_cast<uintptr_t>(value);
 }