commit a6d2073f7806b0b6e4ebef9401164f2c32f73541
author Andrew Hsieh <andrewhsieh@google.com> Fri Dec 28 09:48:37 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 28 09:48:37 2012 -0800
tree 136a96a100553caae01ff3d0412d93a85b73629c
parent 30fedaeab934a7eac471b7a9e786043bfcd43cb1
parent e6eb0085f1b6f32d4a9f7b75c0002e48c35d4eb1

am e6eb0085: Merge "Fix compilation with clang and GCC 4.7"

* commit 'e6eb0085f1b6f32d4a9f7b75c0002e48c35d4eb1':
  Fix compilation with clang and GCC 4.7

stlport/stl/_rope.h

diff --git a/stlport/stl/_rope.h b/stlport/stl/_rope.h
index f100f67..cc391f7 100644
--- a/stlport/stl/_rope.h
+++ b/stlport/stl/_rope.h
@@ -905,7 +905,9 @@
   }
   reference operator*() {
     if (0 == this->_M_buf_ptr)
-#if !defined (__DMC__)
+#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || __GNUC_MINOR__ >= 7))
+      this->_S_setcache(*this);
+#elif !defined (__DMC__)
       _S_setcache(*this);
 #else
     { _Rope_iterator_base<_CharT, _Alloc>* __x = this; _S_setcache(*__x); }