aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-30 15:38:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-30 15:38:04 +0000
commit61384bb399e6d3c29d054e956131d140d8f4caea (patch)
tree98438616f9e048f0371574e21b01ecd8dbc0cb25
parentb926ff24c76169bcd1b29518d88759585fb59842 (diff)
parent5db5d6d307d80011811ffc0db7b29d882c7a631e (diff)
downloadstlport-61384bb399e6d3c29d054e956131d140d8f4caea.tar.gz
am 5db5d6d3: am 474dac4d: Merge "stlport: if we can not throw, let us abort"
* commit '5db5d6d307d80011811ffc0db7b29d882c7a631e': stlport: if we can not throw, let us abort
-rw-r--r--stlport/stl/config/features.h4
1 files changed, 2 insertions, 2 deletions
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 @@ namespace _STL = _STLP_STD_NAME;
# 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