Author: vmpn
Date: Fri Jun 1 04:22:15 2012
New Revision: 1344982
URL: http://svn.apache.org/viewvc?rev=1344982&view=rev
Log:
Merge r1344977 from the javahl-ra branch.
Approved by: gstein
Modified:
subversion/trunk/ (props changed)
subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h
Propchange: subversion/trunk/
------------------------------------------------------------------------------
Merged /subversion/branches/javahl-ra:r1344977
Modified: subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h?rev=1344982&r1=1344981&r2=1344982&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h Fri Jun 1
04:22:15 2012
@@ -272,4 +272,12 @@ class JNIUtil
*/
#define POP_AND_RETURN_NULL POP_AND_RETURN(NULL)
+#define CPPADDR_NULL_PTR(expr, ret_val) \
+ do { \
+ if ((expr) == NULL) { \
+ JNIUtil::throwError(_("bad C++ this")); \
+ return ret_val; \
+ } \
+ } while (0)
+
#endif // JNIUTIL_H
