diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-03-12 20:56:50 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-03-12 20:56:50 (GMT) |
| commit | cf110b33c825f15e8a101b5772d15ec282ff85bf (patch) | |
| tree | 145458939dd3c5d9460bf49a2c00979830d2ec11 /c++/src/H5Object.cpp | |
| parent | 5c4bab04f59bdb1821635e580bae3ce357cbd580 (diff) | |
| parent | aaff21ff4cef6ffe364ae62e09e5da52a90b77c2 (diff) | |
| download | hdf5-cf110b33c825f15e8a101b5772d15ec282ff85bf.zip hdf5-cf110b33c825f15e8a101b5772d15ec282ff85bf.tar.gz hdf5-cf110b33c825f15e8a101b5772d15ec282ff85bf.tar.bz2 | |
Merge pull request #934 in HDFFV/hdf5 from hdf5_1_10_merge to hdf5_1_10
* commit 'aaff21ff4cef6ffe364ae62e09e5da52a90b77c2': (105 commits)
Unify the test (t_bigio.c) between hdf5_1_10 and develop
Remove comparison to NULL for variables to be freed.
Add HDfree of vector, matrix_out and matrix_out1 previously HDmalloced in coll_write_test().
merged from develop
merged from develop
removed duplicate code
Code improvement Description: - Removed memory leaks caused by accidentally invoking p_get_member_type - Added the call to test_lcpl, missed previously Platforms tested: Linux/64 (jelly) Linux/ppc64 (ostrich) Darwin (osx1010test)
Updated RELEASE.txt Description: - Wrappers for H5Lcreate_soft, H5Lcreate_hard, H5Lcopy, H5Lmove, H5Ldelete, and H5Lget_info - Class LinkCreatPropList - Fixed typo in source file Platforms tested: Linux/64 (jelly)
Updated for H5LcreatProp.[h,cpp]
Updated MANIFEST for H5LcreatProp.[h,cpp]
HDFFV-10149 continued Description: - Moved the new wrappers committed on Mar 9: 43158f3bb352f374c31556a5d0dc463a09e0b32e to H5Location and renamed some of them for overloading. This is because the loc_id in the C APIs can be file, group, dataset, named datatype, and attribute. Previous implementation was wrong following some inaccurate C API reference manual.
Re-factor coding for H5P/Sencode with libver bounds.
Removed commented out code from H5FDmpio.c, H5FDprivate.h and H5Fint.c
Upated cpp doc.
Added C++ wrappers - HDFFV-10149 Description: Added the following wrappers to class H5::Group: + H5Lcreate_soft: // Creates a soft link from link_name to target_name. void newLink(const char *target_name, const char *link_name,...) void newLink(const H5std_string& target_name,...)
Improve code Description: Added notes and changed argument to H5Fcreate to clarify the latest situation Platforms tested: Linux/64 (jelly)
Resolve compilation errors.
Add release note
Remove obsolete comments
Change CMake min to 3.10
...
Diffstat (limited to 'c++/src/H5Object.cpp')
| -rw-r--r-- | c++/src/H5Object.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp index 3eed168..27881c4 100644 --- a/c++/src/H5Object.cpp +++ b/c++/src/H5Object.cpp @@ -23,6 +23,7 @@ #include "H5OcreatProp.h" #include "H5DcreatProp.h" #include "H5DxferProp.h" +#include "H5LcreatProp.h" #include "H5LaccProp.h" #include "H5Location.h" #include "H5Object.h" @@ -224,9 +225,8 @@ Attribute H5Object::openAttribute(const unsigned int idx) const ///\par Description /// The signature of user_op is /// void (*)(H5::H5Location&, H5std_string, void*). -/// For information, please refer to the C layer Reference Manual -/// at: -/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5A.html#Annot-Iterate +/// For information, please refer to the H5Aiterate2 API in +/// the HDF5 C Reference Manual. // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- int H5Object::iterateAttrs(attr_operator_t user_op, unsigned *_idx, void *op_data) @@ -421,7 +421,6 @@ ssize_t H5Object::getObjName(char *obj_name, size_t buf_size) const ///\return Name of the object ///\exception H5::Exception // Programmer Binh-Minh Ribler - Mar, 2014 -// Modification //-------------------------------------------------------------------------- H5std_string H5Object::getObjName() const { |