diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-03 20:43:05 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-03 20:43:05 (GMT) |
commit | 12fd139e9045e989d3b9d9ecf63895b26880f609 (patch) | |
tree | 3b1219cfacc155d7608c2b62733b3cffe3395375 /java | |
parent | 7c057f658a7a8e42d82afedf79a1da06dc098cba (diff) | |
download | hdf5-12fd139e9045e989d3b9d9ecf63895b26880f609.zip hdf5-12fd139e9045e989d3b9d9ecf63895b26880f609.tar.gz hdf5-12fd139e9045e989d3b9d9ecf63895b26880f609.tar.bz2 |
Update reference files and fix int as string
Diffstat (limited to 'java')
-rw-r--r-- | java/src/hdf/hdf5lib/H5.java | 6 | ||||
-rw-r--r-- | java/src/jni/h5rImp.c | 12 | ||||
-rw-r--r-- | java/src/jni/h5rImp.h | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java index 01c18dc..3420862 100644 --- a/java/src/hdf/hdf5lib/H5.java +++ b/java/src/hdf/hdf5lib/H5.java @@ -8122,7 +8122,7 @@ public class H5 implements java.io.Serializable { * @exception IllegalArgumentException * - an input array is invalid. **/ - public synchronized static native byte[] H5Rcreate_object(long loc_id, String name) + public synchronized static native byte[] H5Rcreate_object(long loc_id, String name, long access_id) throws HDF5LibraryException, NullPointerException, IllegalArgumentException; /** @@ -8145,7 +8145,7 @@ public class H5 implements java.io.Serializable { * @exception IllegalArgumentException * - an input array is invalid. **/ - public synchronized static native byte[] H5Rcreate_region(long loc_id, String name, long space_id) + public synchronized static native byte[] H5Rcreate_region(long loc_id, String name, long space_id, long access_id) throws HDF5LibraryException, NullPointerException, IllegalArgumentException; /** @@ -8168,7 +8168,7 @@ public class H5 implements java.io.Serializable { * @exception IllegalArgumentException * - an input array is invalid. **/ - public synchronized static native byte[] H5Rcreate_attr(long loc_id, String name, String attr_name) + public synchronized static native byte[] H5Rcreate_attr(long loc_id, String name, String attr_name, long access_id) throws HDF5LibraryException, NullPointerException, IllegalArgumentException; /** diff --git a/java/src/jni/h5rImp.c b/java/src/jni/h5rImp.c index f7dcb30..3f1fd96 100644 --- a/java/src/jni/h5rImp.c +++ b/java/src/jni/h5rImp.c @@ -36,7 +36,7 @@ extern "C" { */ JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_H5_H5Rcreate_1object - (JNIEnv *env, jclass clss, jlong loc_id, jstring name) + (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong aid) { const char *refName = NULL; jboolean isCopy; @@ -54,7 +54,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1object if (NULL == (refBuf = (unsigned char *) HDcalloc((size_t) 1, H5R_REF_BUF_SIZE))) H5_JNI_FATAL_ERROR(ENVONLY, "H5Rcreate_object: failed to allocate reference buffer"); - if ((status = H5Rcreate_object((hid_t)loc_id, refName, (const H5R_ref_t *)refBuf)) < 0) + if ((status = H5Rcreate_object((hid_t)loc_id, refName, (hid_t)aid, (const H5R_ref_t *)refBuf)) < 0) H5_LIBRARY_ERROR(ENVONLY); if (NULL == (ref = ENVPTR->NewByteArray(ENVONLY, (jsize)H5R_REF_BUF_SIZE))) @@ -80,7 +80,7 @@ done: */ JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_H5_H5Rcreate_1region - (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong space_id) + (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong space_id, jlong aid) { const char *refName = NULL; jboolean isCopy; @@ -98,7 +98,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1region if (NULL == (refBuf = (unsigned char *) HDcalloc((size_t) 1, H5R_REF_BUF_SIZE))) H5_JNI_FATAL_ERROR(ENVONLY, "H5Rcreate_region: failed to allocate reference buffer"); - if ((status = H5Rcreate_region((hid_t)loc_id, refName, space_id, (const H5R_ref_t *)refBuf)) < 0) + if ((status = H5Rcreate_region((hid_t)loc_id, refName, space_id, (hid_t)aid, (const H5R_ref_t *)refBuf)) < 0) H5_LIBRARY_ERROR(ENVONLY); if (NULL == (ref = ENVPTR->NewByteArray(ENVONLY, (jsize)H5R_REF_BUF_SIZE))) @@ -123,7 +123,7 @@ done: */ JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_H5_H5Rcreate_1attr - (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jstring attr_name) + (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jstring attr_name, jlong aid) { const char *refName = NULL; const char *attrName = NULL; @@ -146,7 +146,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1attr if (NULL == (refBuf = (unsigned char *) HDcalloc((size_t) 1, H5R_REF_BUF_SIZE))) H5_JNI_FATAL_ERROR(ENVONLY, "H5Rcreate_attr: failed to allocate reference buffer"); - if ((status = H5Rcreate_attr((hid_t)loc_id, refName, attrName, (const H5R_ref_t *)refBuf)) < 0) + if ((status = H5Rcreate_attr((hid_t)loc_id, refName, attrName, (hid_t)aid, (const H5R_ref_t *)refBuf)) < 0) H5_LIBRARY_ERROR(ENVONLY); if (NULL == (ref = ENVPTR->NewByteArray(ENVONLY, (jsize)H5R_REF_BUF_SIZE))) diff --git a/java/src/jni/h5rImp.h b/java/src/jni/h5rImp.h index 7749f91..3bdb266 100644 --- a/java/src/jni/h5rImp.h +++ b/java/src/jni/h5rImp.h @@ -30,7 +30,7 @@ extern "C" { */ JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_H5_H5Rcreate_1object - (JNIEnv *, jclass, jlong, jstring); + (JNIEnv *, jclass, jlong, jstring, jlong); /* * Class: hdf_hdf5lib_H5 @@ -39,7 +39,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1object */ JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_H5_H5Rcreate_1region - (JNIEnv *, jclass, jlong, jstring, jlong); + (JNIEnv *, jclass, jlong, jstring, jlong, jlong); /* * Class: hdf_hdf5lib_H5 @@ -48,7 +48,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1region */ JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_H5_H5Rcreate_1attr - (JNIEnv *, jclass, jlong, jstring, jstring); + (JNIEnv *, jclass, jlong, jstring, jstring, jlong); /* * Class: hdf_hdf5lib_H5 |