1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8035640: JNU_CHECK_EXCEPTION should support c++ JNI syntax

Browse Source 
Reviewed-by: anthony, alanb
This commit is contained in:
Petr Pchelko 2014-02-25 11:51:25 +04:00
parent da7601aeec
commit 0390c16ac8
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jdk/src/share/native/common/jni_util.h
View File

@ -297,6 +297,21 @@ JNU_NotifyAll(JNIEnv *env, jobject object);
} \ } \
} while (0) \ } 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) \ #define JNU_CHECK_EXCEPTION(env) \
do { \ do { \
if ((*env)->ExceptionCheck(env)) { \ if ((*env)->ExceptionCheck(env)) { \
@ -310,7 +325,7 @@ JNU_NotifyAll(JNIEnv *env, jobject object);
return (y); \ return (y); \
} \ } \
} while (0) } while (0)
#endif /* __cplusplus */
/************************************************************************ /************************************************************************
* Debugging utilities * Debugging utilities
*/ */