diff options
author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2016-12-27 03:53:47 (GMT) |
---|---|---|
committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2016-12-27 03:53:47 (GMT) |
commit | b00962ac8694b14b74382f77d1cf849b93383fb5 (patch) | |
tree | 6833353ed1959b51e94a0228498bf3ce519670f9 /c++/src/H5Library.cpp | |
parent | 96c28287935c50693e19d473537b4f58692a30f8 (diff) | |
parent | e05da1b533d5eb9527a5b67ba2683379f8e1e7ac (diff) | |
download | hdf5-b00962ac8694b14b74382f77d1cf849b93383fb5.zip hdf5-b00962ac8694b14b74382f77d1cf849b93383fb5.tar.gz hdf5-b00962ac8694b14b74382f77d1cf849b93383fb5.tar.bz2 |
Merge pull request #209 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp:develop to develop
- Replacing openXxxType with individual type constructors
- Put back CommonFG
- Removed overloaded constructors that take an Attribute where there is one that takes an H5Location
* commit 'e05da1b533d5eb9527a5b67ba2683379f8e1e7ac':
Description: Removed commented out code and fixed miscellaneous typos. Platforms tested: Linux/32 2.6 (jam) (very minor)
Purpose: Improvement for HDFFV-10004 Description: When adding wrappers for H5Lexists, a new class, LinkAccPropList, was added to the C++ API, triggered complicated circular dependencies. Thus, some improvement was made to resolve the problems. - Replaced existing functions openXxxType with individual type constructors + Added individual XxxType constructors to replace the existing functions openXxxType because it's rather awkward to use these functions. + Moved openXxxType from H5Location back to CommonFG + Put back CommonFG as a baseclass of Group for openXxxType functions. + This replacement should improve usability and prevent the problem of circular dependencies. - Removed overloaded constructor that takes an Attribute when there is already one that takes H5Location because Attribute inherits from H5Location now. Platforms tested: Linux/32 2.6 (jam) Darwin (osx1010test) Linux/64 (platypus)
Diffstat (limited to 'c++/src/H5Library.cpp')
-rw-r--r-- | c++/src/H5Library.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/c++/src/H5Library.cpp b/c++/src/H5Library.cpp index 1726121..30be367 100644 --- a/c++/src/H5Library.cpp +++ b/c++/src/H5Library.cpp @@ -185,6 +185,11 @@ void H5Library::initH5cpp() if (ret_value != 0) throw LibraryIException("H5Library::initH5cpp", "Registrating PropList::deleteConstants failed"); + /* ret_value = std::atexit(LinkAccPropList::deleteConstants); + if (ret_value != 0) + throw LibraryIException("H5Library::initH5cpp", "Registrating LinkAccPropList::deleteConstants failed"); + */ + ret_value = std::atexit(FileAccPropList::deleteConstants); if (ret_value != 0) throw LibraryIException("H5Library::initH5cpp", "Registrating FileAccPropList::deleteConstants failed"); |