diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2018-09-24 20:55:19 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2018-09-24 20:55:19 (GMT) |
commit | 96d5da7f1ad681573d42d2a4fd9e422fe049442d (patch) | |
tree | 6e2c3edf6325390b6cede7ee07daa7ff87b52950 /src/H5Pacpl.c | |
parent | 9045cf049f74e017e20ed366d9a811a7902cf8ff (diff) | |
parent | e96bd2d46e208e0eb6c62cfcc4f86141f933884e (diff) | |
download | hdf5-96d5da7f1ad681573d42d2a4fd9e422fe049442d.zip hdf5-96d5da7f1ad681573d42d2a4fd9e422fe049442d.tar.gz hdf5-96d5da7f1ad681573d42d2a4fd9e422fe049442d.tar.bz2 |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'e96bd2d46e208e0eb6c62cfcc4f86141f933884e':
CMake changes for SKIPPED and flush tests
H5S adjust callbacks now return an herr_t instead of void.
Normalization with vol_integration (property lists, file drivers, other misc).
Diffstat (limited to 'src/H5Pacpl.c')
-rw-r--r-- | src/H5Pacpl.c | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/src/H5Pacpl.c b/src/H5Pacpl.c index 4368dd6..530ede3 100644 --- a/src/H5Pacpl.c +++ b/src/H5Pacpl.c @@ -13,11 +13,9 @@ /*------------------------------------------------------------------------- * - * Created: H5Pacpl.c - * January 2 2006 - * James Laird <jlaird@ncsa.uiuc.edu> + * Created: H5Pacpl.c * - * Purpose: Attribute creation property list class routines + * Purpose: Attribute creation property list class routines * *------------------------------------------------------------------------- */ @@ -32,9 +30,9 @@ /***********/ /* Headers */ /***********/ -#include "H5private.h" /* Generic Functions */ -#include "H5Eprivate.h" /* Error handling */ -#include "H5Ppkg.h" /* Property lists */ +#include "H5private.h" /* Generic Functions */ +#include "H5Eprivate.h" /* Error handling */ +#include "H5Ppkg.h" /* Property lists */ /****************/ @@ -63,21 +61,21 @@ /* Attribute creation property list class library initialization object */ const H5P_libclass_t H5P_CLS_ACRT[1] = {{ - "attribute create", /* Class name for debugging */ - H5P_TYPE_ATTRIBUTE_CREATE, /* Class type */ - - &H5P_CLS_STRING_CREATE_g, /* Parent class */ - &H5P_CLS_ATTRIBUTE_CREATE_g, /* Pointer to class */ - &H5P_CLS_ATTRIBUTE_CREATE_ID_g, /* Pointer to class ID */ - &H5P_LST_ATTRIBUTE_CREATE_ID_g, /* Pointer to default property list ID */ - NULL, /* Default property registration routine */ - - NULL, /* Class creation callback */ - NULL, /* Class creation callback info */ - NULL, /* Class copy callback */ - NULL, /* Class copy callback info */ - NULL, /* Class close callback */ - NULL /* Class close callback info */ + "attribute create", /* Class name for debugging */ + H5P_TYPE_ATTRIBUTE_CREATE, /* Class type */ + + &H5P_CLS_STRING_CREATE_g, /* Parent class */ + &H5P_CLS_ATTRIBUTE_CREATE_g, /* Pointer to class */ + &H5P_CLS_ATTRIBUTE_CREATE_ID_g, /* Pointer to class ID */ + &H5P_LST_ATTRIBUTE_CREATE_ID_g, /* Pointer to default property list ID */ + NULL, /* Default property registration routine */ + + NULL, /* Class creation callback */ + NULL, /* Class creation callback info */ + NULL, /* Class copy callback */ + NULL, /* Class copy callback info */ + NULL, /* Class close callback */ + NULL /* Class close callback info */ }}; |