commit faef1da288ee83a45efa906fa517b4bd93d274f6
author Andrew Hsieh <andrewhsieh@google.com> Sat Dec 22 15:45:46 2012 +0800
committer Andrew Hsieh <andrewhsieh@google.com> Sat Dec 22 15:45:46 2012 +0800
tree 8d5538b0b3571fce3e3f46ccfe9963ca1d5c3edb
parent e5f45d3719275b0fd752b94c3de2e6ca8bb097bb

Fix a STLport-related crash.

See 37b00fcfc3a53bdef5fe7c9c3dba0fd0f26ad298

Change-Id: I0744d8a7508bc4760d277ac55707e67126de1581

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;