OpenJDK / jdk8u / jdk8u / jdk
changeset 9190:75caae8d226f
8035640: JNU_CHECK_EXCEPTION should support c++ JNI syntax
Reviewed-by: anthony, alanb
| author | pchelko |
|---|---|
| date | Tue, 04 Mar 2014 13:03:37 +0400 |
| parents | 0280c40e6e77 |
| children | 4847877564b9 |
| files | src/share/native/common/jni_util.h |
| diffstat | 1 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/native/common/jni_util.h Fri Feb 21 12:31:29 2014 +0100 +++ b/src/share/native/common/jni_util.h Tue Mar 04 13:03:37 2014 +0400 @@ -297,6 +297,21 @@ } \ } while (0) \ +#ifdef __cplusplus +#define JNU_CHECK_EXCEPTION(env) \ + do { \ + if ((env)->ExceptionCheck()) { \ + return; \ + } \ + } while (0) \ + +#define JNU_CHECK_EXCEPTION_RETURN(env, y) \ + do { \ + if ((env)->ExceptionCheck()) { \ + return (y); \ + } \ + } while (0) +#else #define JNU_CHECK_EXCEPTION(env) \ do { \ if ((*env)->ExceptionCheck(env)) { \ @@ -310,7 +325,7 @@ return (y); \ } \ } while (0) - +#endif /* __cplusplus */ /************************************************************************ * Debugging utilities */