commit ecca567340aae01466e3a84f42ec11744bb26775
author Mark Salyzyn <salyzyn@google.com> Wed Apr 30 17:35:44 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 30 17:35:44 2014 +0000
tree 98438616f9e048f0371574e21b01ecd8dbc0cb25
parent dff52d8c0314389d316b98c8b640482d7ea2e165
parent 61384bb399e6d3c29d054e956131d140d8f4caea

am 61384bb3: am 5db5d6d3: am 474dac4d: Merge "stlport: if we can not throw, let us abort"

* commit '61384bb399e6d3c29d054e956131d140d8f4caea':
  stlport: if we can not throw, let us abort

stlport/stl/config/features.h

diff --git a/stlport/stl/config/features.h b/stlport/stl/config/features.h
index b615041..862feec 100644
--- a/stlport/stl/config/features.h
+++ b/stlport/stl/config/features.h
@@ -843,9 +843,9 @@
 #  define _STLP_TRY
 #  define _STLP_CATCH_ALL if (false)
 #  ifndef _STLP_THROW
-#    define _STLP_THROW(x)
+#    define _STLP_THROW(x) abort()
 #  endif
-#  define _STLP_RETHROW {}
+#  define _STLP_RETHROW abort()
 #  define _STLP_UNWIND(action)
 #  define _STLP_THROWS(x)
 #  define _STLP_NOTHROW