diff options
author | hdftest <hdftest@hdfgroup.org> | 2018-06-16 22:47:39 (GMT) |
---|---|---|
committer | hdftest <hdftest@hdfgroup.org> | 2018-06-16 22:47:39 (GMT) |
commit | 67d6f8d405b16c99590f112f429a352157be3554 (patch) | |
tree | 63b704912ac2dd93fcbd8214050ec8b59c63707f /java/src/jni/h5pImp.c | |
parent | afe28b7607204a2e9e753bb663d09454057d8196 (diff) | |
parent | 87829e06189cd9b29583b5ca8065b52b1f4cd523 (diff) | |
download | hdf5-67d6f8d405b16c99590f112f429a352157be3554.zip hdf5-67d6f8d405b16c99590f112f429a352157be3554.tar.gz hdf5-67d6f8d405b16c99590f112f429a352157be3554.tar.bz2 |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '87829e06189cd9b29583b5ca8065b52b1f4cd523': (30 commits)
HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
Cleaned up H5Fmount/unmount code.
Normalization with vol_integration branch.
Add fortran MPI to test and example
Add mpi include folders for fortran C objects
Normalization with the vol_integration branch.
Fixed MANIFEST
Fix usage of compression lib in shared tests
Fix jni function call version
Fix the error found after earlier checkin.
H5O_info fixes for java and examples
Added a RELASE.txt entry for HDFFV-10505.
Changed 'deprecated' to indicate 'no longer supported' in the --enable-debug/production configure flags.
(1) Made the change according to the pull request feedback. (2) Removed the performance test form test/th5o.c: will decide on what needs to be done to show speedup via HDFFV-10463.
Normalize with vol_integration.
Removed unused H5MF functions and updated FUNC_ENTER macros and naming in H5MFsection.c.
Restored some unused #defines to the deprecated section of H5Dpublic.h.
Changes made based on feedback from pull request #1039.
...
Diffstat (limited to 'java/src/jni/h5pImp.c')
-rw-r--r-- | java/src/jni/h5pImp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/jni/h5pImp.c b/java/src/jni/h5pImp.c index 49cfeb9..3ff7436 100644 --- a/java/src/jni/h5pImp.c +++ b/java/src/jni/h5pImp.c @@ -5204,10 +5204,10 @@ Java_hdf_hdf5lib_H5_H5Pset_1append_1flush visit_callback = callback_op; if (op_data == NULL) { - h5nullArgument(env, "H5Ovisit: op_data is NULL"); + h5nullArgument(env, "H5Pset_append_flush: op_data is NULL"); } /* end if */ else if (callback_op == NULL) { - h5nullArgument(env, "H5Ovisit: callback_op is NULL"); + h5nullArgument(env, "H5Pset_append_flush: callback_op is NULL"); } /* end if */ else { status = H5Pset_append_flush((hid_t)plist_id, (unsigned)ndims, (const hsize_t*)boundary, (H5D_append_cb_t)H5D_append_cb, (void*)op_data); |