diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2017-03-28 03:29:44 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2017-03-28 03:29:44 (GMT) |
| commit | 37de3f30e4d626b348618fd8d6d4909879b4de2b (patch) | |
| tree | 2bd4a0d433ab2fb60a5a5a7eb01be60b5ab34166 /c++/src/H5Object.cpp | |
| parent | 8859a5a27013597ec737421ea533b967807a2d4b (diff) | |
| parent | be028580c8789301e4106d8d6e79a8fc8300e706 (diff) | |
| download | hdf5-37de3f30e4d626b348618fd8d6d4909879b4de2b.zip hdf5-37de3f30e4d626b348618fd8d6d4909879b4de2b.tar.gz hdf5-37de3f30e4d626b348618fd8d6d4909879b4de2b.tar.bz2 | |
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into merge_hyperslab_updates
Diffstat (limited to 'c++/src/H5Object.cpp')
| -rw-r--r-- | c++/src/H5Object.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp index b5d0f88..359fab2 100644 --- a/c++/src/H5Object.cpp +++ b/c++/src/H5Object.cpp @@ -51,7 +51,6 @@ extern "C" herr_t userAttrOpWrpr(hid_t loc_id, const char *attr_name, myData->op(*myData->location, s_attr_name, myData->opData); return 0; } -#endif //-------------------------------------------------------------------------- // Function: H5Object default constructor (protected) @@ -101,6 +100,7 @@ void f_Attribute_setId(Attribute* attr, hid_t new_id) { attr->p_setId(new_id); } +#endif //-------------------------------------------------------------------------- // Function: H5Object::createAttribute @@ -391,6 +391,8 @@ void H5Object::renameAttr(const H5std_string& oldname, const H5std_string& newna { renameAttr (oldname.c_str(), newname.c_str()); } + +#ifndef DOXYGEN_SHOULD_SKIP_THIS //-------------------------------------------------------------------------- // Function: getObjName ///\brief Given an id, returns the type of the object. @@ -502,7 +504,6 @@ ssize_t H5Object::getObjName(H5std_string& obj_name, size_t len) const return(name_size); } -#ifndef DOXYGEN_SHOULD_SKIP_THIS //-------------------------------------------------------------------------- // Function: H5Object destructor ///\brief Noop destructor. |