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/H5DataSet.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/H5DataSet.cpp')
| -rw-r--r-- | c++/src/H5DataSet.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp index 83621f5..b0f49bf 100644 --- a/c++/src/H5DataSet.cpp +++ b/c++/src/H5DataSet.cpp @@ -52,7 +52,7 @@ namespace H5 { ///\brief Default constructor: creates a stub DataSet. // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -DataSet::DataSet() : AbstractDs(), H5Object(), id(H5I_INVALID_HID) {} +DataSet::DataSet() : H5Object(), AbstractDs(), id(H5I_INVALID_HID) {} //-------------------------------------------------------------------------- // Function: DataSet overloaded constructor @@ -60,7 +60,7 @@ DataSet::DataSet() : AbstractDs(), H5Object(), id(H5I_INVALID_HID) {} ///\param existing_id - IN: Id of an existing dataset // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -DataSet::DataSet(const hid_t existing_id) : AbstractDs(), H5Object() +DataSet::DataSet(const hid_t existing_id) : H5Object(), AbstractDs() { id = existing_id; } @@ -71,7 +71,7 @@ DataSet::DataSet(const hid_t existing_id) : AbstractDs(), H5Object() ///\param original - IN: DataSet instance to copy // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -DataSet::DataSet(const DataSet& original) : AbstractDs(original), H5Object(original) +DataSet::DataSet(const DataSet& original) : H5Object(), AbstractDs() { id = original.getId(); incRefCount(); // increment number of references to this id |