philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Purpose: Fix bug HDFFR-9920 cont.

Browse Source 
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)
This commit is contained in:
Binh-Minh Ribler
2016-09-21 14:53:17 -05:00
parent 052efd9bde
commit 7ef33fa7b3
31 changed files with 2071 additions and 1470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
c++/src/H5File.cpp
View File

@@ -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