diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2021-05-05 02:01:23 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2021-05-05 02:01:23 (GMT) |
| commit | 8e27e7357506958128d087c4e93e3dcb4fb52ace (patch) | |
| tree | aacca527aede81daddad6707c2f9346fc933a773 /java/src | |
| parent | 16eda679e306fde7fec41f5ff1910be86645e745 (diff) | |
| download | hdf5-8e27e7357506958128d087c4e93e3dcb4fb52ace.zip hdf5-8e27e7357506958128d087c4e93e3dcb4fb52ace.tar.gz hdf5-8e27e7357506958128d087c4e93e3dcb4fb52ace.tar.bz2 | |
Brings atom-->ID and other ID-related changes from develop
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/jni/exceptionImp.c | 4 | ||||
| -rw-r--r-- | java/src/jni/h5Constants.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/java/src/jni/exceptionImp.c b/java/src/jni/exceptionImp.c index e62caee..6e08023 100644 --- a/java/src/jni/exceptionImp.c +++ b/java/src/jni/exceptionImp.c @@ -442,8 +442,8 @@ defineHDF5LibraryException(hid_t maj_num) return "hdf/hdf5lib/exceptions/HDF5LowLevelIOException"; else if (H5E_FUNC == err_num) return "hdf/hdf5lib/exceptions/HDF5FunctionEntryExitException"; - else if (H5E_ATOM == err_num) - return "hdf/hdf5lib/exceptions/HDF5AtomException"; + else if (H5E_ID == err_num) + return "hdf/hdf5lib/exceptions/HDF5IdException"; else if (H5E_CACHE == err_num) return "hdf/hdf5lib/exceptions/HDF5MetaDataCacheException"; else if (H5E_BTREE == err_num) diff --git a/java/src/jni/h5Constants.c b/java/src/jni/h5Constants.c index 7c6405d..4b9a276 100644 --- a/java/src/jni/h5Constants.c +++ b/java/src/jni/h5Constants.c @@ -330,9 +330,9 @@ Java_hdf_hdf5lib_HDF5Constants_H5E_1ARGS(JNIEnv *env, jclass cls) return H5E_ARGS; } JNIEXPORT jlong JNICALL -Java_hdf_hdf5lib_HDF5Constants_H5E_1ATOM(JNIEnv *env, jclass cls) +Java_hdf_hdf5lib_HDF5Constants_H5E_1ID(JNIEnv *env, jclass cls) { - return H5E_ATOM; + return H5E_ID; } JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_HDF5Constants_H5E_1ATTR(JNIEnv *env, jclass cls) @@ -340,9 +340,9 @@ Java_hdf_hdf5lib_HDF5Constants_H5E_1ATTR(JNIEnv *env, jclass cls) return H5E_ATTR; } JNIEXPORT jlong JNICALL -Java_hdf_hdf5lib_HDF5Constants_H5E_1BADATOM(JNIEnv *env, jclass cls) +Java_hdf_hdf5lib_HDF5Constants_H5E_1BADID(JNIEnv *env, jclass cls) { - return H5E_BADATOM; + return H5E_BADID; } JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_HDF5Constants_H5E_1BADFILE(JNIEnv *env, jclass cls) |