diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-30 14:43:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-30 14:43:50 +0000 |
| commit | 474dac4d0c5760d47dfb6ac52f6d9fc733fd2208 (patch) | |
| tree | 98438616f9e048f0371574e21b01ecd8dbc0cb25 | |
| parent | 01d98425a4d9b02e306a14a746541990df3d5743 (diff) | |
| parent | 3a5d1fa525bd73df0c6df0bb66829f92af791064 (diff) | |
| download | stlport-474dac4d0c5760d47dfb6ac52f6d9fc733fd2208.tar.gz | |
Merge "stlport: if we can not throw, let us abort"idea133-weekly-release
| -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 |