diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2015-04-03 19:10:39 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2015-04-03 19:10:39 (GMT) |
| commit | aa13c0501d781ccbe83b19bc795e0c0241559789 (patch) | |
| tree | df91243000cdc309c6a81580d60130c131cfa395 /c++/src/H5File.cpp | |
| parent | 5f68d05f9f8d41890c32d999a75e5d917a77e2a3 (diff) | |
| download | hdf5-aa13c0501d781ccbe83b19bc795e0c0241559789.zip hdf5-aa13c0501d781ccbe83b19bc795e0c0241559789.tar.gz hdf5-aa13c0501d781ccbe83b19bc795e0c0241559789.tar.bz2 | |
[svn-r26723] Purpose: Fixed warnings
Description:
Fixed base classes that were in wrong order on the prototype lines and
some misc. warnings.
Parameter had the same name as the class' member's. Replaced parameter
with a different name.
Missing initializing one of the base classes in multiple inheritance.
Added CommonFG() to constructors' prototype.
Merged from trunk r26454, r26455, and r26456.
Platforms tested:
Linux/64 (platypus)
Linux/32 2.6 (jam)
SunOS 5.11 (emu)
Diffstat (limited to 'c++/src/H5File.cpp')
| -rw-r--r-- | c++/src/H5File.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp index 0620070..79d5999 100644 --- a/c++/src/H5File.cpp +++ b/c++/src/H5File.cpp @@ -50,7 +50,7 @@ namespace H5 { ///\brief Default constructor: creates a stub H5File object. // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -H5File::H5File() : H5Location(), id(H5I_INVALID_HID) {} +H5File::H5File() : H5Location(), CommonFG(), id(H5I_INVALID_HID) {} //-------------------------------------------------------------------------- // Function: H5File overloaded constructor @@ -86,7 +86,7 @@ H5File::H5File() : H5Location(), id(H5I_INVALID_HID) {} // to catch then re-throw it. -BMR 2013/03/21 // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -H5File::H5File( const char* name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist ) : H5Location(), id(H5I_INVALID_HID) +H5File::H5File( const char* name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist ) : H5Location(), CommonFG(), id(H5I_INVALID_HID) { try { p_get_file(name, flags, create_plist, access_plist); @@ -111,7 +111,7 @@ H5File::H5File( const char* name, unsigned int flags, const FileCreatPropList& c // to catch then re-throw it. -BMR 2013/03/21 // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -H5File::H5File( const H5std_string& name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist ) : H5Location(), id(H5I_INVALID_HID) +H5File::H5File( const H5std_string& name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist ) : H5Location(), CommonFG(), id(H5I_INVALID_HID) { try { p_get_file(name.c_str(), flags, create_plist, access_plist); @@ -164,7 +164,7 @@ void H5File::p_get_file(const char* name, unsigned int flags, const FileCreatPro ///\param original - IN: H5File instance to copy // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -H5File::H5File(const H5File& original) : H5Location(original) +H5File::H5File(const H5File& original) : H5Location(), CommonFG() { id = original.getId(); incRefCount(); // increment number of references to this id |