diff options
Diffstat (limited to 'c++/src')
-rw-r--r-- | c++/src/H5Attribute.cpp | 2 | ||||
-rw-r--r-- | c++/src/H5CommonFG.cpp | 2 | ||||
-rw-r--r-- | c++/src/H5Cpp.h | 4 | ||||
-rw-r--r-- | c++/src/H5DataSet.cpp | 2 | ||||
-rw-r--r-- | c++/src/H5DataType.cpp | 10 | ||||
-rw-r--r-- | c++/src/H5DcreatProp.cpp | 10 | ||||
-rw-r--r-- | c++/src/H5Group.cpp | 2 | ||||
-rw-r--r-- | c++/src/H5IdComponent.cpp | 4 | ||||
-rw-r--r-- | c++/src/H5Object.cpp | 4 |
9 files changed, 20 insertions, 20 deletions
diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp index 404aec9..fd08744 100644 --- a/c++/src/H5Attribute.cpp +++ b/c++/src/H5Attribute.cpp @@ -348,7 +348,7 @@ Attribute::Attribute(H5File& h5file, void* ref) : AbstractDs(), IdComponent() // Purpose: Get the id of this attribute // Description: // Class hierarchy is revised to address bugzilla 1068. Class -// AbstractDS and Attribute are moved out of H5Object. In +// AbstractDS and Attribute are moved out of H5Object. In // addition, member IdComponent::id is moved into subclasses, and // IdComponent::getId now becomes pure virtual function. // Programmer Binh-Minh Ribler - May, 2008 diff --git a/c++/src/H5CommonFG.cpp b/c++/src/H5CommonFG.cpp index 71658df..80efc5d 100644 --- a/c++/src/H5CommonFG.cpp +++ b/c++/src/H5CommonFG.cpp @@ -244,7 +244,7 @@ DataSet CommonFG::openDataSet( const H5std_string& name ) const ///\par Description /// Note that both names are interpreted relative to the /// specified location. -/// For information on creating hard link and soft link, please +/// For information on creating hard link and soft link, please /// refer to the C layer Reference Manual at: /// http://hdfgroup.org/HDF5/doc/RM/RM_H5L.html#Link-CreateHard and /// http://hdfgroup.org/HDF5/doc/RM/RM_H5L.html#Link-CreateSoft diff --git a/c++/src/H5Cpp.h b/c++/src/H5Cpp.h index 3814369..75d82ba 100644 --- a/c++/src/H5Cpp.h +++ b/c++/src/H5Cpp.h @@ -44,9 +44,9 @@ #include "H5Group.h" #include "H5File.h" #include "H5Library.h" - + /* Some C++ compilers do not have offsetof macro; define to bypass the problem - - BMR- -EIP- 2007/08/01 + - BMR- -EIP- 2007/08/01 */ #ifndef H5_CXX_HAVE_OFFSETOF #ifdef HOFFSET diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp index 3051e08..6d7502a 100644 --- a/c++/src/H5DataSet.cpp +++ b/c++/src/H5DataSet.cpp @@ -83,7 +83,7 @@ DataSet::DataSet(const DataSet& original) : AbstractDs(original), H5Object(origi ///\param ref - IN: Reference pointer ///\exception H5::DataSetIException ///\parDescription -/// \c obj can be DataSet, Group, H5File, or named DataType, that +/// \c obj can be DataSet, Group, H5File, or named DataType, that /// is a datatype that has been named by DataType::commit. // Programmer Binh-Minh Ribler - Oct, 2006 //-------------------------------------------------------------------------- diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp index e023bda..2b03ffc 100644 --- a/c++/src/H5DataType.cpp +++ b/c++/src/H5DataType.cpp @@ -91,7 +91,7 @@ DataType::DataType( const H5T_class_t type_class, size_t size ) : H5Object() ///\param obj - IN: Location reference object is in ///\param ref - IN: Reference pointer ///\parDescription -/// \c obj can be DataSet, Group, H5File, or named DataType, that +/// \c obj can be DataSet, Group, H5File, or named DataType, that /// is a datatype that has been named by DataType::commit. // Programmer Binh-Minh Ribler - Oct, 2006 //-------------------------------------------------------------------------- @@ -99,7 +99,7 @@ DataType::DataType( const H5T_class_t type_class, size_t size ) : H5Object() { H5Object::dereference(obj, ref); } - */ + */ DataType::DataType(H5Object& obj, void* ref) : H5Object() { id = obj.p_dereference(ref); @@ -122,7 +122,7 @@ DataType::DataType() : H5Object(), id(0) {} ///\brief Copy constructor: makes a copy of the original DataType object. // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -DataType::DataType(const DataType& original) : H5Object(original) +DataType::DataType(const DataType& original) : H5Object(original) { id = original.getId(); incRefCount(); // increment number of references to this id @@ -159,7 +159,7 @@ void DataType::copy( const DataType& like_type ) //-------------------------------------------------------------------------- // Function: DataType::copy ///\brief Copies the datatype of the given dataset to this datatype object -///\param dset - IN: Dataset +///\param dset - IN: Dataset ///\exception H5::DataTypeIException // Programmer Binh-Minh Ribler - Jan, 2007 ///\parDescription @@ -227,7 +227,7 @@ bool DataType::operator==(const DataType& compared_type ) const // Function: DataType::p_commit (private) //\brief Commits a transient datatype to a file, creating a new // named datatype -//\param loc_id - IN: The id of either a file, group, dataset, named +//\param loc_id - IN: The id of either a file, group, dataset, named // datatype, or attribute. //\param name - IN: Name of the datatype //\exception H5::DataTypeIException diff --git a/c++/src/H5DcreatProp.cpp b/c++/src/H5DcreatProp.cpp index 19a4e6e..981085d 100644 --- a/c++/src/H5DcreatProp.cpp +++ b/c++/src/H5DcreatProp.cpp @@ -172,16 +172,16 @@ void DSetCreatPropList::setDeflate( int level ) const //-------------------------------------------------------------------------- // Function: DSetCreatPropList::setSzip ///\brief Sets up for the use of the SZIP compression filter. -///\param options_mask - IN: A bit-mask conveying the desired SZIP -/// options. Valid values are H5_SZIP_EC_OPTION_MASK +///\param options_mask - IN: A bit-mask conveying the desired SZIP +/// options. Valid values are H5_SZIP_EC_OPTION_MASK /// and H5_SZIP_NN_OPTION_MASK. -///\param pixels_per_block - IN: Number of pixels or data elements in +///\param pixels_per_block - IN: Number of pixels or data elements in /// each data block. ///\exception H5::PropListIException ///\par Description -/// The associate C function sets an SZIP compression filter, +/// The associate C function sets an SZIP compression filter, /// H5Z_FILTER_SZIP, for a dataset. For more information about -/// SZIP and usage, please refer to the C layer Reference +/// SZIP and usage, please refer to the C layer Reference /// Manual at: /// http://hdfgroup.org/HDF5/doc/RM_H5P.html#Property-SetSzip // Programmer Binh-Minh Ribler - Jan, 2007 diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp index f50691e..6ae7cf7 100644 --- a/c++/src/H5Group.cpp +++ b/c++/src/H5Group.cpp @@ -92,7 +92,7 @@ Group::Group(const hid_t existing_id) : H5Object() /// obj - IN: Location reference object is in ///\param ref - IN: Reference pointer ///\parDescription -/// \c obj can be DataSet, Group, H5File, or named DataType, that +/// \c obj can be DataSet, Group, H5File, or named DataType, that /// is a datatype that has been named by DataType::commit. // Programmer Binh-Minh Ribler - Oct, 2006 //-------------------------------------------------------------------------- diff --git a/c++/src/H5IdComponent.cpp b/c++/src/H5IdComponent.cpp index a068b20..747a479 100644 --- a/c++/src/H5IdComponent.cpp +++ b/c++/src/H5IdComponent.cpp @@ -199,9 +199,9 @@ IdComponent& IdComponent::operator=( const IdComponent& rhs ) // Changed all subclasses' setId to p_setId and put back setId // here. p_setId is used in the library where the id provided // by a C API passed on to user's application in the form of a -// C++ API object, which will be destroyed properly, and so +// C++ API object, which will be destroyed properly, and so // p_setId does not call incRefCount. On the other hand, the -// public version setId is used by other applications, in which +// public version setId is used by other applications, in which // the id passed to setId already has a reference count, so setId // must call incRefCount. //-------------------------------------------------------------------------- diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp index 9dafea8..dbfe6f2 100644 --- a/c++/src/H5Object.cpp +++ b/c++/src/H5Object.cpp @@ -176,7 +176,7 @@ Attribute H5Object::openAttribute( const H5std_string& name ) const //-------------------------------------------------------------------------- Attribute H5Object::openAttribute( const unsigned int idx ) const { - hid_t attr_id = H5Aopen_by_idx(getId(), ".", H5_INDEX_CRT_ORDER, + hid_t attr_id = H5Aopen_by_idx(getId(), ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)idx, H5P_DEFAULT, H5P_DEFAULT); if( attr_id > 0 ) { @@ -215,7 +215,7 @@ int H5Object::iterateAttrs( attr_operator_t user_op, unsigned *_idx, void *op_da // call the C library routine H5Aiterate2 to iterate the attributes hsize_t idx = (hsize_t)*_idx; - int ret_value = H5Aiterate2(getId(), H5_INDEX_NAME, H5_ITER_INC, &idx, + int ret_value = H5Aiterate2(getId(), H5_INDEX_NAME, H5_ITER_INC, &idx, userAttrOpWrpr, (void *) userData); // release memory |