diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-30 15:13:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-30 15:13:07 +0000 |
| commit | 5db5d6d307d80011811ffc0db7b29d882c7a631e (patch) | |
| tree | 98438616f9e048f0371574e21b01ecd8dbc0cb25 | |
| parent | 8d61889074faf8430b37877235bac658d68e34c3 (diff) | |
| parent | 474dac4d0c5760d47dfb6ac52f6d9fc733fd2208 (diff) | |
| download | stlport-5db5d6d307d80011811ffc0db7b29d882c7a631e.tar.gz | |
am 474dac4d: Merge "stlport: if we can not throw, let us abort"
* commit '474dac4d0c5760d47dfb6ac52f6d9fc733fd2208':
stlport: if we can not throw, let us abort
| -rw-r--r-- | stlport/stl/config/features.h | 4 |
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 |