diff options
| author | lrknox <lrknox> | 2017-03-22 17:01:22 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2017-03-22 17:01:22 (GMT) |
| commit | d37561605bda978ef8e5de03997dca4e493e213b (patch) | |
| tree | d64fe8f0c74ccc063323dfb3ae3fdb24fac55380 /c++/src/H5Object.cpp | |
| parent | 36a30ecfd288afdf8ea62a858644e622ce72fd58 (diff) | |
| parent | d605ce46b37a1ca33d1e474fda78009e9bdabb18 (diff) | |
| download | hdf5-d37561605bda978ef8e5de03997dca4e493e213b.zip hdf5-d37561605bda978ef8e5de03997dca4e493e213b.tar.gz hdf5-d37561605bda978ef8e5de03997dca4e493e213b.tar.bz2 | |
Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into hdf5_1_10
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. |