summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMohamad Chaarawi <chaarawi@hdfgroup.org>2013-01-24 22:50:56 (GMT)
committerMohamad Chaarawi <chaarawi@hdfgroup.org>2013-01-24 22:50:56 (GMT)
commitebb80dbae183e75ccf90f899f3ee1491946f93ec (patch)
treefe1bbd132d0141128da27d9a4240f42bb33fce63 /src
parentc7f53746db178306cf650637d344acc40dc9f472 (diff)
parent82ac7b92e3b01319dc88db8115614bca4107164e (diff)
downloadhdf5-ebb80dbae183e75ccf90f899f3ee1491946f93ec.zip
hdf5-ebb80dbae183e75ccf90f899f3ee1491946f93ec.tar.gz
hdf5-ebb80dbae183e75ccf90f899f3ee1491946f93ec.tar.bz2
[svn-r23200] Merging r23179 through r23199 from trunk
Diffstat (limited to 'src')
-rw-r--r--src/H5Dio.c6
-rw-r--r--src/H5public.h4
-rw-r--r--src/Makefile.in2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Dio.c b/src/H5Dio.c
index e61205e..e08e079 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -252,9 +252,9 @@ H5D__pre_write(H5D_t *dset, hid_t mem_type_id, const H5S_t *mem_space,
if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
- /* Get the plist structure */
- if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
- HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
+ /* Get the dataset transfer property list */
+ if(NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
if(H5P_get(plist, H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_NAME, &direct_write) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "error getting flag for direct chunk write")
diff --git a/src/H5public.h b/src/H5public.h
index 793d4df..bd9d859 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -75,10 +75,10 @@ extern "C" {
/* Version numbers */
#define H5_VERS_MAJOR 1 /* For major interface/format changes */
#define H5_VERS_MINOR 9 /* For minor interface/format changes */
-#define H5_VERS_RELEASE 141 /* For tweaks, bug-fixes, or development */
+#define H5_VERS_RELEASE 142 /* For tweaks, bug-fixes, or development */
#define H5_VERS_SUBRELEASE "" /* For pre-releases like snap0 */
/* Empty string for real releases. */
-#define H5_VERS_INFO "HDF5 library version: 1.9.141" /* Full version string */
+#define H5_VERS_INFO "HDF5 library version: 1.9.142" /* Full version string */
#define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \
H5_VERS_RELEASE)
diff --git a/src/Makefile.in b/src/Makefile.in
index c9b6e3b..9dff326 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -514,7 +514,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
# Add libtool shared library version numbers to the HDF5 library
# See libtool versioning documentation online.
LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 131
+LT_VERS_REVISION = 132
LT_VERS_AGE = 0
H5detect_CFLAGS = -g $(AM_CFLAGS)