diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2013-09-20 18:53:21 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2013-09-20 18:53:21 (GMT) |
| commit | 1b22cc435e999e7f1415f17b4408e2fa16bc73a5 (patch) | |
| tree | 3a662c963963f5614c9db049d4425177ce203fae /c++/src/H5DataType.cpp | |
| parent | d56742478306b9e536b5ed3e87fd0048525ec98b (diff) | |
| download | hdf5-1b22cc435e999e7f1415f17b4408e2fa16bc73a5.zip hdf5-1b22cc435e999e7f1415f17b4408e2fa16bc73a5.tar.gz hdf5-1b22cc435e999e7f1415f17b4408e2fa16bc73a5.tar.bz2 | |
[svn-r24178] Back out the changes that cause daily test to fail r24163
Diffstat (limited to 'c++/src/H5DataType.cpp')
| -rw-r--r-- | c++/src/H5DataType.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp index 9e9433f..8a62471 100644 --- a/c++/src/H5DataType.cpp +++ b/c++/src/H5DataType.cpp @@ -100,7 +100,7 @@ DataType::DataType( const H5T_class_t type_class, size_t size ) : H5Object() // Jul, 2008 // Added for application convenience. //-------------------------------------------------------------------------- - /* DataType::DataType(H5Object& obj, const void* ref, H5R_type_t ref_type) : H5Object() +DataType::DataType(H5Object& obj, const void* ref, H5R_type_t ref_type) : H5Object() { try { id = p_dereference(obj.getId(), ref, ref_type); @@ -109,7 +109,6 @@ DataType::DataType( const H5T_class_t type_class, size_t size ) : H5Object() deref_error.getDetailMsg()); } } - */ //-------------------------------------------------------------------------- // Function: DataType overload constructor - dereference @@ -124,16 +123,14 @@ DataType::DataType( const H5T_class_t type_class, size_t size ) : H5Object() // Jul, 2008 // Added for application convenience. //-------------------------------------------------------------------------- -DataType::DataType(const H5Location& loc, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object() +DataType::DataType(H5File& h5file, const void* ref, H5R_type_t ref_type) : H5Object() { - H5Location::dereference(loc, ref, ref_type, plist); - /* try { + try { id = p_dereference(h5file.getId(), ref, ref_type); } catch (ReferenceException deref_error) { throw ReferenceException("DataType constructor - located by an H5File", deref_error.getDetailMsg()); } - */ } //-------------------------------------------------------------------------- @@ -149,10 +146,10 @@ DataType::DataType(const H5Location& loc, const void* ref, H5R_type_t ref_type, // Jul, 2008 // Added for application convenience. //-------------------------------------------------------------------------- -DataType::DataType(const Attribute& attr, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object() +DataType::DataType(Attribute& attr, const void* ref, H5R_type_t ref_type) : H5Object() { try { - id = p_dereference(attr.getId(), ref, ref_type, plist); + id = p_dereference(attr.getId(), ref, ref_type); } catch (ReferenceException deref_error) { throw ReferenceException("DataType constructor - located by an Attribute", deref_error.getDetailMsg()); |