summaryrefslogtreecommitdiffstats
path: root/c++/src/H5File.cpp
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2016-09-21 19:53:17 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2016-09-21 19:53:17 (GMT)
commit7ef33fa7b306338399ac2160a66f421a5a0feccf (patch)
tree80ce355811ff1de87625506a92f9b52bf1f162c0 /c++/src/H5File.cpp
parent052efd9bde06ea2427beffd3ea493cbc53a17608 (diff)
downloadhdf5-7ef33fa7b306338399ac2160a66f421a5a0feccf.zip
hdf5-7ef33fa7b306338399ac2160a66f421a5a0feccf.tar.gz
hdf5-7ef33fa7b306338399ac2160a66f421a5a0feccf.tar.bz2
Purpose: Fix bug HDFFR-9920 cont.
Description: Adding user's test revealed a flaw in the fix. Moved CommonFG's functions in Group to H5Location, so that they could be called by objects that can be used to specify a location Also, rearranged many "#include" header files to resolve conflicts. Platforms tested: Linux/32 2.6 (jam) Linux/64 (platypus) Darwin (osx1010test)
Diffstat (limited to 'c++/src/H5File.cpp')
-rw-r--r--c++/src/H5File.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp
index a81efd8..246da9f 100644
--- a/c++/src/H5File.cpp
+++ b/c++/src/H5File.cpp
@@ -24,13 +24,13 @@
#include "H5Exception.h"
#include "H5IdComponent.h"
#include "H5PropList.h"
-#include "H5Location.h"
-#include "H5Object.h"
#include "H5FaccProp.h"
#include "H5FcreatProp.h"
#include "H5OcreatProp.h"
#include "H5DxferProp.h"
#include "H5DcreatProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
#include "H5Group.h"
#include "H5AbstractDs.h"
#include "H5DataSpace.h"
@@ -563,6 +563,9 @@ void H5File::reopen()
// This function is a redefinition of CommonFG::getLocId. It
// is used by CommonFG member functions to get the file id.
// Programmer Binh-Minh Ribler - 2000
+// Deprecated:
+// After HDFFV-9920, the Group's methods can use getId() and getLocId()
+// is kept for backward compatibility. Aug 18, 2016 -BMR
//--------------------------------------------------------------------------
hid_t H5File::getLocId() const
{
@@ -623,11 +626,10 @@ void H5File::close()
///\param msg - Message describing the failure
///\exception H5::FileIException
// Description
-// This function is used in CommonFG implementation so that
+// This function is also used in H5Location implementation so that
// proper exception can be thrown for file or group. The
-// argument func_name is a member of CommonFG and "H5File::"
-// will be inserted to indicate the function called is an
-// implementation of H5File.
+// "H5File::" will be inserted to indicate the function called is
+// an implementation of H5File.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void H5File::throwException(const H5std_string& func_name, const H5std_string& msg) const