diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2020-11-30 12:50:39 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 12:50:39 (GMT) |
| commit | c256612e0950f3389249aa3a151d66ce01704d89 (patch) | |
| tree | 2b87801fba6d5d7beef06588a6631b764594183b /java/src/jni | |
| parent | a6e3d226043eb81aac3c315c6fd9262a036f9f1d (diff) | |
| download | hdf5-c256612e0950f3389249aa3a151d66ce01704d89.zip hdf5-c256612e0950f3389249aa3a151d66ce01704d89.tar.gz hdf5-c256612e0950f3389249aa3a151d66ce01704d89.tar.bz2 | |
Replace H5E_ATOM major error category with H5E_ID (#121)
* Renames H5I_ATOM to H5I_ID, among other related changes
* Java has been updated.
* Fortran is failing on my VM, even though I don't touch that.
* Adds a RELEASE.txt note for H5E_ATOM to H5E_ID changes
* Fixes typos in comments
Diffstat (limited to 'java/src/jni')
| -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 c5e7d85..6bb956e 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 94d5b19..ceb75fb 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) |