commit 27d98815eb375840362adaa5cb5c27af7aa0cd4d
author Andrew Hsieh <andrewhsieh@google.com> Fri Dec 28 09:48:38 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 28 09:48:38 2012 -0800
tree ae4cb9c9025717ca210bc5ad2a74a71731d7296f
parent a6d2073f7806b0b6e4ebef9401164f2c32f73541
parent a425ebceb7d24785e46f77e8e5464e7e50f45cca

am a425ebce: Merge "Fix a STLport-related crash."

* commit 'a425ebceb7d24785e46f77e8e5464e7e50f45cca':
  Fix a STLport-related crash.

stlport/stl/pointers/_tools.h

diff --git a/stlport/stl/pointers/_tools.h b/stlport/stl/pointers/_tools.h
index 5bb7b25..d9b64e6 100644
--- a/stlport/stl/pointers/_tools.h
+++ b/stlport/stl/pointers/_tools.h
@@ -351,7 +351,10 @@
 
   _IteWrapper(_Iterator &__ite) : _M_ite(__ite) {}
 
-  const_reference operator*() const { return cast_traits::to_storage_type_cref(*_M_ite); }
+  const_reference operator*() const
+  // See http://code.google.com/p/android/issues/detail?id=38630
+  //{ return cast_traits::to_storage_type_cref(*_M_ite); }
+  { return reinterpret_cast<const_reference>(*_M_ite); }
 
   _Self& operator= (_Self const& __rhs) {
     _M_ite = __rhs._M_ite;