summaryrefslogtreecommitdiffstats
path: root/c++/src/H5PropList.cpp
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2014-09-30 18:20:36 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2014-09-30 18:20:36 (GMT)
commit10f1e6acf8916a429f2cc925f49518cfc0015b6c (patch)
treef6078e3ae7987d9eb9737cfc1e8f3dc0e7f005b9 /c++/src/H5PropList.cpp
parent0befe65753b60e85891453dcbca373763a070419 (diff)
downloadhdf5-10f1e6acf8916a429f2cc925f49518cfc0015b6c.zip
hdf5-10f1e6acf8916a429f2cc925f49518cfc0015b6c.tar.gz
hdf5-10f1e6acf8916a429f2cc925f49518cfc0015b6c.tar.bz2
[svn-r25640] Purpose: Fixed HDFFV-4259
Description: - Used H5I_INVALID_HID instead of 0 to initialized member "id" in classes that represent HDF5 objects. For PropList, H5P_DEFAULT has to be used instead of H5I_INVALID_HID. - Added try/catch block to some dynamically allocating memory code and re-throw the bad_alloc exception with a message informing the location of the failure. Platforms tested: Linux/ppc64 (ostrich) Linux/32 2.6 (jam) SunOS 5.11 (emu)
Diffstat (limited to 'c++/src/H5PropList.cpp')
-rw-r--r--c++/src/H5PropList.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/c++/src/H5PropList.cpp b/c++/src/H5PropList.cpp
index 0b740d8..56743f7 100644
--- a/c++/src/H5PropList.cpp
+++ b/c++/src/H5PropList.cpp
@@ -46,7 +46,7 @@ const PropList PropList::DEFAULT;
///\brief Default constructor: creates a stub property list object.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
-PropList::PropList() : IdComponent(), id(0) {}
+PropList::PropList() : IdComponent(), id(H5P_DEFAULT) {}
//--------------------------------------------------------------------------
// Function: PropList copy constructor
@@ -74,7 +74,7 @@ PropList::PropList(const PropList& original) : IdComponent(original)
//--------------------------------------------------------------------------
PropList::PropList( const hid_t plist_id ) : IdComponent()
{
- if (plist_id == 0)
+ if (plist_id <= 0)
id = H5P_DEFAULT;
H5I_type_t id_type = H5Iget_type(plist_id);
@@ -277,7 +277,7 @@ void PropList::close()
throw PropListIException(inMemFunc("close"), "H5Pclose failed");
}
// reset the id
- id = 0;
+ id = H5I_INVALID_HID;
}
}