diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-12-23 22:41:56 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-23 22:41:57 -0800 |
| commit | a425ebceb7d24785e46f77e8e5464e7e50f45cca (patch) | |
| tree | ae4cb9c9025717ca210bc5ad2a74a71731d7296f | |
| parent | e6eb0085f1b6f32d4a9f7b75c0002e48c35d4eb1 (diff) | |
| parent | faef1da288ee83a45efa906fa517b4bd93d274f6 (diff) | |
| download | stlport-a425ebceb7d24785e46f77e8e5464e7e50f45cca.tar.gz | |
Merge "Fix a STLport-related crash."
| -rw-r--r-- | stlport/stl/pointers/_tools.h | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ struct _IteWrapper { _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; |