From 6ab73579f801a95a33359bf6f81d62fea99333d4 Mon Sep 17 00:00:00 2001 From: Dana Robinson <43805+derobins@users.noreply.github.com> Date: Thu, 27 Jul 2023 11:21:30 -0700 Subject: Normalize C++ w/ develop (#3279) --- c++/examples/h5tutr_extend.cpp | 14 +++---- c++/examples/readdata.cpp | 4 +- c++/examples/testh5c++.sh.in | 4 -- c++/src/H5AbstractDs.cpp | 12 ------ c++/src/H5ArrayType.cpp | 11 ----- c++/src/H5AtomType.cpp | 14 ------- c++/src/H5Attribute.cpp | 22 ---------- c++/src/H5CommonFG.cpp | 20 ---------- c++/src/H5CompType.cpp | 25 ------------ c++/src/H5DaccProp.cpp | 6 --- c++/src/H5DataSet.cpp | 2 +- c++/src/H5DataSpace.cpp | 33 --------------- c++/src/H5DataType.cpp | 45 --------------------- c++/src/H5DcreatProp.cpp | 33 --------------- c++/src/H5DxferProp.cpp | 28 ------------- c++/src/H5EnumType.cpp | 19 --------- c++/src/H5Exception.cpp | 29 -------------- c++/src/H5FaccProp.cpp | 39 ------------------ c++/src/H5FcreatProp.cpp | 19 --------- c++/src/H5File.cpp | 2 - c++/src/H5FloatType.cpp | 17 -------- c++/src/H5Group.cpp | 14 ------- c++/src/H5IdComponent.cpp | 18 --------- c++/src/H5IntType.cpp | 11 ----- c++/src/H5LaccProp.cpp | 8 ---- c++/src/H5Library.cpp | 11 ----- c++/src/H5Location.cpp | 63 ----------------------------- c++/src/H5Object.cpp | 21 ---------- c++/src/H5OcreatProp.cpp | 10 ----- c++/src/H5PredType.cpp | 8 ---- c++/src/H5PropList.cpp | 41 ------------------- c++/src/H5StrType.cpp | 15 ------- c++/src/H5VarLenType.cpp | 8 ---- c++/test/dsets.cpp | 91 +++++++++++++++++++++++++++++++++++++----- c++/test/h5cpputil.cpp | 21 ---------- c++/test/h5cpputil.h | 8 ++-- c++/test/tarray.cpp | 14 +------ c++/test/tattr.cpp | 16 ++++---- c++/test/tcompound.cpp | 85 ++++++++++++++------------------------- c++/test/tdspl.cpp | 18 ++++----- c++/test/tfile.cpp | 38 ++---------------- c++/test/tfilter.cpp | 11 ----- c++/test/th5s.cpp | 39 +++--------------- c++/test/titerate.cpp | 13 +----- c++/test/tlinks.cpp | 24 +++++------ c++/test/tobject.cpp | 27 +++---------- c++/test/trefer.cpp | 52 ++++++++++++------------ c++/test/ttypes.cpp | 70 +++++++++++++------------------- c++/test/tvlstr.cpp | 86 +++++++++++---------------------------- 49 files changed, 249 insertions(+), 990 deletions(-) diff --git a/c++/examples/h5tutr_extend.cpp b/c++/examples/h5tutr_extend.cpp index b725f00..3916f9a 100644 --- a/c++/examples/h5tutr_extend.cpp +++ b/c++/examples/h5tutr_extend.cpp @@ -99,7 +99,7 @@ main(void) // --------------------------------------- int rdata[10][3]; - int i, j, rank, rank_chunk; + int i, j, rank; hsize_t chunk_dimsr[2], dimsr[2]; // Open the file and dataset. @@ -111,13 +111,13 @@ main(void) prop = dataset->getCreatePlist(); // Get information to obtain memory dataspace. - rank = filespace->getSimpleExtentNdims(); - herr_t status_n = filespace->getSimpleExtentDims(dimsr); + rank = filespace->getSimpleExtentNdims(); + (void)filespace->getSimpleExtentDims(dimsr); - if (H5D_CHUNKED == prop.getLayout()) - rank_chunk = prop.getChunk(rank, chunk_dimsr); - cout << "rank chunk = " << rank_chunk << endl; - ; + if (H5D_CHUNKED == prop.getLayout()) { + int rank_chunk = prop.getChunk(rank, chunk_dimsr); + cout << "rank chunk = " << rank_chunk << endl; + } memspace = new DataSpace(rank, dimsr, NULL); dataset->read(rdata, PredType::NATIVE_INT, *memspace, *filespace); diff --git a/c++/examples/readdata.cpp b/c++/examples/readdata.cpp index 1deed36..bfc03ee 100644 --- a/c++/examples/readdata.cpp +++ b/c++/examples/readdata.cpp @@ -84,7 +84,7 @@ main(void) * Get order of datatype and print message if it's a little endian. */ H5std_string order_string; - H5T_order_t order = intype.getOrder(order_string); + (void)intype.getOrder(order_string); cout << order_string << endl; /* @@ -109,7 +109,7 @@ main(void) * display them. */ hsize_t dims_out[2]; - int ndims = dataspace.getSimpleExtentDims(dims_out, NULL); + (void)dataspace.getSimpleExtentDims(dims_out, NULL); cout << "rank " << rank << ", dimensions " << (unsigned long)(dims_out[0]) << " x " << (unsigned long)(dims_out[1]) << endl; diff --git a/c++/examples/testh5c++.sh.in b/c++/examples/testh5c++.sh.in index ac95ba6..84c7752 100644 --- a/c++/examples/testh5c++.sh.in +++ b/c++/examples/testh5c++.sh.in @@ -11,10 +11,6 @@ # help@hdfgroup.org. # # Tests for the h5c++ compiler tool -# Created: Albert Cheng, 2007/3/14 -# -# Modification: -# srcdir=@srcdir@ diff --git a/c++/src/H5AbstractDs.cpp b/c++/src/H5AbstractDs.cpp index 3eeb197..7ea107c 100644 --- a/c++/src/H5AbstractDs.cpp +++ b/c++/src/H5AbstractDs.cpp @@ -35,7 +35,6 @@ namespace H5 { //-------------------------------------------------------------------------- // Function: AbstractDs default constructor ///\brief Default constructor -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- AbstractDs::AbstractDs() { @@ -44,7 +43,6 @@ AbstractDs::AbstractDs() //-------------------------------------------------------------------------- // Function: AbstractDs default constructor ///\brief Creates an AbstractDs instance using an existing id. -// Programmer Binh-Minh Ribler - 2000 // // *** Deprecation warning *** // This constructor is no longer appropriate because the data member "id" had @@ -60,7 +58,6 @@ AbstractDs::AbstractDs() /// object, which can be a dataset or an attribute. ///\return Datatype class identifier ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5T_class_t AbstractDs::getTypeClass() const @@ -107,7 +104,6 @@ AbstractDs::getTypeClass() const /// can be a dataset or an attribute. ///\return DataType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DataType AbstractDs::getDataType() const @@ -135,7 +131,6 @@ AbstractDs::getDataType() const /// can be a dataset or an attribute. ///\return ArrayType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Jul, 2005 //-------------------------------------------------------------------------- ArrayType AbstractDs::getArrayType() const @@ -165,7 +160,6 @@ AbstractDs::getArrayType() const /// can be a dataset or an attribute. ///\return CompType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- CompType AbstractDs::getCompType() const @@ -193,7 +187,6 @@ AbstractDs::getCompType() const /// can be a dataset or an attribute. ///\return EnumType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- EnumType AbstractDs::getEnumType() const @@ -221,7 +214,6 @@ AbstractDs::getEnumType() const /// can be a dataset or an attribute. ///\return IntType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- IntType AbstractDs::getIntType() const @@ -249,7 +241,6 @@ AbstractDs::getIntType() const /// which can be a dataset or an attribute. ///\return FloatType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FloatType AbstractDs::getFloatType() const @@ -277,7 +268,6 @@ AbstractDs::getFloatType() const /// can be a dataset or an attribute. ///\return StrType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- StrType AbstractDs::getStrType() const @@ -305,7 +295,6 @@ AbstractDs::getStrType() const /// which can be a dataset or an attribute. ///\return VarLenType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Jul, 2005 //-------------------------------------------------------------------------- VarLenType AbstractDs::getVarLenType() const @@ -330,7 +319,6 @@ AbstractDs::getVarLenType() const //-------------------------------------------------------------------------- // Function: AbstractDs destructor ///\brief Noop destructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- AbstractDs::~AbstractDs() { diff --git a/c++/src/H5ArrayType.cpp b/c++/src/H5ArrayType.cpp index ab9690e..c5ad7ea 100644 --- a/c++/src/H5ArrayType.cpp +++ b/c++/src/H5ArrayType.cpp @@ -31,7 +31,6 @@ namespace H5 { //-------------------------------------------------------------------------- // Function: ArrayType default constructor ///\brief Default constructor: Creates a stub ArrayType -// Programmer Binh-Minh Ribler - May 2004 //-------------------------------------------------------------------------- ArrayType::ArrayType() : DataType() { @@ -42,7 +41,6 @@ ArrayType::ArrayType() : DataType() ///\brief Creates an ArrayType object using an existing id. ///\param existing_id - IN: Id of an existing datatype ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - May 2004 //-------------------------------------------------------------------------- ArrayType::ArrayType(const hid_t existing_id) : DataType(existing_id) { @@ -51,7 +49,6 @@ ArrayType::ArrayType(const hid_t existing_id) : DataType(existing_id) //-------------------------------------------------------------------------- // Function: ArrayType copy constructor ///\brief Copy constructor: same HDF5 object as \a original -// Programmer Binh-Minh Ribler - May 2004 //-------------------------------------------------------------------------- ArrayType::ArrayType(const ArrayType &original) : DataType(original) { @@ -65,7 +62,6 @@ ArrayType::ArrayType(const ArrayType &original) : DataType(original) ///\param ndims - IN: Rank of the array, [0..H5S_MAX_RANK] ///\param dims - IN: Size of each array dimension ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - May 2004 //-------------------------------------------------------------------------- ArrayType::ArrayType(const DataType &base_type, int ndims, const hsize_t *dims) : DataType() { @@ -88,7 +84,6 @@ ArrayType::ArrayType(const DataType &base_type, int ndims, const hsize_t *dims) ///\param loc - IN: Location of the type ///\param dtype_name - IN: Array type name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openArrayType(const char*) to @@ -107,7 +102,6 @@ ArrayType::ArrayType(const H5Location &loc, const char *dtype_name) : DataType() ///\param loc - IN: Location of the type ///\param dtype_name - IN: Array type name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openArrayType(const H5std_string&) @@ -128,7 +122,6 @@ ArrayType::ArrayType(const H5Location &loc, const H5std_string &dtype_name) : Da // Description // Closes the id on the lhs object first with setId, then copies // each data member from the rhs object. (Issue HDFFV-9562) -// Programmer Binh-Minh Ribler - Mar 2016 //-------------------------------------------------------------------------- ArrayType & ArrayType::operator=(const ArrayType &rhs) @@ -153,7 +146,6 @@ ArrayType::operator=(const ArrayType &rhs) /// binary object description of this type. /// ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Aug 2017 //-------------------------------------------------------------------------- DataType * ArrayType::decode() const @@ -175,7 +167,6 @@ ArrayType::decode() const ///\brief Returns the number of dimensions for an array datatype. ///\return Number of dimensions ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - May 2004 //-------------------------------------------------------------------------- int ArrayType::getArrayNDims() const @@ -195,7 +186,6 @@ ArrayType::getArrayNDims() const ///\param dims - OUT: Sizes of dimensions ///\return Number of dimensions ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - May 2004 //-------------------------------------------------------------------------- int ArrayType::getArrayDims(hsize_t *dims) const @@ -212,7 +202,6 @@ ArrayType::getArrayDims(hsize_t *dims) const //-------------------------------------------------------------------------- // Function: ArrayType destructor ///\brief Properly terminates access to this array datatype. -// Programmer Binh-Minh Ribler - May 2004 //-------------------------------------------------------------------------- ArrayType::~ArrayType() { diff --git a/c++/src/H5AtomType.cpp b/c++/src/H5AtomType.cpp index 8f50317..db6c8f8 100644 --- a/c++/src/H5AtomType.cpp +++ b/c++/src/H5AtomType.cpp @@ -32,7 +32,6 @@ namespace H5 { //-------------------------------------------------------------------------- // Function: AtomType default constructor [protected] // Purpose Default constructor: creates a stub atomic datatype. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- AtomType::AtomType() : DataType() { @@ -43,7 +42,6 @@ AtomType::AtomType() : DataType() // Purpose Creates an AtomType object using an existing id. // Parameter existing_id - IN: Id of an existing datatype // Exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- AtomType::AtomType(const hid_t existing_id) : DataType(existing_id) { @@ -52,7 +50,6 @@ AtomType::AtomType(const hid_t existing_id) : DataType(existing_id) //-------------------------------------------------------------------------- // Function: AtomType copy constructor ///\brief Copy constructor: same HDF5 object as \a original -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- AtomType::AtomType(const AtomType &original) : DataType(original) { @@ -64,7 +61,6 @@ AtomType::AtomType(const AtomType &original) : DataType(original) ///\brief Sets the total size for an atomic datatype. ///\param size - IN: Size to set ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void AtomType::setSize(size_t size) const @@ -84,7 +80,6 @@ AtomType::setSize(size_t size) const /// \li \c H5T_ORDER_BE /// \li \c H5T_ORDER_VAX ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Mar, 2005 //-------------------------------------------------------------------------- H5T_order_t AtomType::getOrder() const @@ -114,7 +109,6 @@ AtomType::getOrder() const /// \li \c H5T_ORDER_BE /// \li \c H5T_ORDER_VAX ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5T_order_t AtomType::getOrder(H5std_string &order_string) const @@ -140,7 +134,6 @@ AtomType::getOrder(H5std_string &order_string) const /// \li \c H5T_ORDER_BE /// \li \c H5T_ORDER_VAX ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void AtomType::setOrder(H5T_order_t order) const @@ -161,7 +154,6 @@ AtomType::setOrder(H5T_order_t order) const /// The precision is the number of significant bits which, /// unless padding is present, is 8 times larger than the /// value returned by \c DataType::getSize(). -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- size_t AtomType::getPrecision() const @@ -184,7 +176,6 @@ AtomType::getPrecision() const ///\par Description /// For information, please refer to the H5Tset_precision API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void AtomType::setPrecision(size_t precision) const @@ -204,7 +195,6 @@ AtomType::setPrecision(size_t precision) const ///\par Description /// For information, please refer to the H5Tget_offset API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 // Modification // 12/05/00: due to C API change // - return type changed from size_t to int @@ -230,7 +220,6 @@ AtomType::getOffset() const ///\par Description /// For information, please refer to the H5Tset_offset API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void AtomType::setOffset(size_t offset) const @@ -254,7 +243,6 @@ AtomType::setOffset(size_t offset) const /// \li \c H5T_PAD_ZERO (0) - Set background to zeros. /// \li \c H5T_PAD_ONE (1) - Set background to ones. /// \li \c H5T_PAD_BACKGROUND (2) - Leave background alone. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void AtomType::getPad(H5T_pad_t &lsb, H5T_pad_t &msb) const @@ -277,7 +265,6 @@ AtomType::getPad(H5T_pad_t &lsb, H5T_pad_t &msb) const /// \li \c H5T_PAD_ZERO (0) - Set background to zeros. /// \li \c H5T_PAD_ONE (1) - Set background to ones. /// \li \c H5T_PAD_BACKGROUND (2) - Leave background alone. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void AtomType::setPad(H5T_pad_t lsb, H5T_pad_t msb) const @@ -293,7 +280,6 @@ AtomType::setPad(H5T_pad_t lsb, H5T_pad_t msb) const //-------------------------------------------------------------------------- // Function: AtomType destructor ///\brief Noop destructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- AtomType::~AtomType() { diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp index d2898f5..e838b4f 100644 --- a/c++/src/H5Attribute.cpp +++ b/c++/src/H5Attribute.cpp @@ -41,7 +41,6 @@ class H5Object; // forward declaration for UserData4Aiterate //-------------------------------------------------------------------------- // Function: Attribute default constructor ///\brief Default constructor: Creates a stub attribute -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- Attribute::Attribute() : AbstractDs(), H5Location(), id(H5I_INVALID_HID) { @@ -51,7 +50,6 @@ Attribute::Attribute() : AbstractDs(), H5Location(), id(H5I_INVALID_HID) // Function: Attribute copy constructor ///\brief Copy constructor: same HDF5 object as \a original ///\param original - IN: Original Attribute object to copy -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Attribute::Attribute(const Attribute &original) : AbstractDs(), H5Location(), id(original.id) { @@ -64,7 +62,6 @@ Attribute::Attribute(const Attribute &original) : AbstractDs(), H5Location(), id /// attribute. ///\param existing_id - IN: Id of an existing attribute ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Attribute::Attribute(const hid_t existing_id) : AbstractDs(), H5Location(), id(existing_id) { @@ -77,7 +74,6 @@ Attribute::Attribute(const hid_t existing_id) : AbstractDs(), H5Location(), id(e ///\param mem_type - IN: Attribute datatype (in memory) ///\param buf - IN: Data to be written ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void Attribute::write(const DataType &mem_type, const void *buf) const @@ -95,7 +91,6 @@ Attribute::write(const DataType &mem_type, const void *buf) const ///\param mem_type - IN: Attribute datatype (in memory) ///\param strg - IN: Data to be written ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - Apr, 2003 //-------------------------------------------------------------------------- void Attribute::write(const DataType &mem_type, const H5std_string &strg) const @@ -130,7 +125,6 @@ Attribute::write(const DataType &mem_type, const H5std_string &strg) const ///\param mem_type - IN: Attribute datatype (in memory) ///\param buf - OUT: Buffer for read data ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void Attribute::read(const DataType &mem_type, void *buf) const @@ -148,7 +142,6 @@ Attribute::read(const DataType &mem_type, void *buf) const ///\param mem_type - IN: Attribute datatype (in memory) ///\param strg - IN: Buffer for read string ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - Apr, 2003 // Modification // Mar 2008 // Corrected a misunderstanding that H5Aread would allocate @@ -185,7 +178,6 @@ Attribute::read(const DataType &mem_type, H5std_string &strg) const ///\brief Gets the size in memory of the attribute's data. ///\return Size of data (in memory) ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - Apr 2009 //-------------------------------------------------------------------------- size_t Attribute::getInMemDataSize() const @@ -244,7 +236,6 @@ Attribute::getInMemDataSize() const ///\brief Gets a copy of the dataspace for this attribute. ///\return Dataspace instance ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DataSpace Attribute::getSpace() const @@ -278,7 +269,6 @@ Attribute::getSpace() const /// To get length of the attribute's name for buffer allocation, /// an application can call this function passing in NULL for the /// first argument and ignore the second argument. -// Programmer Binh-Minh Ribler - Mar, 2014 //-------------------------------------------------------------------------- ssize_t Attribute::getName(char *attr_name, size_t buf_size) const @@ -302,7 +292,6 @@ Attribute::getName(char *attr_name, size_t buf_size) const ///\brief Returns the name of this attribute as an \a H5std_string. ///\return Name of the attribute ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - May, 2004 // Modification // Mar 2014 - BMR // Revised to use the modified getName() above @@ -353,7 +342,6 @@ Attribute::getName() const ///\return Name (or part of name) of the attribute ///\param len - IN: Desired length of the name ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - 2000 // Modification // Mar 2014 - BMR // Revised to use the new getName() below @@ -380,7 +368,6 @@ Attribute::getName(size_t len) const /// This function retrieves the attribute's name as a string. The /// buf_size can specify a specific length or default to 0, in /// which case the entire name will be retrieved. -// Programmer Binh-Minh Ribler - Nov, 2001 // Modification // Mar 2014 - BMR // Added to replace getName(size_t, H5std_string&) so that it'll @@ -425,7 +412,6 @@ Attribute::getName(H5std_string &attr_name, size_t len) const // Param attr_name - OUT: Buffer for the name string // Return Actual length of the attribute name // Exception H5::AttributeIException -// Programmer Binh-Minh Ribler - Nov, 2001 // Modification // Modified to call its replacement. -BMR, 2014/04/16 // Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0 @@ -443,7 +429,6 @@ Attribute::getName(H5std_string &attr_name, size_t len) const ///\exception H5::AttributeIException // Note: H5Dget_storage_size returns 0 when there is no data. This // function should have no failure. (from SLU) -// Programmer Binh-Minh Ribler - Mar, 2005 //-------------------------------------------------------------------------- hsize_t Attribute::getStorageSize() const @@ -461,7 +446,6 @@ Attribute::getStorageSize() const // 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 // Modification // Aug 2016 - BMR // Note that Attribute is now inheriting from H5Location, because @@ -481,7 +465,6 @@ Attribute::getId() const // Exception H5::AttributeIException // Description // This private function is used in AbstractDs. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- hid_t Attribute::p_get_type() const @@ -500,7 +483,6 @@ Attribute::p_get_type() const // param mem_type - IN: Attribute datatype (in memory) // param strg - IN: Buffer for read string // exception H5::AttributeIException -// Programmer Binh-Minh Ribler - Jul, 2009 // Modification // Jul 2009 // Separated the fixed length case from the original @@ -535,7 +517,6 @@ Attribute::p_read_fixed_len(const DataType &mem_type, H5std_string &strg) const // param mem_type - IN: Attribute datatype (in memory) // param strg - IN: Buffer for read string // exception H5::AttributeIException -// Programmer Binh-Minh Ribler - Jul, 2009 // Modification // Jul 2009 // Separated the variable length case from the original @@ -570,7 +551,6 @@ Attribute::p_read_variable_len(const DataType &mem_type, H5std_string &strg) con // The underlying reference counting in the C library ensures // that the current valid id of this object is properly closed. // Then the object's id is reset to the new id. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void Attribute::p_setId(const hid_t new_id) @@ -592,7 +572,6 @@ Attribute::p_setId(const hid_t new_id) ///\brief Closes this attribute. /// ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - Mar 9, 2005 //-------------------------------------------------------------------------- void Attribute::close() @@ -610,7 +589,6 @@ Attribute::close() //-------------------------------------------------------------------------- // Function: Attribute destructor ///\brief Properly terminates access to this attribute. -// Programmer Binh-Minh Ribler - 2000 // Modification // - Replaced resetIdComponent() with decRefCount() to use C // library ID reference counting mechanism - BMR, Jun 1, 2004 diff --git a/c++/src/H5CommonFG.cpp b/c++/src/H5CommonFG.cpp index adbd61a..277ba34 100644 --- a/c++/src/H5CommonFG.cpp +++ b/c++/src/H5CommonFG.cpp @@ -51,7 +51,6 @@ namespace H5 { ///\param name - IN: Name of the datatype to open ///\return DataType instance ///\exception H5::FileIException or H5::GroupIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DataType CommonFG::openDataType(const char *name) const @@ -75,7 +74,6 @@ CommonFG::openDataType(const char *name) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DataType CommonFG::openDataType(const H5std_string &name) const @@ -89,7 +87,6 @@ CommonFG::openDataType(const H5std_string &name) const ///\param name - IN: Name of the array datatype to open ///\return ArrayType instance ///\exception H5::FileIException or H5::GroupIException -// Programmer Binh-Minh Ribler - Jul, 2005 //-------------------------------------------------------------------------- ArrayType CommonFG::openArrayType(const char *name) const @@ -113,7 +110,6 @@ CommonFG::openArrayType(const char *name) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - Jul, 2005 //-------------------------------------------------------------------------- ArrayType CommonFG::openArrayType(const H5std_string &name) const @@ -127,7 +123,6 @@ CommonFG::openArrayType(const H5std_string &name) const ///\param name - IN: Name of the compound datatype to open ///\return CompType instance ///\exception H5::FileIException or H5::GroupIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- CompType CommonFG::openCompType(const char *name) const @@ -151,7 +146,6 @@ CommonFG::openCompType(const char *name) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- CompType CommonFG::openCompType(const H5std_string &name) const @@ -165,7 +159,6 @@ CommonFG::openCompType(const H5std_string &name) const ///\param name - IN: Name of the enumeration datatype to open ///\return EnumType instance ///\exception H5::FileIException or H5::GroupIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- EnumType CommonFG::openEnumType(const char *name) const @@ -189,7 +182,6 @@ CommonFG::openEnumType(const char *name) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- EnumType CommonFG::openEnumType(const H5std_string &name) const @@ -203,7 +195,6 @@ CommonFG::openEnumType(const H5std_string &name) const ///\param name - IN: Name of the integer datatype to open ///\return IntType instance ///\exception H5::FileIException or H5::GroupIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- IntType CommonFG::openIntType(const char *name) const @@ -227,7 +218,6 @@ CommonFG::openIntType(const char *name) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- IntType CommonFG::openIntType(const H5std_string &name) const @@ -241,7 +231,6 @@ CommonFG::openIntType(const H5std_string &name) const ///\param name - IN: Name of the floating-point datatype to open ///\return FloatType instance ///\exception H5::FileIException or H5::GroupIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FloatType CommonFG::openFloatType(const char *name) const @@ -265,7 +254,6 @@ CommonFG::openFloatType(const char *name) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FloatType CommonFG::openFloatType(const H5std_string &name) const @@ -279,7 +267,6 @@ CommonFG::openFloatType(const H5std_string &name) const ///\param name - IN: Name of the string datatype to open ///\return StrType instance ///\exception H5::FileIException or H5::GroupIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- StrType CommonFG::openStrType(const char *name) const @@ -303,7 +290,6 @@ CommonFG::openStrType(const char *name) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- StrType CommonFG::openStrType(const H5std_string &name) const @@ -317,7 +303,6 @@ CommonFG::openStrType(const H5std_string &name) const ///\param name - IN: Name of the variable length datatype to open ///\return VarLenType instance ///\exception H5::FileIException or H5::GroupIException -// Programmer Binh-Minh Ribler - Jul, 2005 //-------------------------------------------------------------------------- VarLenType CommonFG::openVarLenType(const char *name) const @@ -341,7 +326,6 @@ CommonFG::openVarLenType(const char *name) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - Jul, 2005 //-------------------------------------------------------------------------- VarLenType CommonFG::openVarLenType(const H5std_string &name) const @@ -353,7 +337,6 @@ CommonFG::openVarLenType(const H5std_string &name) const //-------------------------------------------------------------------------- // Function: CommonFG default constructor ///\brief Default constructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- CommonFG::CommonFG() { @@ -362,7 +345,6 @@ CommonFG::CommonFG() //-------------------------------------------------------------------------- // Function: CommonFG destructor ///\brief Noop destructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- CommonFG::~CommonFG() { @@ -376,7 +358,6 @@ CommonFG::~CommonFG() // Applications shouldn't need to use it. // param dtype - IN/OUT: DataType object to be changed // param new_id - IN: New id to set -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- void f_DataType_setId(DataType *dtype, hid_t new_id) @@ -392,7 +373,6 @@ f_DataType_setId(DataType *dtype, hid_t new_id) // Applications shouldn't need to use it. // param dset - IN/OUT: DataSet object to be changed // param new_id - IN: New id to set -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- void f_DataSet_setId(DataSet *dset, hid_t new_id) diff --git a/c++/src/H5CompType.cpp b/c++/src/H5CompType.cpp index 1f7755e..c89fa5c 100644 --- a/c++/src/H5CompType.cpp +++ b/c++/src/H5CompType.cpp @@ -34,7 +34,6 @@ namespace H5 { //-------------------------------------------------------------------------- // Function: CompType default constructor ///\brief Default constructor: Creates a stub compound datatype -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- CompType::CompType() : DataType() { @@ -44,7 +43,6 @@ CompType::CompType() : DataType() // Function: CompType copy constructor ///\brief Copy constructor: same HDF5 object as \a original ///\param original - IN: Original CompType instance -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- CompType::CompType(const CompType &original) : DataType(original) { @@ -54,7 +52,6 @@ CompType::CompType(const CompType &original) : DataType(original) // Function: CompType overloaded constructor ///\brief Creates a CompType object using the id of an existing datatype. ///\param existing_id - IN: Id of an existing compound datatype -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- CompType::CompType(const hid_t existing_id) : DataType(existing_id) { @@ -68,7 +65,6 @@ CompType::CompType(const hid_t existing_id) : DataType(existing_id) // Description // The DataType constructor calls the C API H5Tcreate to create // the compound datatype. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- CompType::CompType(size_t size) : DataType(H5T_COMPOUND, size) { @@ -80,7 +76,6 @@ CompType::CompType(size_t size) : DataType(H5T_COMPOUND, size) ///\param dataset - IN: Dataset that this enum datatype associates with ///\return CompType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- CompType::CompType(const DataSet &dataset) : DataType() { @@ -100,7 +95,6 @@ CompType::CompType(const DataSet &dataset) : DataType() ///\param loc - IN: Location of the type ///\param dtype_name - IN: Compound type name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openCompType(const char*) to @@ -119,7 +113,6 @@ CompType::CompType(const H5Location &loc, const char *dtype_name) : DataType() ///\param loc - IN: Location of the type ///\param dtype_name - IN: Compound type name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openCompType(const H5Location&) @@ -137,7 +130,6 @@ CompType::CompType(const H5Location &loc, const H5std_string &dtype_name) : Data /// binary object description of this datatype. /// ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Aug 2017 //-------------------------------------------------------------------------- DataType * CompType::decode() const @@ -159,7 +151,6 @@ CompType::decode() const ///\brief Returns the number of members in this compound datatype. ///\return Number of members ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- int CompType::getNmembers() const @@ -178,7 +169,6 @@ CompType::getNmembers() const ///\param member_num - IN: Zero-based index of the member ///\return Name of member ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5std_string CompType::getMemberName(unsigned member_num) const @@ -204,7 +194,6 @@ CompType::getMemberName(unsigned member_num) const /// Members are stored in no particular order with numbers 0 /// through N-1, where N is the value returned by the member /// function \c CompType::getNmembers. -// Programmer Binh-Minh Ribler - May 16, 2002 //-------------------------------------------------------------------------- int CompType::getMemberIndex(const char *name) const @@ -227,7 +216,6 @@ CompType::getMemberIndex(const H5std_string &name) const /// respect to the beginning of the compound data type datum. ///\param member_num - IN: Zero-based index of the member ///\return Byte offset -// Programmer Binh-Minh Ribler - 2000 // Description /// Members are stored in no particular order with numbers 0 /// through N-1, where N is the value returned by the member @@ -249,7 +237,6 @@ CompType::getMemberOffset(unsigned member_num) const ///\param member_num - IN: Zero-based index of the member ///\return Type class of the member ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 // Modification // Modified to use H5Tget_member_class instead. - Jul, 2005 //-------------------------------------------------------------------------- @@ -288,7 +275,6 @@ CompType::p_get_member_type(unsigned member_num) const ///\param member_num - IN: Zero-based index of the member ///\return DataType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DataType CompType::getMemberDataType(unsigned member_num) const @@ -310,7 +296,6 @@ CompType::getMemberDataType(unsigned member_num) const ///\param member_num - IN: Zero-based index of the member ///\return ArrayType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Jul, 2005 //-------------------------------------------------------------------------- ArrayType CompType::getMemberArrayType(unsigned member_num) const @@ -332,7 +317,6 @@ CompType::getMemberArrayType(unsigned member_num) const ///\param member_num - IN: Zero-based index of the member ///\return CompType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- CompType CompType::getMemberCompType(unsigned member_num) const @@ -354,7 +338,6 @@ CompType::getMemberCompType(unsigned member_num) const ///\param member_num - IN: Zero-based index of the member ///\return EnumType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- EnumType CompType::getMemberEnumType(unsigned member_num) const @@ -376,7 +359,6 @@ CompType::getMemberEnumType(unsigned member_num) const ///\param member_num - IN: Zero-based index of the member ///\return IntType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- IntType CompType::getMemberIntType(unsigned member_num) const @@ -398,7 +380,6 @@ CompType::getMemberIntType(unsigned member_num) const ///\param member_num - IN: Zero-based index of the member ///\return FloatType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FloatType CompType::getMemberFloatType(unsigned member_num) const @@ -420,7 +401,6 @@ CompType::getMemberFloatType(unsigned member_num) const ///\param member_num - IN: Zero-based index of the member ///\return StrType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- StrType CompType::getMemberStrType(unsigned member_num) const @@ -442,7 +422,6 @@ CompType::getMemberStrType(unsigned member_num) const ///\param member_num - IN: Zero-based index of the member ///\return VarLenType instance ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Jul, 2005 //-------------------------------------------------------------------------- VarLenType CompType::getMemberVarLenType(unsigned member_num) const @@ -497,7 +476,6 @@ void CompType::getMemberType(unsigned member_num, StrType& strtype) const ///\param offset - IN: Offset in memory structure of the field to insert ///\param new_member - IN: New member to be inserted ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void CompType::insertMember(const H5std_string &name, size_t offset, const DataType &new_member) const @@ -520,7 +498,6 @@ CompType::insertMember(const H5std_string &name, size_t offset, const DataType & ///\brief Recursively removes padding from within a compound datatype. /// ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void CompType::pack() const @@ -539,7 +516,6 @@ CompType::pack() const ///\exception H5::DataTypeIException // Note // H5Tset_size works on atom datatypes and compound datatypes only -// Programmer Binh-Minh Ribler - 2014 //-------------------------------------------------------------------------- void CompType::setSize(size_t size) const @@ -554,7 +530,6 @@ CompType::setSize(size_t size) const //-------------------------------------------------------------------------- // Function: CompType destructor ///\brief Properly terminates access to this compound datatype. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- CompType::~CompType() { diff --git a/c++/src/H5DaccProp.cpp b/c++/src/H5DaccProp.cpp index 7043079..8b01665 100644 --- a/c++/src/H5DaccProp.cpp +++ b/c++/src/H5DaccProp.cpp @@ -40,7 +40,6 @@ DSetAccPropList *DSetAccPropList::DEFAULT_ = 0; // If DSetAccPropList::DEFAULT_ already points to an allocated // object, throw a PropListIException. This scenario should // not happen. -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- DSetAccPropList * DSetAccPropList::getConstant() @@ -66,7 +65,6 @@ DSetAccPropList::getConstant() // Function: DSetAccPropList::deleteConstants // Purpose: Deletes the constant object that DSetAccPropList::DEFAULT_ // points to. -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- void DSetAccPropList::deleteConstants() @@ -84,7 +82,6 @@ const DSetAccPropList &DSetAccPropList::DEFAULT = *getConstant(); //-------------------------------------------------------------------------- // Function: DSetAccPropList default constructor ///\brief Default constructor: creates a stub dataset creation property list -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DSetAccPropList::DSetAccPropList() : LinkAccPropList(H5P_DATASET_ACCESS) { @@ -94,7 +91,6 @@ DSetAccPropList::DSetAccPropList() : LinkAccPropList(H5P_DATASET_ACCESS) // Function: DSetAccPropList copy constructor ///\brief Copy constructor: same HDF5 object as \a original /// DSetAccPropList object -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DSetAccPropList::DSetAccPropList(const DSetAccPropList &orig) : LinkAccPropList(orig) { @@ -104,7 +100,6 @@ DSetAccPropList::DSetAccPropList(const DSetAccPropList &orig) : LinkAccPropList( // Function: DSetAccPropList overloaded constructor ///\brief Creates a DSetAccPropList object using the id of an /// existing dataset creation property list. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DSetAccPropList::DSetAccPropList(const hid_t plist_id) : LinkAccPropList(plist_id) { @@ -161,7 +156,6 @@ DSetAccPropList::getChunkCache(size_t &rdcc_nslots, size_t &rdcc_nbytes, double //-------------------------------------------------------------------------- // Function: DSetAccPropList destructor ///\brief Noop destructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DSetAccPropList::~DSetAccPropList() { diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp index 7d19a6d..40b40f2 100644 --- a/c++/src/H5DataSet.cpp +++ b/c++/src/H5DataSet.cpp @@ -729,7 +729,7 @@ DataSet::p_read_fixed_len(const hid_t mem_type_id, const hid_t mem_space_id, con } // Get string from the C char* and release resource allocated locally - strg = strg_C; + strg = H5std_string(strg_C, data_size); delete[] strg_C; } } diff --git a/c++/src/H5DataSpace.cpp b/c++/src/H5DataSpace.cpp index a770101..403f9ec 100644 --- a/c++/src/H5DataSpace.cpp +++ b/c++/src/H5DataSpace.cpp @@ -38,7 +38,6 @@ DataSpace *DataSpace::ALL_ = 0; // Description // If DataSpace::ALL_ already points to an allocated object, throw // a DataSpaceIException. This scenario should not happen. -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- DataSpace * DataSpace::getConstant() @@ -63,7 +62,6 @@ DataSpace::getConstant() //-------------------------------------------------------------------------- // Function: DataSpace::deleteConstants // Purpose: Deletes the constant object that DataSpace::ALL_ points to -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- void DataSpace::deleteConstants() @@ -85,7 +83,6 @@ const DataSpace &DataSpace::ALL = *getConstant(); /// currently can be either \c H5S_SCALAR or \c H5S_SIMPLE; /// default to \c H5S_SCALAR. ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DataSpace::DataSpace(H5S_class_t type) : IdComponent(), id{H5Screate(type)} { @@ -101,7 +98,6 @@ DataSpace::DataSpace(H5S_class_t type) : IdComponent(), id{H5Screate(type)} ///\param dims - IN: An array of the size of each dimension. ///\param maxdims - IN: An array of the maximum size of each dimension. ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DataSpace::DataSpace(int rank, const hsize_t *dims, const hsize_t *maxdims) : IdComponent(), id{H5Screate_simple(rank, dims, maxdims)} @@ -117,7 +113,6 @@ DataSpace::DataSpace(int rank, const hsize_t *dims, const hsize_t *maxdims) /// dataspace. ///\param existing_id - IN: Id of an existing dataspace ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DataSpace::DataSpace(const hid_t existing_id) : IdComponent(), id(existing_id) { @@ -128,7 +123,6 @@ DataSpace::DataSpace(const hid_t existing_id) : IdComponent(), id(existing_id) // Function: DataSpace copy constructor ///\brief Copy constructor: same HDF5 object as \a original ///\param original - IN: DataSpace object to copy -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DataSpace::DataSpace(const DataSpace &original) : IdComponent(), id(original.id) { @@ -140,7 +134,6 @@ DataSpace::DataSpace(const DataSpace &original) : IdComponent(), id(original.id) ///\brief Makes a copy of an existing dataspace. ///\param like_space - IN: Dataspace to be copied ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 // Modification // - Replaced resetIdComponent() with decRefCount() to use C // library ID reference counting mechanism - BMR, Jun 1, 2004 @@ -176,7 +169,6 @@ DataSpace::copy(const DataSpace &like_space) // Description // Makes a copy of the type on the right hand side and stores // the new id in the left hand side object. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DataSpace & DataSpace::operator=(const DataSpace &rhs) @@ -192,7 +184,6 @@ DataSpace::operator=(const DataSpace &rhs) ///\return \c true if the dataspace is a simple dataspace, and \c false, /// otherwise ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- bool DataSpace::isSimple() const @@ -217,7 +208,6 @@ DataSpace::isSimple() const /// an extent, allowing the same shaped selection to be moved /// to different locations within a dataspace without requiring /// it to be re-defined. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataSpace::offsetSimple(const hssize_t *offset) const @@ -236,7 +226,6 @@ DataSpace::offsetSimple(const hssize_t *offset) const ///\return Number of dimensions, the same value as returned by /// \c DataSpace::getSimpleExtentNdims() ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- int DataSpace::getSimpleExtentDims(hsize_t *dims, hsize_t *maxdims) const @@ -254,7 +243,6 @@ DataSpace::getSimpleExtentDims(hsize_t *dims, hsize_t *maxdims) const ///\brief Returns the dimensionality of a dataspace. ///\return Number of dimensions ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- int DataSpace::getSimpleExtentNdims() const @@ -277,7 +265,6 @@ DataSpace::getSimpleExtentNdims() const // 12/05/00: due to C API change // return type hssize_t vs. hsize_t // num_elements = -1 when failure occurs vs. 0 -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- hssize_t DataSpace::getSimpleExtentNpoints() const @@ -297,7 +284,6 @@ DataSpace::getSimpleExtentNpoints() const ///\brief Returns the current class of a dataspace. ///\return Class of the dataspace ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5S_class_t DataSpace::getSimpleExtentType() const @@ -315,7 +301,6 @@ DataSpace::getSimpleExtentType() const ///\brief Copies the extent of a dataspace. ///\param dest_space - IN: Dataspace to copy from ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataSpace::extentCopy(const DataSpace &dest_space) const @@ -334,7 +319,6 @@ DataSpace::extentCopy(const DataSpace &dest_space) const // misses const. This wrapper will be removed in future release. // Param dest_space - IN: Dataspace to copy from // Exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 // Modification // Modified to call its replacement. -BMR, 2014/04/16 // Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0 @@ -352,7 +336,6 @@ DataSpace::extentCopy(const DataSpace &dest_space) const ///\param current_size - IN: Array containing current size of dataspace ///\param maximum_size - IN: Array containing maximum size of dataspace ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataSpace::setExtentSimple(int rank, const hsize_t *current_size, const hsize_t *maximum_size) const @@ -369,7 +352,6 @@ DataSpace::setExtentSimple(int rank, const hsize_t *current_size, const hsize_t ///\brief Removes the extent from a dataspace. /// ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataSpace::setExtentNone() const @@ -385,7 +367,6 @@ DataSpace::setExtentNone() const ///\brief Returns the number of elements in a dataspace selection. ///\return Number of elements ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- hssize_t DataSpace::getSelectNpoints() const @@ -404,7 +385,6 @@ DataSpace::getSelectNpoints() const ///\brief Returns number of hyperslab blocks. ///\return Number of hyperslab blocks ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- hssize_t DataSpace::getSelectHyperNblocks() const @@ -425,7 +405,6 @@ DataSpace::getSelectHyperNblocks() const ///\param numblocks - IN: Number of hyperslab blocks to get ///\param buf - IN: List of hyperslab blocks selected ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataSpace::getSelectHyperBlocklist(hsize_t startblock, hsize_t numblocks, hsize_t *buf) const @@ -443,7 +422,6 @@ DataSpace::getSelectHyperBlocklist(hsize_t startblock, hsize_t numblocks, hsize_ ///\brief Returns the number of element points in the current selection. ///\return Number of element points ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- hssize_t DataSpace::getSelectElemNpoints() const @@ -465,7 +443,6 @@ DataSpace::getSelectElemNpoints() const ///\par Description /// For information, please refer to the C API /// H5Sget_select_elem_pointlist in the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataSpace::getSelectElemPointlist(hsize_t startpoint, hsize_t numpoints, hsize_t *buf) const @@ -487,7 +464,6 @@ DataSpace::getSelectElemPointlist(hsize_t startpoint, hsize_t numpoints, hsize_t ///\par Description /// For information, please refer to the H5Sget_select_bounds API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataSpace::getSelectBounds(hsize_t *start, hsize_t *end) const @@ -511,7 +487,6 @@ DataSpace::getSelectBounds(hsize_t *start, hsize_t *end) const ///\par Description /// For information, please refer to the H5Sselect_elements API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataSpace::selectElements(H5S_seloper_t op, const size_t num_elements, const hsize_t *coord) const @@ -528,7 +503,6 @@ DataSpace::selectElements(H5S_seloper_t op, const size_t num_elements, const hsi ///\brief Selects the entire dataspace. /// ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataSpace::selectAll() const @@ -544,7 +518,6 @@ DataSpace::selectAll() const ///\brief Resets the selection region to include no elements. /// ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataSpace::selectNone() const @@ -562,7 +535,6 @@ DataSpace::selectNone() const ///\return \c true if the selection is within the extent of the /// dataspace, and \c false, otherwise ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- bool DataSpace::selectValid() const @@ -589,7 +561,6 @@ DataSpace::selectValid() const ///\par Description /// For information, please refer to the H5Sselect_hyperslab API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataSpace::selectHyperslab(H5S_seloper_t op, const hsize_t *count, const hsize_t *start, @@ -612,7 +583,6 @@ DataSpace::selectHyperslab(H5S_seloper_t op, const hsize_t *count, const hsize_t // 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 //-------------------------------------------------------------------------- hid_t DataSpace::getId() const @@ -631,7 +601,6 @@ DataSpace::getId() const // The underlying reference counting in the C library ensures // that the current valid id of this object is properly closed. // Then the object's id is reset to the new id. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataSpace::p_setId(const hid_t new_id) @@ -653,7 +622,6 @@ DataSpace::p_setId(const hid_t new_id) ///\brief Closes this dataspace. /// ///\exception H5::DataSpaceIException -// Programmer Binh-Minh Ribler - Mar 9, 2005 //-------------------------------------------------------------------------- void DataSpace::close() @@ -672,7 +640,6 @@ DataSpace::close() //-------------------------------------------------------------------------- // Function: DataSpace destructor ///\brief Properly terminates access to this dataspace. -// Programmer Binh-Minh Ribler - 2000 // Modification // - Replaced resetIdComponent() with decRefCount() to use C // library ID reference counting mechanism - BMR, Jun 1, 2004 diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp index ca3e67c..13b0dec 100644 --- a/c++/src/H5DataType.cpp +++ b/c++/src/H5DataType.cpp @@ -43,7 +43,6 @@ using std::endl; //-------------------------------------------------------------------------- // Function: DataType default constructor ///\brief Default constructor: Creates a stub datatype -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DataType::DataType() : H5Object(), id(H5I_INVALID_HID), encoded_buf(NULL), buf_size(0) { @@ -56,7 +55,6 @@ DataType::DataType() : H5Object(), id(H5I_INVALID_HID), encoded_buf(NULL), buf_s // Description // Constructor creates a copy of an existing DataType using // its id. -// Programmer Binh-Minh Ribler - 2000 // Modification // Dec, 2005 // Removed second argument, "predefined", after changing to the @@ -73,7 +71,6 @@ DataType::DataType(const hid_t existing_id) : H5Object(), id(existing_id), encod ///\param type_class - IN: Class of datatype to create ///\param size - IN: Number of bytes in the datatype to create ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DataType::DataType(const H5T_class_t type_class, size_t size) : H5Object(), id{H5Tcreate(type_class, size)}, encoded_buf(NULL), buf_size(0) @@ -92,7 +89,6 @@ DataType::DataType(const H5T_class_t type_class, size_t size) ///\param ref_type - IN: Reference type - default to H5R_OBJECT ///\param plist - IN: Property list - default to PropList::DEFAULT ///\exception H5::ReferenceException -// Programmer Binh-Minh Ribler - Oct, 2006 //-------------------------------------------------------------------------- DataType::DataType(const H5Location &loc, const void *ref, H5R_type_t ref_type, const PropList &plist) : H5Object(), id{H5Location::p_dereference(loc.getId(), ref, ref_type, plist, @@ -110,7 +106,6 @@ DataType::DataType(const H5Location &loc, const void *ref, H5R_type_t ref_type, // param ref_type - IN: Reference type - default to H5R_OBJECT // param plist - IN: Property list - default to PropList::DEFAULT // exception H5::ReferenceException -// Programmer Binh-Minh Ribler - Oct, 2006 // Modification // Jul, 2008 // Added for application convenience. @@ -125,7 +120,6 @@ H5Object(), id(H5I_INVALID_HID), encoded_buf(NULL), buf_size(0) //-------------------------------------------------------------------------- // Function: DataType copy constructor ///\brief Copy constructor: same HDF5 object as \a original -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DataType::DataType(const DataType &original) : H5Object(), id(original.id), encoded_buf(NULL), buf_size(0) { @@ -137,7 +131,6 @@ DataType::DataType(const DataType &original) : H5Object(), id(original.id), enco ///\brief Creates a DataType instance using a predefined type ///\param pred_type - IN: Predefined datatype ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2015 // Description // Copying the type so that when a predefined type is passed in, // a copy of it is made, not just a duplicate of the HDF5 id. @@ -159,7 +152,6 @@ DataType::DataType(const PredType &pred_type) ///\param loc - IN: Location of the type ///\param dtype_name - IN: Datatype name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openDataType(const char*) to @@ -178,7 +170,6 @@ DataType::DataType(const H5Location &loc, const char *dtype_name) ///\param loc - IN: Location of the type ///\param dtype_name - IN: Datatype name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openDataType(const H5std_string&) to @@ -195,7 +186,6 @@ DataType::DataType(const H5Location &loc, const H5std_string &dtype_name) ///\brief Copies an existing datatype to this datatype object ///\param like_type - IN: Datatype to be copied ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 // Modification // - Replaced resetIdComponent() with decRefCount() to use C // library ID reference counting mechanism - BMR, Jun 1, 2004 @@ -224,7 +214,6 @@ DataType::copy(const DataType &like_type) ///\brief Copies the datatype of the given dataset to this datatype object ///\param dset - IN: Dataset ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Jan, 2007 ///\par Description /// The resulted dataset will be transient and modifiable. //-------------------------------------------------------------------------- @@ -251,7 +240,6 @@ DataType::copy(const DataSet &dset) // Purpose Returns an id of a type by decoding the binary object /// description of this datatype. ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Aug 2017 //-------------------------------------------------------------------------- hid_t DataType::p_decode() const @@ -280,7 +268,6 @@ DataType::p_decode() const /// description of this datatype. /// ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Aug 2017 //-------------------------------------------------------------------------- DataType * DataType::decode() const @@ -302,7 +289,6 @@ DataType::decode() const ///\brief Creates a binary object description of this datatype. /// ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Aug 2017 //-------------------------------------------------------------------------- void DataType::encode() @@ -333,7 +319,6 @@ DataType::encode() /// description. /// ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Aug 2017 //-------------------------------------------------------------------------- bool DataType::hasBinaryDesc() const @@ -350,7 +335,6 @@ DataType::hasBinaryDesc() const // Description // Makes a copy of the type on the right hand side and stores // the new id in the left hand side object. -// Programmer Binh-Minh Ribler - 2000 // Modification // Changed operator= to simply copy the id of rhs instead of // calling H5Tcopy because, when the operator= is invoked, a @@ -376,7 +360,6 @@ DataType::operator=(const DataType &rhs) ///\param compared_type - IN: Reference to the datatype to compare ///\return true if the datatypes are equal, and false, otherwise. ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- bool DataType::operator==(const DataType &compared_type) const @@ -416,7 +399,6 @@ DataType::operator!=(const DataType &compared_type) const // datatype, or attribute. //\param name - IN: Name of the datatype //\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 // Modification: // Copied from DataType::commit and made into private function // to be commonly used by several overloads of DataType::commit. @@ -438,7 +420,6 @@ DataType::p_commit(hid_t loc_id, const char *name) ///\param loc - IN: A location (file, dataset, datatype, or group) ///\param name - IN: Name of the datatype ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Jan, 2007 //-------------------------------------------------------------------------- void DataType::commit(const H5Location &loc, const char *name) @@ -454,7 +435,6 @@ DataType::commit(const H5Location &loc, const char *name) // Param loc - IN: A location (file, dataset, datatype, or group) // Param name - IN: Name of the datatype // Exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Jan, 2007 // Modification // Planned for removal. -BMR, 2014/04/16 // Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0 @@ -470,7 +450,6 @@ DataType::commit(const H5Location &loc, const char *name) ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function only in the type of the /// argument \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataType::commit(const H5Location &loc, const H5std_string &name) @@ -486,7 +465,6 @@ DataType::commit(const H5Location &loc, const H5std_string &name) // Param loc - IN: A location (file, dataset, datatype, or group) // Param name - IN: Name of the datatype // Exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Jan, 2007 // Modification // Planned for removal. -BMR, 2014/04/16 // Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0 @@ -504,7 +482,6 @@ DataType::commit(const H5Location &loc, const H5std_string &name) ///\return \c true if the datatype is a named type, and \c false, /// otherwise. ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- bool DataType::committed() const @@ -528,7 +505,6 @@ DataType::committed() const ///\param pcdata - IN: Pointer to type conversion data ///\return Pointer to a suitable conversion function ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5T_conv_t DataType::find(const DataType &dest, H5T_cdata_t **pcdata) const @@ -552,7 +528,6 @@ DataType::find(const DataType &dest, H5T_cdata_t **pcdata) const ///\param plist - IN: Property list - default to PropList::DEFAULT ///\return Pointer to a suitable conversion function ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataType::convert(const DataType &dest, size_t nelmts, void *buf, void *background, @@ -582,7 +557,6 @@ DataType::convert(const DataType &dest, size_t nelmts, void *buf, void *backgrou /// /// Once a data type is locked it can never be unlocked unless /// the entire library is closed. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataType::lock() const @@ -599,7 +573,6 @@ DataType::lock() const ///\brief Returns the datatype class identifier. ///\return Datatype class identifier ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5T_class_t DataType::getClass() const @@ -618,7 +591,6 @@ DataType::getClass() const ///\brief Returns the size of a datatype. ///\return Datatype size in bytes ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- size_t DataType::getSize() const @@ -637,7 +609,6 @@ DataType::getSize() const ///\brief Returns the base datatype from which a datatype is derived. ///\return DataType object ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DataType DataType::getSuper() const @@ -672,7 +643,6 @@ DataType::getSuper() const ///\par Description /// For information, please refer to the H5Tregister API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataType::registerFunc(H5T_pers_t pers, const char *name, const DataType &dest, H5T_conv_t func) const @@ -691,7 +661,6 @@ DataType::registerFunc(H5T_pers_t pers, const char *name, const DataType &dest, ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function only in the type of the /// argument \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataType::registerFunc(H5T_pers_t pers, const H5std_string &name, const DataType &dest, H5T_conv_t func) const @@ -710,7 +679,6 @@ DataType::registerFunc(H5T_pers_t pers, const H5std_string &name, const DataType ///\param func - IN: Function to convert between source and /// destination datatypes. ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataType::unregister(H5T_pers_t pers, const char *name, const DataType &dest, H5T_conv_t func) const @@ -729,7 +697,6 @@ DataType::unregister(H5T_pers_t pers, const char *name, const DataType &dest, H5 ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function only in the type of the /// argument \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataType::unregister(H5T_pers_t pers, const H5std_string &name, const DataType &dest, H5T_conv_t func) const @@ -743,7 +710,6 @@ DataType::unregister(H5T_pers_t pers, const H5std_string &name, const DataType & ///\param tag - IN: Descriptive ASCII string with which the opaque /// datatype is to be tagged. ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataType::setTag(const char *tag) const @@ -760,7 +726,6 @@ DataType::setTag(const char *tag) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function only in the type of the /// argument \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataType::setTag(const H5std_string &tag) const @@ -773,7 +738,6 @@ DataType::setTag(const H5std_string &tag) const ///\brief Gets the tag associated with an opaque datatype. ///\return Tag associated with the opaque datatype ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5std_string DataType::getTag() const @@ -799,7 +763,6 @@ DataType::getTag() const ///\return true if this datatype contains or is the specified type, /// and false, otherwise. ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- bool DataType::detectClass(H5T_class_t cls) const @@ -820,7 +783,6 @@ DataType::detectClass(H5T_class_t cls) const ///\return true if this predtype is the specified type class, and false, /// otherwise. ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - August, 2017 //-------------------------------------------------------------------------- bool DataType::detectClass(const PredType &pred_type, H5T_class_t cls) @@ -841,7 +803,6 @@ DataType::detectClass(const PredType &pred_type, H5T_class_t cls) ///\return true if this datatype is a variable-length string, and /// false, otherwise. ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- bool DataType::isVariableStr() const @@ -862,7 +823,6 @@ DataType::isVariableStr() const /// creation. ///\return A property list object ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - March, 2017 // Description // Currently, there is no datatype creation property list class // in the C++ API because there is no associated functionality. @@ -890,7 +850,6 @@ DataType::getCreatePlist() const // 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 //-------------------------------------------------------------------------- hid_t DataType::getId() const @@ -905,7 +864,6 @@ DataType::getId() const ///\param loc - IN: Location of the type ///\param dtype_name - IN: Datatype name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // This function was introduced in 1.10.1 to be used by the new // XxxType constructors that open a datatype. -BMR, Dec 2016 @@ -930,7 +888,6 @@ DataType::p_opentype(const H5Location &loc, const char *dtype_name) const // The underlying reference counting in the C library ensures // that the current valid id of this object is properly closed. // Then the object's id is reset to the new id. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DataType::p_setId(const hid_t new_id) @@ -952,7 +909,6 @@ DataType::p_setId(const hid_t new_id) ///\brief Closes the datatype if it is not a predefined type. /// ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Mar 9, 2005 //-------------------------------------------------------------------------- void DataType::close() @@ -976,7 +932,6 @@ DataType::close() //-------------------------------------------------------------------------- // Function: DataType destructor ///\brief Properly terminates access to this datatype. -// Programmer Binh-Minh Ribler - 2000 // Modification // - Replaced resetIdComponent() with decRefCount() to use C // library ID reference counting mechanism - BMR, Jun 1, 2004 diff --git a/c++/src/H5DcreatProp.cpp b/c++/src/H5DcreatProp.cpp index 831441d..3d0193d 100644 --- a/c++/src/H5DcreatProp.cpp +++ b/c++/src/H5DcreatProp.cpp @@ -46,7 +46,6 @@ DSetCreatPropList *DSetCreatPropList::DEFAULT_ = 0; // If DSetCreatPropList::DEFAULT_ already points to an allocated // object, throw a PropListIException. This scenario should // not happen. -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- DSetCreatPropList * DSetCreatPropList::getConstant() @@ -72,7 +71,6 @@ DSetCreatPropList::getConstant() // Function: DSetCreatPropList::deleteConstants // Purpose: Deletes the constant object that DSetCreatPropList::DEFAULT_ // points to. -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- void DSetCreatPropList::deleteConstants() @@ -90,7 +88,6 @@ const DSetCreatPropList &DSetCreatPropList::DEFAULT = *getConstant(); //-------------------------------------------------------------------------- // Function: DSetCreatPropList default constructor ///\brief Default constructor: creates a stub dataset creation property list -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DSetCreatPropList::DSetCreatPropList() : ObjCreatPropList(H5P_DATASET_CREATE) { @@ -100,7 +97,6 @@ DSetCreatPropList::DSetCreatPropList() : ObjCreatPropList(H5P_DATASET_CREATE) // Function: DSetCreatPropList copy constructor ///\brief Copy constructor: same HDF5 object as \a original /// DSetCreatPropList object -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DSetCreatPropList::DSetCreatPropList(const DSetCreatPropList &orig) : ObjCreatPropList(orig) { @@ -110,7 +106,6 @@ DSetCreatPropList::DSetCreatPropList(const DSetCreatPropList &orig) : ObjCreatPr // Function: DSetCreatPropList overloaded constructor ///\brief Creates a DSetCreatPropList object using the id of an /// existing dataset creation property list. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DSetCreatPropList::DSetCreatPropList(const hid_t plist_id) : ObjCreatPropList(plist_id) { @@ -129,7 +124,6 @@ DSetCreatPropList::DSetCreatPropList(const hid_t plist_id) : ObjCreatPropList(pl /// define the size of the chunks to store the dataset's raw /// data. As a side-effect, the layout of the dataset will be /// changed to \c H5D_CHUNKED, if it is not so already. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetCreatPropList::setChunk(int ndims, const hsize_t *dim) const @@ -147,7 +141,6 @@ DSetCreatPropList::setChunk(int ndims, const hsize_t *dim) const ///\param max_ndims - IN: Size of \a dim array ///\param dim - OUT: Array to store the chunk dimensions ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- int DSetCreatPropList::getChunk(int max_ndims, hsize_t *dim) const @@ -167,7 +160,6 @@ DSetCreatPropList::getChunk(int max_ndims, hsize_t *dim) const ///\par Description /// For information, please refer to the H5Pset_layout API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetCreatPropList::setLayout(H5D_layout_t layout) const @@ -192,7 +184,6 @@ DSetCreatPropList::setLayout(H5D_layout_t layout) const /// in the file. ///\exception H5::PropListIException ///\par Description -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5D_layout_t DSetCreatPropList::getLayout() const @@ -214,7 +205,6 @@ DSetCreatPropList::getLayout() const /// list to \c H5D_COMPRESS_DEFLATE and the compression level to /// \a level. Lower compression levels are faster but result in /// less compression. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetCreatPropList::setDeflate(int level) const @@ -244,7 +234,6 @@ DSetCreatPropList::setDeflate(int level) const /// H5Z_FILTER_SZIP, for a dataset. For more information about /// SZIP and usage, please refer to the H5Pset_szip API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - Jan, 2007 //-------------------------------------------------------------------------- void DSetCreatPropList::setSzip(unsigned int options_mask, unsigned int pixels_per_block) const @@ -265,7 +254,6 @@ DSetCreatPropList::setSzip(unsigned int options_mask, unsigned int pixels_per_bl /// H5Z_FILTER_NBIT, for a dataset. For more information about /// Nbit compression, please refer to the H5Pset_nbit API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - Apr, 2016 //-------------------------------------------------------------------------- void DSetCreatPropList::setNbit() const @@ -291,7 +279,6 @@ DSetCreatPropList::setNbit() const ///\par /// For information on setting fill value, please refer to the /// H5Pset_fill_value API in the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetCreatPropList::setFillValue(const DataType &fvalue_type, const void *value) const @@ -313,7 +300,6 @@ DSetCreatPropList::setFillValue(const DataType &fvalue_type, const void *value) /// and the memory is allocated by the caller. The fill /// value will be converted from its current data type to the /// specified by \a fvalue_type. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetCreatPropList::getFillValue(const DataType &fvalue_type, void *value) const @@ -332,7 +318,6 @@ DSetCreatPropList::getFillValue(const DataType &fvalue_type, void *value) const /// \li \c H5D_FILL_VALUE_DEFAULT =1, /// \li \c H5D_FILL_VALUE_USER_DEFINED =2 ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5D_fill_value_t DSetCreatPropList::isFillValueDefined() const @@ -365,7 +350,6 @@ DSetCreatPropList::isFillValueDefined() const /// failed; the filter will not participate in the pipeline /// during a \c DataSet::read() of the chunk. If this bit is clear /// and the filter fails then the entire I/O operation fails. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetCreatPropList::setFilter(H5Z_filter_t filter_id, unsigned int flags, size_t cd_nelmts, @@ -385,7 +369,6 @@ DSetCreatPropList::setFilter(H5Z_filter_t filter_id, unsigned int flags, size_t ///\par Description /// Deletes a filter from the dataset creation property list; /// deletes all filters if \a filter_id is \c H5Z_FILTER_NONE. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetCreatPropList::removeFilter(H5Z_filter_t filter_id) const @@ -401,7 +384,6 @@ DSetCreatPropList::removeFilter(H5Z_filter_t filter_id) const ///\brief Returns the number of filters in the pipeline ///\return Number of filters ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- int DSetCreatPropList::getNfilters() const @@ -464,7 +446,6 @@ DSetCreatPropList::getFilter(int filter_number, unsigned int &flags, size_t &cd_ ///\param name - OUT: Name of the filter ///\param filter_config - OUT: Flags indicating whether filter can encode/decode ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetCreatPropList::getFilterById(H5Z_filter_t filter_id, unsigned int &flags, size_t &cd_nelmts, @@ -496,7 +477,6 @@ DSetCreatPropList::getFilterById(H5Z_filter_t filter_id, unsigned int &flags, si /// failed; the filter will not participate in the pipeline /// during a DataSet::read() of the chunk. If this bit is clear /// and the filter fails then the entire I/O operation fails. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetCreatPropList::modifyFilter(H5Z_filter_t filter_id, unsigned int flags, size_t cd_nelmts, @@ -515,7 +495,6 @@ DSetCreatPropList::modifyFilter(H5Z_filter_t filter_id, unsigned int flags, size ///\return true if all filters available, and false if one or more /// filters not currently available ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- bool DSetCreatPropList::allFiltersAvail() const @@ -540,7 +519,6 @@ DSetCreatPropList::allFiltersAvail() const ///\par Description /// For information, please refer to the H5Pset_shuffle API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetCreatPropList::setShuffle() const @@ -563,7 +541,6 @@ DSetCreatPropList::setShuffle() const /// \li \c H5D_ALLOC_TIME_EARLY /// \li \c H5D_ALLOC_TIME_LATE /// \li \c H5D_ALLOC_TIME_INCR -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5D_alloc_time_t DSetCreatPropList::getAllocTime() const @@ -586,7 +563,6 @@ DSetCreatPropList::getAllocTime() const /// Valid values for fill value writing time include /// \li \c H5D_FILL_TIME_NEVER /// \li \c H5D_FILL_TIME_ALLOC. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5D_fill_time_t DSetCreatPropList::getFillTime() const @@ -611,7 +587,6 @@ DSetCreatPropList::getFillTime() const /// \li \c H5D_ALLOC_TIME_EARLY /// \li \c H5D_ALLOC_TIME_LATE /// \li \c H5D_ALLOC_TIME_INCR -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetCreatPropList::setAllocTime(H5D_alloc_time_t alloc_time) const @@ -631,7 +606,6 @@ DSetCreatPropList::setAllocTime(H5D_alloc_time_t alloc_time) const /// Valid values for fill value writing time include /// \li \c H5D_FILL_TIME_NEVER /// \li \c H5D_FILL_TIME_ALLOC. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetCreatPropList::setFillTime(H5D_fill_time_t fill_time) const @@ -647,7 +621,6 @@ DSetCreatPropList::setFillTime(H5D_fill_time_t fill_time) const ///\brief Sets Fletcher32 checksum of EDC for this property list. /// ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetCreatPropList::setFletcher32() const @@ -672,7 +645,6 @@ DSetCreatPropList::setFletcher32() const /// the total size is larger than the size of a dataset then the /// dataset can be extended (provided the data space also allows /// the extending). -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetCreatPropList::setExternal(const char *name, off_t offset, hsize_t size) const @@ -688,7 +660,6 @@ DSetCreatPropList::setExternal(const char *name, off_t offset, hsize_t size) con ///\brief Returns the number of external files for a dataset ///\return Number of external files ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- int DSetCreatPropList::getExternalCount() const @@ -722,7 +693,6 @@ DSetCreatPropList::getExternalCount() const /// external file name will not be returned. If \a offset or /// \a size are null pointers then the corresponding information /// will not be returned. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetCreatPropList::getExternal(unsigned idx, size_t name_size, char *name, off_t &offset, hsize_t &size) const @@ -749,7 +719,6 @@ DSetCreatPropList::getExternal(unsigned idx, size_t name_size, char *name, off_t ///\par Description /// For information, please refer to the H5Pset_virtual API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - Mar, 2017 //-------------------------------------------------------------------------- void DSetCreatPropList::setVirtual(const DataSpace &vspace, const char *src_fname, const char *src_dsname, @@ -777,7 +746,6 @@ DSetCreatPropList::setVirtual(const DataSpace &vspace, const char *src_fname, co ///\par Description /// For information, please refer to the H5Pset_virtual API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - Mar, 2017 //-------------------------------------------------------------------------- void DSetCreatPropList::setVirtual(const DataSpace &vspace, const H5std_string src_fname, @@ -789,7 +757,6 @@ DSetCreatPropList::setVirtual(const DataSpace &vspace, const H5std_string src_fn //-------------------------------------------------------------------------- // Function: DSetCreatPropList destructor ///\brief Noop destructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DSetCreatPropList::~DSetCreatPropList() { diff --git a/c++/src/H5DxferProp.cpp b/c++/src/H5DxferProp.cpp index 3aec15f..33e2ff5 100644 --- a/c++/src/H5DxferProp.cpp +++ b/c++/src/H5DxferProp.cpp @@ -38,7 +38,6 @@ DSetMemXferPropList *DSetMemXferPropList::DEFAULT_ = 0; // If DSetMemXferPropList::DEFAULT_ already points to an allocated // object, throw a PropListIException. This scenario should not // happen. -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- DSetMemXferPropList * DSetMemXferPropList::getConstant() @@ -65,7 +64,6 @@ DSetMemXferPropList::getConstant() // Function: DSetMemXferPropList::deleteConstants // Purpose: Deletes the constant object that DSetMemXferPropList::DEFAULT_ // points to. -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- void DSetMemXferPropList::deleteConstants() @@ -84,7 +82,6 @@ const DSetMemXferPropList &DSetMemXferPropList::DEFAULT = *getConstant(); // Function DSetMemXferPropList default constructor ///\brief Default constructor: creates a stub dataset memory and /// transfer property list object. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DSetMemXferPropList::DSetMemXferPropList() : PropList(H5P_DATASET_XFER) { @@ -94,7 +91,6 @@ DSetMemXferPropList::DSetMemXferPropList() : PropList(H5P_DATASET_XFER) // Function DSetMemXferPropList constructor ///\brief Creates a dataset transfer property list with transform /// expression. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DSetMemXferPropList::DSetMemXferPropList(const char *exp) : PropList(H5P_DATASET_XFER) { @@ -107,7 +103,6 @@ DSetMemXferPropList::DSetMemXferPropList(const char *exp) : PropList(H5P_DATASET /// DSetMemXferPropList object ///\param original - IN: Original dataset memory and transfer property /// list object to copy -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DSetMemXferPropList::DSetMemXferPropList(const DSetMemXferPropList &original) : PropList(original) { @@ -119,7 +114,6 @@ DSetMemXferPropList::DSetMemXferPropList(const DSetMemXferPropList &original) : /// existing DSetMemXferPropList. ///\param plist_id - IN: Id of an existing dataset memory and transfer /// property list -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DSetMemXferPropList::DSetMemXferPropList(const hid_t plist_id) : PropList(plist_id) { @@ -132,7 +126,6 @@ DSetMemXferPropList::DSetMemXferPropList(const hid_t plist_id) : PropList(plist_ ///\param tconv - IN: Pointer to application-allocated type conversion buffer ///\param bkg - IN: Pointer to application-allocated background buffer ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetMemXferPropList::setBuffer(size_t size, void *tconv, void *bkg) const @@ -150,7 +143,6 @@ DSetMemXferPropList::setBuffer(size_t size, void *tconv, void *bkg) const ///\param bkg - OUT: Pointer to application-allocated background buffer ///\return Buffer size, in bytes ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- size_t DSetMemXferPropList::getBuffer(void **tconv, void **bkg) const @@ -168,7 +160,6 @@ DSetMemXferPropList::getBuffer(void **tconv, void **bkg) const ///\brief Sets the dataset transfer property list status to true or false. ///\param status - IN: Status to set, true or false ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetMemXferPropList::setPreserve(bool status) const @@ -184,7 +175,6 @@ DSetMemXferPropList::setPreserve(bool status) const ///\brief Checks status of the dataset transfer property list. ///\return Status of the dataset transfer property list ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- bool DSetMemXferPropList::getPreserve() const @@ -207,7 +197,6 @@ DSetMemXferPropList::getPreserve() const ///\param middle - IN: B-tree split ratio for right-most nodes and lone nodes ///\param right - IN: B-tree split ratio for all other nodes ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetMemXferPropList::setBtreeRatios(double left, double middle, double right) const @@ -225,7 +214,6 @@ DSetMemXferPropList::setBtreeRatios(double left, double middle, double right) co ///\param middle - OUT: B-tree split ratio for right-most nodes and lone nodes ///\param right - OUT: B-tree split ratio for all other nodes ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetMemXferPropList::getBtreeRatios(double &left, double &middle, double &right) const @@ -241,7 +229,6 @@ DSetMemXferPropList::getBtreeRatios(double &left, double &middle, double &right) ///\brief Sets data transform expression. ///\param expression - IN: null-terminated data transform expression (char*) ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - Mar, 2014 //-------------------------------------------------------------------------- void DSetMemXferPropList::setDataTransform(const char *expression) const @@ -258,7 +245,6 @@ DSetMemXferPropList::setDataTransform(const char *expression) const /// It takes a reference to a \c H5std_string for the expression. ///\param expression - IN: H5std_string data transform expression ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - Mar, 2014 //-------------------------------------------------------------------------- void DSetMemXferPropList::setDataTransform(const H5std_string &expression) const @@ -273,7 +259,6 @@ DSetMemXferPropList::setDataTransform(const H5std_string &expression) const ///\param buf_size - IN: size of buffer for expression, including the /// null terminator ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - Mar, 2014 //-------------------------------------------------------------------------- ssize_t DSetMemXferPropList::getDataTransform(char *exp, size_t buf_size) const @@ -302,7 +287,6 @@ DSetMemXferPropList::getDataTransform(char *exp, size_t buf_size) const /// It takes no parameter and returns a \c H5std_string for the expression. /// ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - Mar, 2014 //-------------------------------------------------------------------------- H5std_string DSetMemXferPropList::getDataTransform() const @@ -349,7 +333,6 @@ DSetMemXferPropList::getDataTransform() const ///\param op - IN: User's function ///\param user_data - IN: User's data ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void DSetMemXferPropList::setTypeConvCB(H5T_conv_except_func_t op, void *user_data) const @@ -366,7 +349,6 @@ DSetMemXferPropList::setTypeConvCB(H5T_conv_except_func_t op, void *user_data) c ///\param op - IN: Retrieved user function ///\param user_data - IN: Retrieved user data ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void DSetMemXferPropList::getTypeConvCB(H5T_conv_except_func_t *op, void **user_data) const @@ -385,7 +367,6 @@ DSetMemXferPropList::getTypeConvCB(H5T_conv_except_func_t *op, void **user_data) ///\param free_func - IN: User's free routine ///\param free_info - IN: User's free parameters ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetMemXferPropList::setVlenMemManager(H5MM_allocate_t alloc_func, void *alloc_info, H5MM_free_t free_func, @@ -403,7 +384,6 @@ DSetMemXferPropList::setVlenMemManager(H5MM_allocate_t alloc_func, void *alloc_i /// allocation - system \c malloc and \c free will be used. /// ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetMemXferPropList::setVlenMemManager() const @@ -419,7 +399,6 @@ DSetMemXferPropList::setVlenMemManager() const ///\param free_func - OUT: User's free routine ///\param free_info - OUT: User's free parameters ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void DSetMemXferPropList::getVlenMemManager(H5MM_allocate_t &alloc_func, void **alloc_info, H5MM_free_t &free_func, @@ -439,7 +418,6 @@ DSetMemXferPropList::getVlenMemManager(H5MM_allocate_t &alloc_func, void **alloc ///\par Description /// For detail, please refer to the H5Pset_small_data_block_size /// API in the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void DSetMemXferPropList::setSmallDataBlockSize(hsize_t size) const @@ -456,7 +434,6 @@ DSetMemXferPropList::setSmallDataBlockSize(hsize_t size) const ///\brief Returns the current small data block size setting. ///\return Size of the small data block, in bytes ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- hsize_t DSetMemXferPropList::getSmallDataBlockSize() const @@ -478,7 +455,6 @@ DSetMemXferPropList::getSmallDataBlockSize() const ///\par Description /// For detail, please refer to the H5Pset_hyper_vector_size /// API in the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void DSetMemXferPropList::setHyperVectorSize(size_t vector_size) const @@ -496,7 +472,6 @@ DSetMemXferPropList::setHyperVectorSize(size_t vector_size) const /// hyperslab I/O. ///\return Number of I/O vectors ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- size_t DSetMemXferPropList::getHyperVectorSize() const @@ -526,7 +501,6 @@ DSetMemXferPropList::getHyperVectorSize() const /// Valid values are as follows: /// \li \c H5Z_ENABLE_EDC (default) /// \li \c H5Z_DISABLE_EDC -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void DSetMemXferPropList::setEDCCheck(H5Z_EDC_t check) const @@ -542,7 +516,6 @@ DSetMemXferPropList::setEDCCheck(H5Z_EDC_t check) const ///\brief Determines whether error-detection is enabled for dataset reads. ///\return \c H5Z_ENABLE_EDC or \c H5Z_DISABLE_EDC ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- H5Z_EDC_t DSetMemXferPropList::getEDCCheck() const @@ -557,7 +530,6 @@ DSetMemXferPropList::getEDCCheck() const //-------------------------------------------------------------------------- // Function: DSetMemXferPropList destructor ///\brief Noop destructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DSetMemXferPropList::~DSetMemXferPropList() { diff --git a/c++/src/H5EnumType.cpp b/c++/src/H5EnumType.cpp index 218934e..03c07d9 100644 --- a/c++/src/H5EnumType.cpp +++ b/c++/src/H5EnumType.cpp @@ -37,7 +37,6 @@ namespace H5 { //-------------------------------------------------------------------------- // Function: EnumType default constructor ///\brief Default constructor: Creates a stub datatype -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- EnumType::EnumType() : DataType() { @@ -48,7 +47,6 @@ EnumType::EnumType() : DataType() ///\brief Creates an EnumType object using the id of an existing datatype. ///\param existing_id - IN: Id of an existing datatype ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- EnumType::EnumType(const hid_t existing_id) : DataType(existing_id) { @@ -57,7 +55,6 @@ EnumType::EnumType(const hid_t existing_id) : DataType(existing_id) //-------------------------------------------------------------------------- // Function: EnumType copy constructor ///\brief Copy constructor: same HDF5 object as \a original -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- EnumType::EnumType(const EnumType &original) : DataType(original) { @@ -71,7 +68,6 @@ EnumType::EnumType(const EnumType &original) : DataType(original) // Description // The DataType constructor calls the C API H5Tcreate to create // the enum datatype. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- EnumType::EnumType(size_t size) : DataType(H5T_ENUM, size) { @@ -82,7 +78,6 @@ EnumType::EnumType(size_t size) : DataType(H5T_ENUM, size) ///\brief Gets the enum datatype of the specified dataset. ///\param dataset - IN: Dataset that this enum datatype associates with ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- EnumType::EnumType(const DataSet &dataset) : DataType() { @@ -100,7 +95,6 @@ EnumType::EnumType(const DataSet &dataset) : DataType() ///\brief Creates a new enum datatype based on an integer datatype. ///\param data_type - IN: Base datatype ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- EnumType::EnumType(const IntType &data_type) : DataType() { @@ -120,7 +114,6 @@ EnumType::EnumType(const IntType &data_type) : DataType() ///\param dtype_name - IN: Enum datatype name ///\param loc - IN: Location of the type ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openEnumType(const char*) to @@ -139,7 +132,6 @@ EnumType::EnumType(const H5Location &loc, const char *dtype_name) : DataType() ///\param loc - IN: Location of the type ///\param dtype_name - IN: Enum datatype name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openEnumType(const H5std_string&) @@ -157,7 +149,6 @@ EnumType::EnumType(const H5Location &loc, const H5std_string &dtype_name) : Data /// binary object description of this type. /// ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Aug 2017 //-------------------------------------------------------------------------- DataType * EnumType::decode() const @@ -180,7 +171,6 @@ EnumType::decode() const ///\param name - IN: Name of the new member ///\param value - IN: Pointer to the value of the new member ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void EnumType::insert(const char *name, void *value) const @@ -197,7 +187,6 @@ EnumType::insert(const char *name, void *value) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function only in the type of /// argument \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void EnumType::insert(const H5std_string &name, void *value) const @@ -212,7 +201,6 @@ EnumType::insert(const H5std_string &name, void *value) const ///\param value - IN: Pointer to the value of the enum datatype ///\param size - IN: Size for the name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5std_string EnumType::nameOf(void *value, size_t size) const @@ -240,7 +228,6 @@ EnumType::nameOf(void *value, size_t size) const ///\param name - IN: Name of the queried member ///\param value - OUT: Pointer to the retrieved value ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void EnumType::valueOf(const char *name, void *value) const @@ -257,7 +244,6 @@ EnumType::valueOf(const char *name, void *value) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function only in the type of /// argument \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void EnumType::valueOf(const H5std_string &name, void *value) const @@ -273,7 +259,6 @@ EnumType::valueOf(const H5std_string &name, void *value) const /// between 0 and \c N-1, where \c N is the value returned by the /// member function \c EnumType::getNmembers. ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - May 16, 2002 //-------------------------------------------------------------------------- int EnumType::getMemberIndex(const char *name) const @@ -290,7 +275,6 @@ EnumType::getMemberIndex(const char *name) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function only in the type of /// argument \a name. -// Programmer Binh-Minh Ribler - May 16, 2002 //-------------------------------------------------------------------------- int EnumType::getMemberIndex(const H5std_string &name) const @@ -303,7 +287,6 @@ EnumType::getMemberIndex(const H5std_string &name) const ///\brief Returns the number of members in this enumeration datatype. ///\return Number of members ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- int EnumType::getNmembers() const @@ -323,7 +306,6 @@ EnumType::getNmembers() const ///\param memb_no - IN: Index of the queried member ///\param value - OUT: Pointer to the retrieved value ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void EnumType::getMemberValue(unsigned memb_no, void *value) const @@ -338,7 +320,6 @@ EnumType::getMemberValue(unsigned memb_no, void *value) const //-------------------------------------------------------------------------- // Function: EnumType destructor ///\brief Properly terminates access to this enum datatype. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- EnumType::~EnumType() { diff --git a/c++/src/H5Exception.cpp b/c++/src/H5Exception.cpp index 97b8606..01b9cc1 100644 --- a/c++/src/H5Exception.cpp +++ b/c++/src/H5Exception.cpp @@ -22,7 +22,6 @@ const char Exception::DEFAULT_MSG[] = "No detailed information provided"; //-------------------------------------------------------------------------- // Function: Exception default constructor ///\brief Default constructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Exception::Exception() : detail_message{""}, func_name{""} { @@ -34,7 +33,6 @@ Exception::Exception() : detail_message{""}, func_name{""} /// in which the failure occurs, and an optional detailed message. ///\param func - IN: Name of the function where failure occurs ///\param message - IN: Message on the failure -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Exception::Exception(const H5std_string &func, const H5std_string &message) : detail_message(message), func_name(func) @@ -45,7 +43,6 @@ Exception::Exception(const H5std_string &func, const H5std_string &message) // Function: Exception copy constructor ///\brief Copy constructor: same HDF5 object as \a original ///\param orig - IN: Exception instance to copy -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Exception::Exception(const Exception &orig) : detail_message(orig.detail_message), func_name(orig.func_name) { @@ -60,7 +57,6 @@ Exception::Exception(const Exception &orig) : detail_message(orig.detail_message ///\par Description /// In the failure case, the string "Invalid major error number" /// will be returned. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5std_string Exception::getMajorString(hid_t err_major) const @@ -102,7 +98,6 @@ Exception::getMajorString(hid_t err_major) const ///\par Description /// In the failure case, the string "Invalid minor error number" /// will be returned. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5std_string Exception::getMinorString(hid_t err_minor) const @@ -149,7 +144,6 @@ Exception::getMinorString(hid_t err_minor) const ///\par /// Users are encouraged to write their own more specific error /// handlers -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void Exception::setAutoPrint(H5E_auto2_t &func, void *client_data) @@ -164,7 +158,6 @@ Exception::setAutoPrint(H5E_auto2_t &func, void *client_data) //-------------------------------------------------------------------------- // Function: Exception::dontPrint ///\brief Turns off the automatic error printing from the C library. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void Exception::dontPrint() @@ -184,7 +177,6 @@ Exception::dontPrint() /// called upon an error condition ///\param client_data - OUT: Current setting for the data passed to /// the error function -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void Exception::getAutoPrint(H5E_auto2_t &func, void **client_data) @@ -202,7 +194,6 @@ Exception::getAutoPrint(H5E_auto2_t &func, void **client_data) ///\par Description /// The stack is also cleared whenever a C API function is /// called, with certain exceptions (for instance, \c H5Eprint). -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void Exception::clearErrorStack() @@ -252,7 +243,6 @@ Exception::clearErrorStack() /// const char *desc; //optional supplied description /// } H5E_error2_t; ///\endcode -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void Exception::walkErrorStack(H5E_direction_t direction, H5E_walk2_t func, void *client_data) @@ -268,7 +258,6 @@ Exception::walkErrorStack(H5E_direction_t direction, H5E_walk2_t func, void *cli ///\brief Returns the detailed message set at the time the exception /// is thrown. ///\return Text message - \c H5std_string -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5std_string Exception::getDetailMsg() const @@ -281,7 +270,6 @@ Exception::getDetailMsg() const ///\brief Returns the detailed message set at the time the exception /// is thrown. ///\return Text message - \c char pointer -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- const char * Exception::getCDetailMsg() const @@ -293,7 +281,6 @@ Exception::getCDetailMsg() const // Function: Exception::getFuncName ///\brief Returns the name of the function, where the exception is thrown. ///\return Text message - \c H5std_string -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5std_string Exception::getFuncName() const @@ -305,7 +292,6 @@ Exception::getFuncName() const // Function: Exception::getCFuncName ///\brief Returns the name of the function, where the exception is thrown. ///\return Text message - \c char pointer -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- const char * Exception::getCFuncName() const @@ -318,7 +304,6 @@ Exception::getCFuncName() const ///\brief Prints the error stack in a default manner. ///\param stream - IN: File pointer, default to stderr ///\param err_stack - IN: Error stack ID, default to H5E_DEFAULT(0) -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void Exception::printErrorStack(FILE *stream, hid_t err_stack) @@ -334,7 +319,6 @@ Exception::printErrorStack(FILE *stream, hid_t err_stack) // function is replaced by the static function printErrorStack // and will be removed from the next major release. // Parameter stream - IN: File pointer -// Programmer Binh-Minh Ribler - 2000 // Description: // This function can be removed in next major release. // -BMR, 2014/04/24 @@ -349,7 +333,6 @@ Exception::printErrorStack(FILE *stream, hid_t err_stack) //-------------------------------------------------------------------------- // Function: Exception destructor ///\brief Noop destructor -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Exception::~Exception() throw() { @@ -357,7 +340,6 @@ Exception::~Exception() throw() //-------------------------------------------------------------------------- // Subclass: FileIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- // Function: FileIException default constructor @@ -387,7 +369,6 @@ FileIException::~FileIException() throw() //-------------------------------------------------------------------------- // Subclass: GroupIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- // Function: GroupIException default constructor @@ -417,7 +398,6 @@ GroupIException::~GroupIException() throw() //-------------------------------------------------------------------------- // Subclass: DataSpaceIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- // Function: DataSpaceIException default constructor @@ -447,7 +427,6 @@ DataSpaceIException::~DataSpaceIException() throw() //-------------------------------------------------------------------------- // Subclass: DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- // Function: DataTypeIException default constructor @@ -477,7 +456,6 @@ DataTypeIException::~DataTypeIException() throw() //-------------------------------------------------------------------------- // Subclass: ObjHeaderIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- // Function: ObjHeaderIException default constructor @@ -507,7 +485,6 @@ ObjHeaderIException::~ObjHeaderIException() throw() //-------------------------------------------------------------------------- // Subclass: PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- // Function: PropListIException default constructor @@ -537,7 +514,6 @@ PropListIException::~PropListIException() throw() //-------------------------------------------------------------------------- // Subclass: DataSetIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- // Function: DataSetIException default constructor @@ -567,7 +543,6 @@ DataSetIException::~DataSetIException() throw() //-------------------------------------------------------------------------- // Subclass: AttributeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- // Function: AttributeIException default constructor @@ -597,7 +572,6 @@ AttributeIException::~AttributeIException() throw() //-------------------------------------------------------------------------- // Subclass: ReferenceException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- // Function: ReferenceException default constructor @@ -627,7 +601,6 @@ ReferenceException::~ReferenceException() throw() //-------------------------------------------------------------------------- // Subclass: LibraryIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- // Function: LibraryIException default constructor @@ -657,7 +630,6 @@ LibraryIException::~LibraryIException() throw() //-------------------------------------------------------------------------- // Subclass: LocationException -// Programmer Binh-Minh Ribler - 2014 //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- // Function: LocationException default constructor @@ -687,7 +659,6 @@ LocationException::~LocationException() throw() //-------------------------------------------------------------------------- // Subclass: IdComponentException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- // Function: IdComponentException default constructor diff --git a/c++/src/H5FaccProp.cpp b/c++/src/H5FaccProp.cpp index 94e054f..ea5692a 100644 --- a/c++/src/H5FaccProp.cpp +++ b/c++/src/H5FaccProp.cpp @@ -41,7 +41,6 @@ FileAccPropList *FileAccPropList::DEFAULT_ = 0; // If FileAccPropList::DEFAULT_ already points to an allocated // object, throw a PropListIException. This scenario should not // happen. -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- FileAccPropList * FileAccPropList::getConstant() @@ -68,7 +67,6 @@ FileAccPropList::getConstant() // Purpose Deletes the constant object that FileAccPropList::DEFAULT_ // points to. // exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- void FileAccPropList::deleteConstants() @@ -86,7 +84,6 @@ const FileAccPropList &FileAccPropList::DEFAULT = *getConstant(); //-------------------------------------------------------------------------- // Function: Default Constructor ///\brief Creates a file access property list -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FileAccPropList::FileAccPropList() : PropList(H5P_FILE_ACCESS) { @@ -96,7 +93,6 @@ FileAccPropList::FileAccPropList() : PropList(H5P_FILE_ACCESS) // Function: FileAccPropList copy constructor ///\brief Copy constructor: same HDF5 object as \a original ///\param original - IN: FileAccPropList instance to copy -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FileAccPropList::FileAccPropList(const FileAccPropList &original) : PropList(original) { @@ -106,7 +102,6 @@ FileAccPropList::FileAccPropList(const FileAccPropList &original) : PropList(ori // Function: FileAccPropList overloaded constructor ///\brief Creates a file access property list using the id of an /// existing one. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FileAccPropList::FileAccPropList(const hid_t plist_id) : PropList(plist_id) { @@ -117,7 +112,6 @@ FileAccPropList::FileAccPropList(const hid_t plist_id) : PropList(plist_id) ///\brief Modifies this property list to use the \c H5FD_STDIO driver. /// ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::setStdio() const @@ -137,7 +131,6 @@ FileAccPropList::setStdio() const /// For detail on valid driver identifiers, please refer to the /// H5Pget_driver API in the HDF5 C Reference Manual. ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- hid_t FileAccPropList::getDriver() const @@ -158,7 +151,6 @@ FileAccPropList::getDriver() const ///\par Description /// For information, please refer to the H5Pset_driver API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::setDriver(hid_t new_driver_id, const void *new_driver_info) const @@ -174,7 +166,6 @@ FileAccPropList::setDriver(hid_t new_driver_id, const void *new_driver_info) con ///\brief Sets offset for family driver. ///\param offset - IN: offset value ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::setFamilyOffset(hsize_t offset) const @@ -190,7 +181,6 @@ FileAccPropList::setFamilyOffset(hsize_t offset) const ///\brief Get offset for family driver. ///\return Offset for family driver ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- hsize_t FileAccPropList::getFamilyOffset() const @@ -215,7 +205,6 @@ FileAccPropList::getFamilyOffset() const ///\par Description /// For more details on the use of \c H5FD_CORE driver, please /// refer to the H5Pset_fapl_core API in the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::setCore(size_t increment, hbool_t backing_store) const @@ -233,7 +222,6 @@ FileAccPropList::setCore(size_t increment, hbool_t backing_store) const ///\param backing_store - OUT: Indicating whether to write the file /// contents to disk when the file is closed ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::getCore(size_t &increment, hbool_t &backing_store) const @@ -253,7 +241,6 @@ FileAccPropList::getCore(size_t &increment, hbool_t &backing_store) const ///\exception H5::PropListIException ///\par Description /// Note that \a memb_size is used only when creating a new file. -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::setFamily(hsize_t memb_size, const FileAccPropList &memb_plist) const @@ -272,7 +259,6 @@ FileAccPropList::setFamily(hsize_t memb_size, const FileAccPropList &memb_plist) ///\param memb_plist - OUT: Retrieved file access property list for each /// file member ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::getFamily(hsize_t &memb_size, FileAccPropList &memb_plist) const @@ -293,7 +279,6 @@ FileAccPropList::getFamily(hsize_t &memb_size, FileAccPropList &memb_plist) cons ///\param memb_size - OUT: Size in bytes of each file member ///\return The file access property list for each file member ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- FileAccPropList FileAccPropList::getFamily(hsize_t &memb_size) const @@ -319,7 +304,6 @@ FileAccPropList::getFamily(hsize_t &memb_size) const ///\par Description /// For information, please refer to the H5Pset_fapl_split API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::setSplit(const FileAccPropList &meta_plist, const FileAccPropList &raw_plist, @@ -342,7 +326,6 @@ FileAccPropList::setSplit(const FileAccPropList &meta_plist, const FileAccPropLi ///\param meta_ext - IN: Metadata filename extension as \c H5std_string ///\param raw_ext - IN: Raw data filename extension as \c H5std_string ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::setSplit(const FileAccPropList &meta_plist, const FileAccPropList &raw_plist, @@ -361,7 +344,6 @@ FileAccPropList::setSplit(const FileAccPropList &meta_plist, const FileAccPropLi /// property from this property list. ///\return Data sieve buffer size, in bytes ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- size_t FileAccPropList::getSieveBufSize() const @@ -382,7 +364,6 @@ FileAccPropList::getSieveBufSize() const ///\par Description /// For more detail, please refer to the H5Pset_sieve_buf_size /// API in the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::setSieveBufSize(size_t bufsize) const @@ -402,7 +383,6 @@ FileAccPropList::setSieveBufSize(size_t bufsize) const ///\par Description /// For information, please refer to the H5Pset_meta_block_size /// API in the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::setMetaBlockSize(hsize_t &block_size) const @@ -418,7 +398,6 @@ FileAccPropList::setMetaBlockSize(hsize_t &block_size) const ///\brief Returns the current metadata block size setting. ///\return Metadata block size ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- hsize_t FileAccPropList::getMetaBlockSize() const @@ -442,7 +421,6 @@ FileAccPropList::getMetaBlockSize() const ///\par Description /// For information, please refer to the H5Pset_fapl_log API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::setLog(const char *logfile, unsigned flags, size_t buf_size) const @@ -461,7 +439,6 @@ FileAccPropList::setLog(const char *logfile, unsigned flags, size_t buf_size) co ///\param logfile - IN: Name of the log file - string ///\param flags - IN: Flags specifying the types of logging activity ///\param buf_size - IN: Size of the logging buffer -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::setLog(const H5std_string &logfile, unsigned flags, size_t buf_size) const @@ -475,7 +452,6 @@ FileAccPropList::setLog(const H5std_string &logfile, unsigned flags, size_t buf_ /// driver. /// ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::setSec2() const @@ -500,7 +476,6 @@ FileAccPropList::setSec2() const /// /// For more detail, please refer to the H5Pset_alignment API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FileAccPropList::setAlignment(hsize_t threshold, hsize_t alignment) const @@ -518,7 +493,6 @@ FileAccPropList::setAlignment(hsize_t threshold, hsize_t alignment) const ///\param threshold - OUT: Retrieved threshold value for file object size ///\param alignment - OUT: Retrieved alignment value ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FileAccPropList::getAlignment(hsize_t &threshold, hsize_t &alignment) const @@ -537,7 +511,6 @@ FileAccPropList::getAlignment(hsize_t &threshold, hsize_t &alignment) const ///\par Description /// For information, please refer to the H5Pset_multi_type API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::setMultiType(H5FD_mem_t dtype) const @@ -556,7 +529,6 @@ FileAccPropList::setMultiType(H5FD_mem_t dtype) const ///\par Description /// For information, please refer to the H5Pget_multi_type API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- H5FD_mem_t FileAccPropList::getMultiType() const @@ -584,7 +556,6 @@ FileAccPropList::getMultiType() const /// means fully read chunks are treated no differently than other /// chunks (the preemption is strictly LRU) while a value of one /// means fully read chunks are always preempted before other chunks. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FileAccPropList::setCache(int mdc_nelmts, size_t rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0) const @@ -603,7 +574,6 @@ FileAccPropList::setCache(int mdc_nelmts, size_t rdcc_nelmts, size_t rdcc_nbytes ///\param rdcc_nbytes - OUT: Total size of the raw data chunk cache, in bytes ///\param rdcc_w0 - OUT: Preemption policy ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FileAccPropList::getCache(int &mdc_nelmts, size_t &rdcc_nelmts, size_t &rdcc_nbytes, double &rdcc_w0) const @@ -619,7 +589,6 @@ FileAccPropList::getCache(int &mdc_nelmts, size_t &rdcc_nelmts, size_t &rdcc_nby ///\brief Sets the degree for the file close behavior. ///\param degree - IN: ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void FileAccPropList::setFcloseDegree(H5F_close_degree_t degree) const @@ -635,7 +604,6 @@ FileAccPropList::setFcloseDegree(H5F_close_degree_t degree) const ///\brief Returns the degree for the file close behavior. ///\return The degree for the file close behavior ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- H5F_close_degree_t FileAccPropList::getFcloseDegree() const @@ -657,7 +625,6 @@ FileAccPropList::getFcloseDegree() const ///\par Description /// For information, please refer to the H5Pset_gc_references API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FileAccPropList::setGcReferences(unsigned gc_ref) const @@ -673,7 +640,6 @@ FileAccPropList::setGcReferences(unsigned gc_ref) const ///\brief Returns the garbage collecting references setting. ///\return Garbage collecting references setting, 0 (off) or 1 (on) ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- unsigned FileAccPropList::getGcReferences() const @@ -699,7 +665,6 @@ FileAccPropList::getGcReferences() const ///\par Description /// For information, please refer to the H5Pset_file_locking API in /// the HDF5 C Reference Manual. -// Programmer Dana Robinson - 2020 //-------------------------------------------------------------------------- void FileAccPropList::setFileLocking(hbool_t use_file_locking, hbool_t ignore_when_disabled) const @@ -722,7 +687,6 @@ FileAccPropList::setFileLocking(hbool_t use_file_locking, hbool_t ignore_when_di ///\par Description /// For information, please refer to the H5Pget_file_locking API in /// the HDF5 C Reference Manual. -// Programmer Dana Robinson - 2020 //-------------------------------------------------------------------------- void FileAccPropList::getFileLocking(hbool_t &use_file_locking, hbool_t &ignore_when_disabled) const @@ -760,7 +724,6 @@ FileAccPropList::getFileLocking(hbool_t &use_file_locking, hbool_t &ignore_when_ /// /// For more detail, please refer to the H5Pset_libver_bounds API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - March, 2015 //-------------------------------------------------------------------------- void FileAccPropList::setLibverBounds(H5F_libver_t libver_low, H5F_libver_t libver_high) const @@ -796,7 +759,6 @@ FileAccPropList::setLibverBounds(H5F_libver_t libver_low, H5F_libver_t libver_hi /// \li \c H5F_LIBVER_112 /// \li \c H5F_LIBVER_114 /// \li \c H5F_LIBVER_LATEST -// Programmer Binh-Minh Ribler - March, 2015 //-------------------------------------------------------------------------- void FileAccPropList::getLibverBounds(H5F_libver_t &libver_low, H5F_libver_t &libver_high) const @@ -810,7 +772,6 @@ FileAccPropList::getLibverBounds(H5F_libver_t &libver_low, H5F_libver_t &libver_ //-------------------------------------------------------------------------- // Function: FileAccPropList destructor ///\brief Noop destructor -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FileAccPropList::~FileAccPropList() { diff --git a/c++/src/H5FcreatProp.cpp b/c++/src/H5FcreatProp.cpp index 3b8fd94..fe46dee 100644 --- a/c++/src/H5FcreatProp.cpp +++ b/c++/src/H5FcreatProp.cpp @@ -36,7 +36,6 @@ FileCreatPropList *FileCreatPropList::DEFAULT_ = 0; // Description // If FileCreatPropList::DEFAULT_ already points to an allocated // object, throw a PropListIException. This scenario should not happen. -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- FileCreatPropList * FileCreatPropList::getConstant() @@ -62,7 +61,6 @@ FileCreatPropList::getConstant() // Function: FileCreatPropList::deleteConstants // Purpose Deletes the constant object that FileCreatPropList::DEFAULT_ // points to. -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- void FileCreatPropList::deleteConstants() @@ -80,7 +78,6 @@ const FileCreatPropList &FileCreatPropList::DEFAULT = *getConstant(); //-------------------------------------------------------------------------- // Function: FileCreatPropList default constructor ///\brief Default constructor: Creates a file create property list -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FileCreatPropList::FileCreatPropList() : PropList(H5P_FILE_CREATE) { @@ -91,7 +88,6 @@ FileCreatPropList::FileCreatPropList() : PropList(H5P_FILE_CREATE) ///\brief Copy constructor: same HDF5 object as \a original /// FileCreatPropList object. ///\param original - IN: FileCreatPropList instance to copy -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FileCreatPropList::FileCreatPropList(const FileCreatPropList &original) : PropList(original) { @@ -102,7 +98,6 @@ FileCreatPropList::FileCreatPropList(const FileCreatPropList &original) : PropLi ///\brief Creates a file creation property list using the id of an /// existing one. ///\param plist_id - IN: FileCreatPropList id to use -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FileCreatPropList::FileCreatPropList(const hid_t plist_id) : PropList(plist_id) { @@ -119,7 +114,6 @@ FileCreatPropList::FileCreatPropList(const hid_t plist_id) : PropList(plist_id) ///\exception H5::PropListIException ///\par Description /// Any (or even all) of the output arguments can be null pointers. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FileCreatPropList::getVersion(unsigned &super, unsigned &freelist, unsigned &stab, unsigned &shhdr) const @@ -139,7 +133,6 @@ FileCreatPropList::getVersion(unsigned &super, unsigned &freelist, unsigned &sta ///\par Description /// The default user block size is 0; it may be set to any power /// of 2 equal to 512 or greater (512, 1024, 2048, etc.) -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FileCreatPropList::setUserblock(hsize_t size) const @@ -155,7 +148,6 @@ FileCreatPropList::setUserblock(hsize_t size) const ///\brief Returns the user block size of this file creation property list. ///\return User block size ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- hsize_t FileCreatPropList::getUserblock() const @@ -178,7 +170,6 @@ FileCreatPropList::getUserblock() const ///\par Description /// For information, please refer to the H5Pset_sizes API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FileCreatPropList::setSizes(size_t sizeof_addr, size_t sizeof_size) const @@ -195,7 +186,6 @@ FileCreatPropList::setSizes(size_t sizeof_addr, size_t sizeof_size) const /// HDF5 file. /// ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FileCreatPropList::getSizes(size_t &sizeof_addr, size_t &sizeof_size) const @@ -216,7 +206,6 @@ FileCreatPropList::getSizes(size_t &sizeof_addr, size_t &sizeof_size) const ///\par Description /// For information, please refer to the H5Pset_sym_k API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FileCreatPropList::setSymk(unsigned ik, unsigned lk) const @@ -236,7 +225,6 @@ FileCreatPropList::setSymk(unsigned ik, unsigned lk) const ///\par Description /// For information, please refer to the H5Pget_sym_k API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FileCreatPropList::getSymk(unsigned &ik, unsigned &lk) const @@ -256,7 +244,6 @@ FileCreatPropList::getSymk(unsigned &ik, unsigned &lk) const ///\par Description /// For information, please refer to the H5Pset_istore_k API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FileCreatPropList::setIstorek(unsigned ik) const @@ -275,7 +262,6 @@ FileCreatPropList::setIstorek(unsigned ik) const ///\par Description /// For information, please refer to the H5Pget_istore_k API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- unsigned FileCreatPropList::getIstorek() const @@ -304,7 +290,6 @@ FileCreatPropList::getIstorek() const /// changed and the existing threshold will be retained. /// For information, please refer to the H5Pset_file_space_strategy /// API in the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - Feb, 2017 //-------------------------------------------------------------------------- void FileCreatPropList::setFileSpaceStrategy(H5F_fspace_strategy_t strategy, hbool_t persist, @@ -325,7 +310,6 @@ FileCreatPropList::setFileSpaceStrategy(H5F_fspace_strategy_t strategy, hbool_t ///\param persist - OUT: Whether to persist free-space ///\param threshold - OUT: Free-space section threshold ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - Feb, 2017 //-------------------------------------------------------------------------- void FileCreatPropList::getFileSpaceStrategy(H5F_fspace_strategy_t &strategy, hbool_t &persist, @@ -343,7 +327,6 @@ FileCreatPropList::getFileSpaceStrategy(H5F_fspace_strategy_t &strategy, hbool_t ///\brief Sets the file space page size for paged aggregation. ///\param fsp_psize - IN: Filespace's page size ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - Feb, 2017 //-------------------------------------------------------------------------- void FileCreatPropList::setFileSpacePagesize(hsize_t fsp_psize) const @@ -361,7 +344,6 @@ FileCreatPropList::setFileSpacePagesize(hsize_t fsp_psize) const /// metadata or raw data. ///\return File space page size ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - Feb, 2017 //-------------------------------------------------------------------------- hsize_t FileCreatPropList::getFileSpacePagesize() const @@ -378,7 +360,6 @@ FileCreatPropList::getFileSpacePagesize() const //-------------------------------------------------------------------------- // Function: FileCreatPropList destructor ///\brief Noop destructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FileCreatPropList::~FileCreatPropList() { diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp index 8f1830b..9c390f9 100644 --- a/c++/src/H5File.cpp +++ b/c++/src/H5File.cpp @@ -618,7 +618,6 @@ H5File::getVFDHandle(void **file_handle) const ///\par Description /// This function is called after an existing file is opened in /// order to learn the true size of the underlying file. -// Programmer Raymond Lu - June 24, 2004 //-------------------------------------------------------------------------- hsize_t H5File::getFileSize() const @@ -639,7 +638,6 @@ H5File::getFileSize() const ///\par Description /// This function is called after an existing file is opened in /// order to retrieve the unique 'file number' for the file. -// Programmer Quincey Koziol - April 13, 2019 //-------------------------------------------------------------------------- unsigned long H5File::getFileNum() const diff --git a/c++/src/H5FloatType.cpp b/c++/src/H5FloatType.cpp index 9d43dbf..74170da 100644 --- a/c++/src/H5FloatType.cpp +++ b/c++/src/H5FloatType.cpp @@ -37,7 +37,6 @@ namespace H5 { //-------------------------------------------------------------------------- // Function: FloatType default constructor ///\brief Default constructor: Creates a stub floating-point datatype -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FloatType::FloatType() { @@ -48,7 +47,6 @@ FloatType::FloatType() ///\brief Creates a floating-point datatype using a predefined type. ///\param pred_type - IN: Predefined datatype ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FloatType::FloatType(const PredType &pred_type) : AtomType() { @@ -62,7 +60,6 @@ FloatType::FloatType(const PredType &pred_type) : AtomType() /// datatype. ///\param existing_id - IN: Id of an existing datatype ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FloatType::FloatType(const hid_t existing_id) : AtomType(existing_id) { @@ -71,7 +68,6 @@ FloatType::FloatType(const hid_t existing_id) : AtomType(existing_id) //-------------------------------------------------------------------------- // Function: FloatType copy constructor ///\brief Copy constructor: same HDF5 object as \a original -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FloatType::FloatType(const FloatType &original) : AtomType(original) { @@ -83,7 +79,6 @@ FloatType::FloatType(const FloatType &original) : AtomType(original) ///\param dataset - IN: Dataset that this floating-point datatype /// associates with ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FloatType::FloatType(const DataSet &dataset) : AtomType() { @@ -102,7 +97,6 @@ FloatType::FloatType(const DataSet &dataset) : AtomType() ///\param loc - IN: Location of the type ///\param dtype_name - IN: Float type name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openFloatType(const char*) @@ -121,7 +115,6 @@ FloatType::FloatType(const H5Location &loc, const char *dtype_name) : AtomType() ///\param loc - IN: Location of the type ///\param dtype_name - IN: Float type name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openFloatType(const H5std_string&) @@ -139,7 +132,6 @@ FloatType::FloatType(const H5Location &loc, const H5std_string &dtype_name) : At /// binary object description of this type. /// ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Aug 2017 //-------------------------------------------------------------------------- DataType * FloatType::decode() const @@ -165,7 +157,6 @@ FloatType::decode() const ///\param mpos - OUT: Retrieved mantissa bit-position ///\param msize - OUT: Retrieved size of mantissa, in bits ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FloatType::getFields(size_t &spos, size_t &epos, size_t &esize, size_t &mpos, size_t &msize) const @@ -186,7 +177,6 @@ FloatType::getFields(size_t &spos, size_t &epos, size_t &esize, size_t &mpos, si ///\param mpos - OUT: Mantissa bit-position ///\param msize - OUT: Size of mantissa, in bits ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FloatType::setFields(size_t spos, size_t epos, size_t esize, size_t mpos, size_t msize) const @@ -202,7 +192,6 @@ FloatType::setFields(size_t spos, size_t epos, size_t esize, size_t mpos, size_t ///\brief Retrieves the exponent bias of a floating-point type. ///\return Exponent bias ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- size_t FloatType::getEbias() const @@ -220,7 +209,6 @@ FloatType::getEbias() const ///\brief Sets the exponent bias of a floating-point type. ///\param ebias - Exponent bias value ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FloatType::setEbias(size_t ebias) const @@ -244,7 +232,6 @@ FloatType::setEbias(size_t ebias) const /// For your convenience, this function also provides the text /// string of the returned normalization type, via parameter /// \a norm_string. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5T_norm_t FloatType::getNorm(H5std_string &norm_string) const @@ -273,7 +260,6 @@ FloatType::getNorm(H5std_string &norm_string) const /// \li \c H5T_NORM_IMPLIED (0) - MSB of mantissa is not stored /// \li \c H5T_NORM_MSBSET (1) - MSB of mantissa is always 1 /// \li \c H5T_NORM_NONE (2) - Mantissa is not normalized -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FloatType::setNorm(H5T_norm_t norm) const @@ -297,7 +283,6 @@ FloatType::setNorm(H5T_norm_t norm) const /// For your convenience, this function also provides the text /// string of the returned internal padding type, via parameter /// \a pad_string. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5T_pad_t FloatType::getInpad(H5std_string &pad_string) const @@ -331,7 +316,6 @@ FloatType::getInpad(H5std_string &pad_string) const /// \li \c H5T_PAD_ZERO (0) - Set background to zeros /// \li \c H5T_PAD_ONE (1) - Set background to ones /// \li \c H5T_PAD_BACKGROUND (2) - Leave background alone -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void FloatType::setInpad(H5T_pad_t inpad) const @@ -345,7 +329,6 @@ FloatType::setInpad(H5T_pad_t inpad) const //-------------------------------------------------------------------------- // Function: FloatType destructor ///\brief Noop destructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FloatType::~FloatType() { diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp index 0fe8ff3..35e9d26 100644 --- a/c++/src/H5Group.cpp +++ b/c++/src/H5Group.cpp @@ -43,7 +43,6 @@ using std::endl; //-------------------------------------------------------------------------- // Function: Group default constructor ///\brief Default constructor: creates a stub Group. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Group::Group() : H5Object(), CommonFG(), id(H5I_INVALID_HID) { @@ -53,7 +52,6 @@ Group::Group() : H5Object(), CommonFG(), id(H5I_INVALID_HID) // Function: Group copy constructor ///\brief Copy constructor: same HDF5 object as \a original ///\param original - IN: Original group to copy -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Group::Group(const Group &original) : H5Object(), CommonFG(), id(original.id) { @@ -65,7 +63,6 @@ Group::Group(const Group &original) : H5Object(), CommonFG(), id(original.id) ///\brief Closes an object, which was opened with Group::getObjId /// ///\exception H5::FileIException or H5::GroupIException -// Programmer Binh-Minh Ribler - March, 2017 //-------------------------------------------------------------------------- void Group::closeObjId(hid_t obj_id) const @@ -79,7 +76,6 @@ Group::closeObjId(hid_t obj_id) const //-------------------------------------------------------------------------- // Function: Group::getLocId // Purpose: Get the id of this group -// Programmer Binh-Minh Ribler - 2000 // Description // This function is a redefinition of CommonFG::getLocId. It // is used by CommonFG member functions to get the file id. @@ -98,7 +94,6 @@ Group::getLocId() const // Function: Group overloaded constructor ///\brief Creates a Group object using the id of an existing group. ///\param existing_id - IN: Id of an existing group -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Group::Group(const hid_t existing_id) : H5Object(), CommonFG(), id(existing_id) { @@ -116,7 +111,6 @@ Group::Group(const hid_t existing_id) : H5Object(), CommonFG(), id(existing_id) ///\par Description /// \c obj can be DataSet, Group, or named DataType, that /// is a datatype that has been named by DataType::commit. -// Programmer Binh-Minh Ribler - Oct, 2006 //-------------------------------------------------------------------------- Group::Group(const H5Location &loc, const void *ref, H5R_type_t ref_type, const PropList &plist) : H5Object(), CommonFG(), id(H5I_INVALID_HID) @@ -129,7 +123,6 @@ Group::Group(const H5Location &loc, const void *ref, H5R_type_t ref_type, const ///\brief Returns the number of objects in this group. ///\return Number of objects ///\exception H5::FileIException or H5::GroupIException -// Programmer Binh-Minh Ribler - January, 2003 //-------------------------------------------------------------------------- hsize_t Group::getNumObjs() const @@ -153,7 +146,6 @@ Group::getNumObjs() const /// This function opens an object in a group or file, using /// H5Oopen. Thus, an object can be opened without knowing /// the object's type. -// Programmer Binh-Minh Ribler - March, 2017 //-------------------------------------------------------------------------- hid_t Group::getObjId(const char *obj_name, const PropList &plist) const @@ -173,7 +165,6 @@ Group::getObjId(const char *obj_name, const PropList &plist) const ///\param plist - IN: Access property list for the link pointing to /// the object ///\exception H5::FileIException or H5::GroupIException -// Programmer Binh-Minh Ribler - March, 2017 //-------------------------------------------------------------------------- hid_t Group::getObjId(const H5std_string &obj_name, const PropList &plist) const @@ -191,7 +182,6 @@ Group::getObjId(const H5std_string &obj_name, const PropList &plist) const // 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 //-------------------------------------------------------------------------- hid_t Group::getId() const @@ -210,7 +200,6 @@ Group::getId() const // The underlying reference counting in the C library ensures // that the current valid id of this object is properly closed. // Then the object's id is reset to the new id. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void Group::p_setId(const hid_t new_id) @@ -232,7 +221,6 @@ Group::p_setId(const hid_t new_id) ///\brief Closes this group. /// ///\exception H5::GroupIException -// Programmer Binh-Minh Ribler - Mar 9, 2005 //-------------------------------------------------------------------------- void Group::close() @@ -258,7 +246,6 @@ Group::close() // proper exception can be thrown for file or group. The // "Group::" will be inserted to indicate the function called is // an implementation of Group. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void Group::throwException(const H5std_string &func_name, const H5std_string &msg) const @@ -271,7 +258,6 @@ Group::throwException(const H5std_string &func_name, const H5std_string &msg) co //-------------------------------------------------------------------------- // Function: Group destructor ///\brief Properly terminates access to this group. -// Programmer Binh-Minh Ribler - 2000 // Modification // - Replaced resetIdComponent() with decRefCount() to use C // library ID reference counting mechanism - BMR, Feb 20, 2005 diff --git a/c++/src/H5IdComponent.cpp b/c++/src/H5IdComponent.cpp index d6dc6ad..93df343 100644 --- a/c++/src/H5IdComponent.cpp +++ b/c++/src/H5IdComponent.cpp @@ -34,7 +34,6 @@ bool IdComponent::H5dontAtexit_called = false; //-------------------------------------------------------------------------- // Function: IdComponent::incRefCount ///\brief Increment reference counter for a given id. -// Programmer Binh-Minh Ribler - May 2005 //-------------------------------------------------------------------------- void IdComponent::incRefCount(const hid_t obj_id) const @@ -47,7 +46,6 @@ IdComponent::incRefCount(const hid_t obj_id) const //-------------------------------------------------------------------------- // Function: IdComponent::incRefCount ///\brief Increment reference counter for the id of this object. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void IdComponent::incRefCount() const @@ -58,7 +56,6 @@ IdComponent::incRefCount() const //-------------------------------------------------------------------------- // Function: IdComponent::decRefCount ///\brief Decrement reference counter for a given id. -// Programmer Binh-Minh Ribler - May 2005 // Modification: // Added the check for ref counter to give a little more info // on why H5Idec_ref fails in some cases - BMR 5/19/2005 @@ -78,7 +75,6 @@ IdComponent::decRefCount(const hid_t obj_id) const //-------------------------------------------------------------------------- // Function: IdComponent::decRefCount ///\brief Decrement reference counter for the id of this object. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void IdComponent::decRefCount() const @@ -90,7 +86,6 @@ IdComponent::decRefCount() const // Function: IdComponent::getCounter ///\brief Returns the reference counter for a given id. ///\return Reference count -// Programmer Binh-Minh Ribler - May 2005 //-------------------------------------------------------------------------- int IdComponent::getCounter(const hid_t obj_id) const @@ -109,7 +104,6 @@ IdComponent::getCounter(const hid_t obj_id) const // Function: IdComponent::getCounter ///\brief Returns the reference counter for the id of this object. ///\return Reference count -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- int IdComponent::getCounter() const @@ -129,7 +123,6 @@ IdComponent::getCounter() const /// \li \c H5I_ATTR /// \li or \c H5I_BADID, if no valid type can be determined or the /// input object id is invalid. -// Programmer Binh-Minh Ribler - Jul, 2005 //-------------------------------------------------------------------------- H5I_type_t IdComponent::getHDFObjType(const hid_t obj_id) @@ -156,7 +149,6 @@ IdComponent::getHDFObjType(const hid_t obj_id) /// \li \c H5I_ATTR /// \li or \c H5I_BADID, if no valid type can be determined or the /// input object id is invalid. -// Programmer Binh-Minh Ribler - Mar, 2014 //-------------------------------------------------------------------------- H5I_type_t IdComponent::getHDFObjType() const @@ -184,7 +176,6 @@ IdComponent::getHDFObjType() const /// \li \c H5I_ERROR_CLASS /// \li \c H5I_ERROR_MSG /// \li \c H5I_ERROR_STACK -// Programmer Binh-Minh Ribler - Feb, 2017 //-------------------------------------------------------------------------- hsize_t IdComponent::getNumMembers(H5I_type_t type) @@ -204,7 +195,6 @@ IdComponent::getNumMembers(H5I_type_t type) ///\par Description /// A valid ID is one that is in use and has an application /// reference count of at least 1. -// Programmer Binh-Minh Ribler - Mar 1, 2017 //-------------------------------------------------------------------------- bool IdComponent::isValid(hid_t an_id) @@ -239,7 +229,6 @@ IdComponent::isValid(hid_t an_id) /// \li \c H5I_ERROR_CLASS /// \li \c H5I_ERROR_MSG /// \li \c H5I_ERROR_STACK -// Programmer Binh-Minh Ribler - Feb, 2017 //-------------------------------------------------------------------------- bool IdComponent::typeExists(H5I_type_t type) @@ -270,7 +259,6 @@ IdComponent::typeExists(H5I_type_t type) // 2010/5/9 - BMR // Removed close() and incRefCount() because setId/p_setId takes // care of close() and setId takes care incRefCount(). -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- IdComponent & IdComponent::operator=(const IdComponent &rhs) @@ -298,7 +286,6 @@ IdComponent::operator=(const IdComponent &rhs) // Description: // p_setId ensures that the current valid id of this object is // properly closed before resetting the object's id to the new id. -// Programmer Binh-Minh Ribler - 2000 // Modification // 2008/7/23 - BMR // Changed all subclasses' setId to p_setId and put back setId @@ -323,7 +310,6 @@ IdComponent::setId(const hid_t new_id) //-------------------------------------------------------------------------- // Function: IdComponent destructor ///\brief Noop destructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- IdComponent::~IdComponent() { @@ -345,7 +331,6 @@ IdComponent::~IdComponent() /// where the failure occurs. The class-name is provided by /// fromClass(). This string will be used by a base class when /// an exception is thrown. -// Programmer Binh-Minh Ribler - Aug 6, 2005 //-------------------------------------------------------------------------- H5std_string IdComponent::inMemFunc(const char *func_name) const @@ -359,7 +344,6 @@ IdComponent::inMemFunc(const char *func_name) const //-------------------------------------------------------------------------- // Function: IdComponent default constructor - private ///\brief Default constructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- IdComponent::IdComponent() { @@ -381,7 +365,6 @@ IdComponent::IdComponent() // September 2017 // This function should be moved to H5Location now that Attribute // inherits from H5Location. -// Programmer Binh-Minh Ribler - Jul, 2004 //-------------------------------------------------------------------------- H5std_string IdComponent::p_get_file_name() const @@ -427,7 +410,6 @@ IdComponent::p_get_file_name() const // Purpose Verifies that the given id is a valid id so it can be passed // into an H5I C function. // Return true if id is valid, false, otherwise -// Programmer Binh-Minh Ribler - May, 2005 //-------------------------------------------------------------------------- bool IdComponent::p_valid_id(const hid_t obj_id) diff --git a/c++/src/H5IntType.cpp b/c++/src/H5IntType.cpp index 194ae21..87a287f 100644 --- a/c++/src/H5IntType.cpp +++ b/c++/src/H5IntType.cpp @@ -37,7 +37,6 @@ namespace H5 { //-------------------------------------------------------------------------- // Function: IntType default constructor ///\brief Default constructor: Creates a stub integer datatype -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- IntType::IntType() { @@ -46,7 +45,6 @@ IntType::IntType() //-------------------------------------------------------------------------- // Function: IntType copy constructor ///\brief Copy constructor: same HDF5 object as \a original -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- IntType::IntType(const IntType &original) : AtomType(original) { @@ -57,7 +55,6 @@ IntType::IntType(const IntType &original) : AtomType(original) ///\brief Creates a integer type using a predefined type ///\param pred_type - IN: Predefined datatype ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- IntType::IntType(const PredType &pred_type) : AtomType() { @@ -71,7 +68,6 @@ IntType::IntType(const PredType &pred_type) : AtomType() /// datatype. ///\param existing_id - IN: Id of an existing datatype ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- IntType::IntType(const hid_t existing_id) : AtomType(existing_id) { @@ -82,7 +78,6 @@ IntType::IntType(const hid_t existing_id) : AtomType(existing_id) ///\brief Gets the integer datatype of the specified dataset. ///\param dataset - IN: Dataset that this integer datatype associates with ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- IntType::IntType(const DataSet &dataset) : AtomType() { @@ -101,7 +96,6 @@ IntType::IntType(const DataSet &dataset) : AtomType() ///\param loc - IN: Location of the type ///\param dtype_name - IN: Integer type name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openIntType(const char*) to @@ -120,7 +114,6 @@ IntType::IntType(const H5Location &loc, const char *dtype_name) : AtomType() ///\param loc - IN: Location of the type ///\param dtype_name - IN: Integer type name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openIntType(const H5std_string&) @@ -138,7 +131,6 @@ IntType::IntType(const H5Location &loc, const H5std_string &dtype_name) : AtomTy /// binary object description of this type. /// ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Aug 2017 //-------------------------------------------------------------------------- DataType * IntType::decode() const @@ -160,7 +152,6 @@ IntType::decode() const ///\brief Retrieves the sign type for an integer type. ///\return Valid sign type ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5T_sign_t IntType::getSign() const @@ -180,7 +171,6 @@ IntType::getSign() const ///\brief Sets the sign property for an integer type. ///\param sign - IN: Sign type ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void IntType::setSign(H5T_sign_t sign) const @@ -195,7 +185,6 @@ IntType::setSign(H5T_sign_t sign) const //-------------------------------------------------------------------------- // Function: IntType destructor ///\brief Noop destructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- IntType::~IntType() { diff --git a/c++/src/H5LaccProp.cpp b/c++/src/H5LaccProp.cpp index 7c63bd0..0285ee7 100644 --- a/c++/src/H5LaccProp.cpp +++ b/c++/src/H5LaccProp.cpp @@ -37,7 +37,6 @@ LinkAccPropList *LinkAccPropList::DEFAULT_ = 0; // If LinkAccPropList::DEFAULT_ already points to an allocated // object, throw a PropListIException. This scenario should not // happen. -// Programmer Binh-Minh Ribler - December, 2016 //-------------------------------------------------------------------------- LinkAccPropList * LinkAccPropList::getConstant() @@ -64,7 +63,6 @@ LinkAccPropList::getConstant() // Purpose: Deletes the constant object that LinkAccPropList::DEFAULT_ // points to. // exception H5::PropListIException -// Programmer Binh-Minh Ribler - December, 2016 //-------------------------------------------------------------------------- void LinkAccPropList::deleteConstants() @@ -82,7 +80,6 @@ const LinkAccPropList &LinkAccPropList::DEFAULT = *getConstant(); //-------------------------------------------------------------------------- // Function: Default Constructor ///\brief Creates a file access property list -// Programmer Binh-Minh Ribler - December, 2016 //-------------------------------------------------------------------------- LinkAccPropList::LinkAccPropList() : PropList(H5P_LINK_ACCESS) { @@ -92,7 +89,6 @@ LinkAccPropList::LinkAccPropList() : PropList(H5P_LINK_ACCESS) // Function: LinkAccPropList copy constructor ///\brief Copy Constructor: same HDF5 object as \a original ///\param original - IN: LinkAccPropList instance to copy -// Programmer Binh-Minh Ribler - December, 2016 //-------------------------------------------------------------------------- LinkAccPropList::LinkAccPropList(const LinkAccPropList &original) : PropList(original) { @@ -102,7 +98,6 @@ LinkAccPropList::LinkAccPropList(const LinkAccPropList &original) : PropList(ori // Function: LinkAccPropList overloaded constructor ///\brief Creates a file access property list using the id of an /// existing one. -// Programmer Binh-Minh Ribler - December, 2016 //-------------------------------------------------------------------------- LinkAccPropList::LinkAccPropList(const hid_t plist_id) : PropList(plist_id) { @@ -115,7 +110,6 @@ LinkAccPropList::LinkAccPropList(const hid_t plist_id) : PropList(plist_id) /// traversal. /// ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - March 1, 2017 //-------------------------------------------------------------------------- void LinkAccPropList::setNumLinks(size_t nlinks) const @@ -133,7 +127,6 @@ LinkAccPropList::setNumLinks(size_t nlinks) const /// traversed before a failure occurs. /// ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - March 1, 2017 //-------------------------------------------------------------------------- size_t LinkAccPropList::getNumLinks() const @@ -150,7 +143,6 @@ LinkAccPropList::getNumLinks() const //-------------------------------------------------------------------------- // Function: LinkAccPropList destructor ///\brief Noop destructor -// Programmer Binh-Minh Ribler - December, 2016 //-------------------------------------------------------------------------- LinkAccPropList::~LinkAccPropList() { diff --git a/c++/src/H5Library.cpp b/c++/src/H5Library.cpp index 5a94a9e..019ae67 100644 --- a/c++/src/H5Library.cpp +++ b/c++/src/H5Library.cpp @@ -41,7 +41,6 @@ namespace H5 { ///\brief Initializes the HDF5 library. /// ///\exception H5::LibraryIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void H5Library::open() @@ -57,7 +56,6 @@ H5Library::open() ///\brief Flushes all data to disk, closes files, and cleans up memory. /// ///\exception H5::LibraryIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void H5Library::close() @@ -73,7 +71,6 @@ H5Library::close() ///\brief Instructs library not to install the C \c atexit cleanup routine /// ///\exception H5::LibraryIException -// Programmer Binh-Minh Ribler - 2000 // Modification // Removed the check for failure returned from H5dont_atexit. // will be fixed to not fail (HDFFV-9540) @@ -91,7 +88,6 @@ H5Library::dontAtExit() ///\param minnum - OUT: Minor version of the library ///\param relnum - OUT: Release number of the library ///\exception H5::LibraryIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void H5Library::getLibVersion(unsigned &majnum, unsigned &minnum, unsigned &relnum) @@ -113,7 +109,6 @@ H5Library::getLibVersion(unsigned &majnum, unsigned &minnum, unsigned &relnum) ///\par Description /// For information about library version, please refer to /// the H5check_version API in the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void H5Library::checkVersion(unsigned majnum, unsigned minnum, unsigned relnum) @@ -142,7 +137,6 @@ H5Library::checkVersion(unsigned majnum, unsigned minnum, unsigned relnum) ///\par /// The library automatically garbage collects all the free /// lists when the application ends. -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- void H5Library::garbageCollect() @@ -166,7 +160,6 @@ H5Library::garbageCollect() // for global constants ///\exception H5::LibraryIException // -// Programmer Binh-Minh Ribler - September, 2015 //-------------------------------------------------------------------------- void H5Library::initH5cpp() @@ -236,7 +229,6 @@ H5Library::initH5cpp() ///\brief Sends request for the C layer to terminate. ///\par Description /// If the C library fails to terminate, exit with a failure. -// Programmer Binh-Minh Ribler - September, 2015 //-------------------------------------------------------------------------- void H5Library::termH5cpp() @@ -261,7 +253,6 @@ H5Library::termH5cpp() /// Setting a value of -1 for a limit means no limit of that type. /// For more information on free list limits, please refer to /// the H5set_free_list_limits API in the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- void H5Library::setFreeListLimits(int reg_global_lim, int reg_list_lim, int arr_global_lim, int arr_list_lim, @@ -278,7 +269,6 @@ H5Library::setFreeListLimits(int reg_global_lim, int reg_list_lim, int arr_globa //-------------------------------------------------------------------------- // Function: H5Library default constructor - private ///\brief Default constructor: Creates a stub H5Library object -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5Library::H5Library() { @@ -287,7 +277,6 @@ H5Library::H5Library() //-------------------------------------------------------------------------- // Function: H5Library destructor ///\brief Noop destructor -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5Library::~H5Library() { diff --git a/c++/src/H5Location.cpp b/c++/src/H5Location.cpp index 29714f5..8befefc 100644 --- a/c++/src/H5Location.cpp +++ b/c++/src/H5Location.cpp @@ -41,7 +41,6 @@ namespace H5 { #ifndef DOXYGEN_SHOULD_SKIP_THIS //-------------------------------------------------------------------------- // Function: H5Location default constructor (protected) -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5Location::H5Location() : IdComponent() { @@ -52,7 +51,6 @@ H5Location::H5Location() : IdComponent() // Purpose Creates an H5Location object using the id of an existing HDF5 // object. // Parameters object_id - IN: Id of an existing HDF5 object -// Programmer Binh-Minh Ribler - 2000 // *** Deprecation warning *** // This constructor is no longer appropriate because the data member "id" had @@ -68,7 +66,6 @@ H5Location::H5Location() : IdComponent() // Purpose This noop copy constructor is removed as a result of the data // member "id" being moved down to sub-classes. (Mar 2015) ///\param original - IN: H5Location instance to copy -// Programmer Binh-Minh Ribler - 2000 // // *** Deprecation warning *** // This constructor is no longer appropriate because the data member "id" had @@ -124,7 +121,6 @@ H5Location::nameExists(const H5std_string &name, const LinkAccPropList &lapl) co ///\param name - IN: Searched name ///\param lapl - IN: Link access property list ///\exception H5::LocationException -// Programmer Binh-Minh Ribler - Nov, 2016 // Modification // Renamed to nameExists() in 1.10.2 -BMR //-------------------------------------------------------------------------- @@ -141,7 +137,6 @@ H5Location::exists(const char *name, const LinkAccPropList &lapl) const ///\param name - IN: Searched name ///\param lapl - IN: Link access property list ///\exception H5::LocationException -// Programmer Binh-Minh Ribler - Dec, 2016 // Modification // Renamed to nameExists() in 1.10.2 -BMR //-------------------------------------------------------------------------- @@ -161,7 +156,6 @@ H5Location::exists(const H5std_string &name, const LinkAccPropList &lapl) const ///\exception H5::LocationException ///\par Description /// This location is used to identify the file to be flushed. -// Programmer Binh-Minh Ribler - 2012 // Modification // Sep 2012 - BMR // Moved from H5File/H5Object @@ -181,7 +175,6 @@ H5Location::flush(H5F_scope_t scope) const /// location belongs. ///\return File name ///\exception H5::LocationException -// Programmer Binh-Minh Ribler - Jul, 2004 //-------------------------------------------------------------------------- H5std_string H5Location::getFileName() const @@ -207,7 +200,6 @@ H5Location::getFileName() const /// strings. They can be attached to any object that has an /// object header, e.g., data sets, groups, named data types, /// and data spaces, but not symbolic links. -// Programmer Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013) // Modification // 2007: QAK modified to use H5O APIs; however the first parameter is // no longer just file or group, this function should be moved @@ -227,7 +219,6 @@ H5Location::setComment(const char *name, const char *comment) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name and \a comment. -// Programmer Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013) //-------------------------------------------------------------------------- void H5Location::setComment(const H5std_string &name, const H5std_string &comment) const @@ -240,7 +231,6 @@ H5Location::setComment(const H5std_string &name, const H5std_string &comment) co ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it doesn't take /// an object name. -// Programmer Binh-Minh Ribler - Sep 2013 //-------------------------------------------------------------------------- void H5Location::setComment(const char *comment) const @@ -255,7 +245,6 @@ H5Location::setComment(const char *comment) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a comment. -// Programmer Binh-Minh Ribler - Sep 2013 //-------------------------------------------------------------------------- void H5Location::setComment(const H5std_string &comment) const @@ -268,7 +257,6 @@ H5Location::setComment(const H5std_string &comment) const ///\brief Removes the comment from an object specified by its name. ///\param name - IN: Name of the object ///\exception H5::LocationException -// Programmer Binh-Minh Ribler - May 2005 (moved from CommonFG, Sep 2013) // 2007: QAK modified to use H5O APIs; however the first parameter is // no longer just file or group, this function should be moved // to another class to accommodate attribute, dataset, and named @@ -287,7 +275,6 @@ H5Location::removeComment(const char *name) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - May 2005 (moved from CommonFG, Sep 2013) //-------------------------------------------------------------------------- void H5Location::removeComment(const H5std_string &name) const @@ -308,7 +295,6 @@ H5Location::removeComment(const H5std_string &name) const /// including the null terminator. Thus, if the actual length /// of the comment is more than buf_size-1, the retrieved comment /// will be truncated to accommodate the null terminator. -// Programmer Binh-Minh Ribler - Mar 2014 //-------------------------------------------------------------------------- ssize_t H5Location::getComment(const char *name, size_t buf_size, char *comment) const @@ -339,7 +325,6 @@ H5Location::getComment(const char *name, size_t buf_size, char *comment) const ///\param buf_size - IN: Length of the comment to retrieve, default to 0 ///\return Comment string ///\exception H5::LocationException -// Programmer Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013) //-------------------------------------------------------------------------- H5std_string H5Location::getComment(const char *name, size_t buf_size) const @@ -390,7 +375,6 @@ H5Location::getComment(const char *name, size_t buf_size) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013) //-------------------------------------------------------------------------- H5std_string H5Location::getComment(const H5std_string &name, size_t buf_size) const @@ -408,7 +392,6 @@ H5Location::getComment(const H5std_string &name, size_t buf_size) const // dataspace - IN: Dataspace with selection // ref_type - IN: Type of reference; default to \c H5R_DATASET_REGION // Exception H5::ReferenceException -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- void H5Location::p_reference(void *ref, const char *name, hid_t space_id, H5R_type_t ref_type) const @@ -433,7 +416,6 @@ H5Location::p_reference(void *ref, const char *name, hid_t space_id, H5R_type_t /// reference. (default) ///\exception H5::ReferenceException ///\note This method is more suitable for a dataset region reference. -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- void H5Location::reference(void *ref, const char *name, const DataSpace &dataspace, H5R_type_t ref_type) const @@ -460,7 +442,6 @@ H5Location::reference(void *ref, const char *name, const DataSpace &dataspace, H /// reference. (default) ///\exception H5::ReferenceException ///\note This method is more suitable for a dataset region reference. -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- void H5Location::reference(void *ref, const H5std_string &name, const DataSpace &dataspace, @@ -486,7 +467,6 @@ H5Location::reference(void *ref, const H5std_string &name, const DataSpace &data /// \li \c H5R_DATASET_REGION - Reference is a dataset region ///\exception H5::ReferenceException ///\note This method is more suitable for an object reference. -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- void H5Location::reference(void *ref, const char *name, H5R_type_t ref_type) const @@ -510,7 +490,6 @@ H5Location::reference(void *ref, const char *name, H5R_type_t ref_type) const /// \li \c H5R_OBJECT - Reference is an object reference (default) /// \li \c H5R_DATASET_REGION - Reference is a dataset region ///\note This method is more suitable for an object reference. -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- void H5Location::reference(void *ref, const H5std_string &name, H5R_type_t ref_type) const @@ -530,7 +509,6 @@ H5Location::reference(void *ref, const H5std_string &name, H5R_type_t ref_type) // plist - IN: Property list - default to PropList::DEFAULT // from_func - IN: Name of the calling function // Exception H5::ReferenceException -// Programmer Binh-Minh Ribler - Oct, 2006 //-------------------------------------------------------------------------- hid_t H5Location::p_dereference(hid_t loc_id, const void *ref, H5R_type_t ref_type, const PropList &plist, @@ -559,7 +537,6 @@ H5Location::p_dereference(hid_t loc_id, const void *ref, H5R_type_t ref_type, co ///\param ref_type - IN: Reference type ///\param plist - IN: Property list - default to PropList::DEFAULT ///\exception H5::ReferenceException -// Programmer Binh-Minh Ribler - Oct, 2006 //-------------------------------------------------------------------------- void H5Location::dereference(const H5Location &loc, const void *ref, H5R_type_t ref_type, const PropList &plist) @@ -575,7 +552,6 @@ H5Location::dereference(const H5Location &loc, const void *ref, H5R_type_t ref_t // param ref_type - IN: Reference type // param plist - IN: Property list - default to PropList::DEFAULT // exception H5::ReferenceException -// Programmer Binh-Minh Ribler - Oct, 2006 // Modification // Mar, 2017 // Removed in 1.10.1 because H5Location is Attribute's baseclass @@ -604,7 +580,6 @@ plist) /// \li \c H5G_LINK - Object is a symbolic link. /// \li \c H5G_UDLINK - Object is a user-defined link. ///\exception H5::ReferenceException -// Programmer Binh-Minh Ribler - May, 2004 // Modification // Sep 2012: Moved up from H5File, Group, DataSet, and DataType //-------------------------------------------------------------------------- @@ -634,7 +609,6 @@ H5Location::getObjType(void *ref, H5R_type_t ref_type) const // H5G_LINK \tObject is a symbolic link. // H5G_UDLINK \tObject is a user-defined link. // Exception H5::ReferenceException -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- H5G_obj_t H5Location::p_get_obj_type(void *ref, H5R_type_t ref_type) const @@ -663,7 +637,6 @@ H5Location::p_get_obj_type(void *ref, H5R_type_t ref_type) const /// \li \c H5O_TYPE_NAMED_DATATYPE - Object is a named datatype /// \li \c H5O_TYPE_NTYPES - Number of different object types ///\exception H5::ReferenceException -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- H5O_type_t H5Location::getRefObjType(void *ref, H5R_type_t ref_type) const @@ -690,7 +663,6 @@ H5Location::getRefObjType(void *ref, H5R_type_t ref_type) const // H5O_TYPE_NAMED_DATATYPE - Object is a named datatype // H5O_TYPE_NTYPES - Number of object types // Exception H5::ReferenceException -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- H5O_type_t H5Location::p_get_ref_obj_type(void *ref, H5R_type_t ref_type) const @@ -715,7 +687,6 @@ H5Location::p_get_ref_obj_type(void *ref, H5R_type_t ref_type) const // to H5R_DATASET_REGION ///\return DataSpace object ///\exception H5::ReferenceException -// Programmer Binh-Minh Ribler - May, 2004 // Modification // Mar 29, 2015 // Used friend function to set id for DataSpace instead of the @@ -785,7 +756,6 @@ H5Location::getRegion(void *ref, H5R_type_t ref_type) const /// reserve for storing the names that will appear in this new /// group. If a non-positive value is provided for the \a size_hint /// then a default size is chosen. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Group H5Location::createGroup(const char *name, const LinkCreatPropList &lcpl) const @@ -810,7 +780,6 @@ H5Location::createGroup(const char *name, const LinkCreatPropList &lcpl) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Group H5Location::createGroup(const H5std_string &name, const LinkCreatPropList &lcpl) const @@ -832,7 +801,6 @@ H5Location::createGroup(const H5std_string &name, const LinkCreatPropList &lcpl) /// reserve for storing the names that will appear in this new /// group. If a non-positive value is provided for the \a size_hint /// then a default size is chosen. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Group H5Location::createGroup(const char *name, size_t size_hint) const @@ -876,7 +844,6 @@ H5Location::createGroup(const char *name, size_t size_hint) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Group H5Location::createGroup(const H5std_string &name, size_t size_hint) const @@ -891,7 +858,6 @@ H5Location::createGroup(const H5std_string &name, size_t size_hint) const ///\param name - IN: Name of the group to open ///\return Group instance ///\exception H5::FileIException/H5::GroupIException/H5::LocationException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Group H5Location::openGroup(const char *name) const @@ -917,7 +883,6 @@ H5Location::openGroup(const char *name) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Group H5Location::openGroup(const H5std_string &name) const @@ -1184,7 +1149,6 @@ H5Location::link(const H5std_string &curr_name, const hid_t same_loc, const H5st /// For information on creating hard link and soft link, please /// refer to the H5Lcreate_hard and H5Lcreate_soft APIs in the /// HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 // Modification // 2007: QAK modified to use H5L APIs - BMR // Mar 2018: Inadequate functionality, new hard link is only in @@ -1222,7 +1186,6 @@ H5Location::link(H5L_type_t link_type, const char *curr_name, const char *new_na ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a curr_name and \a new_name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void H5Location::link(H5L_type_t link_type, const H5std_string &curr_name, const H5std_string &new_name) const @@ -1732,7 +1695,6 @@ H5Location::getObjinfo(const char *name, hbool_t follow_link, H5G_stat_t &statbu ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void H5Location::getObjinfo(const H5std_string &name, hbool_t follow_link, H5G_stat_t &statbuf) const @@ -1760,7 +1722,6 @@ H5Location::getObjinfo(const char *name, H5G_stat_t &statbuf) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - Nov, 2005 //-------------------------------------------------------------------------- void H5Location::getObjinfo(const H5std_string &name, H5G_stat_t &statbuf) const @@ -1852,7 +1813,6 @@ H5Location::getLinkval(const char *name, size_t size) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5std_string H5Location::getLinkval(const H5std_string &name, size_t size) const @@ -1867,7 +1827,6 @@ H5Location::getLinkval(const H5std_string &name, size_t size) const ///\param child - IN: File to mount ///\param plist - IN: Property list to use ///\exception H5::FileIException or H5::GroupIException -// Programmer Binh-Minh Ribler - 2014 (original 2000) //-------------------------------------------------------------------------- void H5Location::mount(const char *name, const H5File &child, const PropList &plist) const @@ -1893,7 +1852,6 @@ H5Location::mount(const char *name, const H5File &child, const PropList &plist) // Param child - IN: File to mount // Param plist - IN: Property list to use // Exception H5::FileIException or H5::GroupIException -// Programmer Binh-Minh Ribler - 2000 // Modification // Modified to call its replacement. -BMR, 2014/04/16 // Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0 @@ -1908,7 +1866,6 @@ H5Location::mount(const char *name, const H5File &child, const PropList &plist) // Function: H5Location::mount ///\brief This is an overloaded member function, provided for convenience. /// It takes an \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void H5Location::mount(const H5std_string &name, const H5File &child, const PropList &plist) const @@ -1921,7 +1878,6 @@ H5Location::mount(const H5std_string &name, const H5File &child, const PropList // Purpose This is an overloaded member function, kept for backward // compatibility. It differs from the above function in that it // misses const's. This wrapper will be removed in future release. -// Programmer Binh-Minh Ribler - 2014 // Modification // Modified to call its replacement. -BMR, 2014/04/16 // Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0 @@ -1937,7 +1893,6 @@ H5Location::mount(const H5std_string &name, const H5File &child, const PropList ///\brief Unmounts the specified file. ///\param name - IN: Name of the file to unmount ///\exception H5::FileIException/H5::GroupIException/H5::LocationException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void H5Location::unmount(const char *name) const @@ -1955,7 +1910,6 @@ H5Location::unmount(const char *name) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void H5Location::unmount(const H5std_string &name) const @@ -1975,7 +1929,6 @@ H5Location::unmount(const H5std_string &name) const /// or zero if all members were processed with no operator /// returning non-zero. ///\exception H5::FileIException/H5::GroupIException/H5::LocationException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- int H5Location::iterateElems(const char *name, int *idx, H5G_iterate_t op, void *op_data) @@ -1992,7 +1945,6 @@ H5Location::iterateElems(const char *name, int *idx, H5G_iterate_t op, void *op_ ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- int H5Location::iterateElems(const H5std_string &name, int *idx, H5G_iterate_t op, void *op_data) @@ -2006,7 +1958,6 @@ H5Location::iterateElems(const H5std_string &name, int *idx, H5G_iterate_t op, v ///\brief Deprecated - moved to H5::Group in 1.10.2. ///\return Deprecated ///\exception Deprecated -// Programmer Binh-Minh Ribler - January, 2003 //-------------------------------------------------------------------------- hsize_t H5Location::getNumObjs() const @@ -2032,7 +1983,6 @@ H5Location::getNumObjs() const /// the function \c H5Location::getNumObjs. Note that this is a /// transient index; thus, an object may have a different index /// each time the group is opened. -// Programmer Binh-Minh Ribler - Mar, 2005 //-------------------------------------------------------------------------- H5std_string H5Location::getObjnameByIdx(hsize_t idx) const @@ -2079,7 +2029,6 @@ H5Location::getObjnameByIdx(hsize_t idx) const /// the function \c H5Location::getNumObjs. Note that this is a /// transient index; thus, an object may have a different index /// each time the group is opened. -// Programmer Binh-Minh Ribler - January, 2003 //-------------------------------------------------------------------------- ssize_t H5Location::getObjnameByIdx(hsize_t idx, char *name, size_t size) const @@ -2097,7 +2046,6 @@ H5Location::getObjnameByIdx(hsize_t idx, char *name, size_t size) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes an /// \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - January, 2003 //-------------------------------------------------------------------------- ssize_t H5Location::getObjnameByIdx(hsize_t idx, H5std_string &name, size_t size) const @@ -2134,7 +2082,6 @@ H5Location::getObjnameByIdx(hsize_t idx, H5std_string &name, size_t size) const /// Exception will be thrown when: /// - an error returned by the C API /// - object type is not one of the valid values above -// Programmer Binh-Minh Ribler - April, 2014 //-------------------------------------------------------------------------- H5O_type_t H5Location::childObjType(const char *objname) const @@ -2173,7 +2120,6 @@ H5Location::childObjType(const char *objname) const /// object's name. ///\param objname - IN: Name of the object (H5std_string&) ///\exception H5::FileIException/H5::GroupIException/H5::LocationException -// Programmer Binh-Minh Ribler - April, 2014 //-------------------------------------------------------------------------- H5O_type_t H5Location::childObjType(const H5std_string &objname) const @@ -2210,7 +2156,6 @@ H5Location::childObjType(const H5std_string &objname) const // fully specified // - Leave property list out for now because C API is not using it, it // can be added later when needed. -// Programmer Binh-Minh Ribler - April, 2014 //-------------------------------------------------------------------------- H5O_type_t H5Location::childObjType(hsize_t index, H5_index_t index_type, H5_iter_order_t order, @@ -2256,7 +2201,6 @@ H5Location::childObjType(hsize_t index, H5_index_t index_type, H5_iter_order_t o /// Exception will be thrown when: /// - an error returned by the C API /// - version number is not one of the valid values above -// Programmer Binh-Minh Ribler - April, 2014 //-------------------------------------------------------------------------- unsigned H5Location::childObjVersion(const char *objname) const @@ -2288,7 +2232,6 @@ H5Location::childObjVersion(const char *objname) const /// object's name. ///\param objname - IN: Name of the object (H5std_string&) ///\exception H5::FileIException/H5::GroupIException/H5::LocationException -// Programmer Binh-Minh Ribler - April, 2014 //-------------------------------------------------------------------------- unsigned H5Location::childObjVersion(const H5std_string &objname) const @@ -2306,7 +2249,6 @@ H5Location::childObjVersion(const H5std_string &objname) const ///\param idx - IN: Transient index of the object ///\return Object type ///\exception H5::FileIException/H5::GroupIException/H5::LocationException -// Programmer Binh-Minh Ribler - January, 2003 //-------------------------------------------------------------------------- H5G_obj_t H5Location::getObjTypeByIdx(hsize_t idx) const @@ -2327,7 +2269,6 @@ H5Location::getObjTypeByIdx(hsize_t idx) const ///\param type_name - OUT: Object type in text ///\return Object type ///\exception H5::FileIException/H5::GroupIException/H5::LocationException -// Programmer Binh-Minh Ribler - May, 2010 // Modification // Modified to use the other function. -BMR, 2016/03/07 //-------------------------------------------------------------------------- @@ -2346,7 +2287,6 @@ H5Location::getObjTypeByIdx(hsize_t idx, char *type_name) const ///\param type_name - OUT: Object type in text ///\return Object type ///\exception H5::FileIException/H5::GroupIException/H5::LocationException -// Programmer Binh-Minh Ribler - January, 2003 //-------------------------------------------------------------------------- H5G_obj_t H5Location::getObjTypeByIdx(hsize_t idx, H5std_string &type_name) const @@ -2384,7 +2324,6 @@ H5Location::getObjTypeByIdx(hsize_t idx, H5std_string &type_name) const ///\param func_name - Name of the function where failure occurs ///\param msg - Message describing the failure ///\exception H5::GroupIException -// Programmer Binh-Minh Ribler - 2000 // Modification // August 2017 - BMR // Keep H5Location::throwException and H5File::throwException to @@ -2421,7 +2360,6 @@ H5Location::throwException(const H5std_string &func_name, const H5std_string &ms // Applications shouldn't need to use it. // param dspace - IN/OUT: DataSpace object to be changed // param new_id - IN: New id to set -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- void f_DataSpace_setId(DataSpace *dspace, hid_t new_id) @@ -2432,7 +2370,6 @@ f_DataSpace_setId(DataSpace *dspace, hid_t new_id) //-------------------------------------------------------------------------- // Function: H5Location destructor ///\brief Noop destructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5Location::~H5Location() { diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp index 94d76a8..2b898e7 100644 --- a/c++/src/H5Object.cpp +++ b/c++/src/H5Object.cpp @@ -73,7 +73,6 @@ userVisitOpWrpr(hid_t obj_id, const char *attr_name, const H5O_info2_t *obj_info //-------------------------------------------------------------------------- // Function: H5Object default constructor (protected) -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5Object::H5Object() : H5Location() { @@ -87,7 +86,6 @@ H5Object::H5Object() : H5Location() // Applications shouldn't need to use it. // param attr - IN/OUT: Attribute object to be changed // param new_id - IN: New id to set -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- void f_Attribute_setId(Attribute *attr, hid_t new_id) @@ -115,7 +113,6 @@ f_Attribute_setId(Attribute *attr, hid_t new_id) /// attribute with a new attribute of the same name, first /// delete the existing one with \c H5Object::removeAttr, then /// recreate it with this function. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Attribute H5Object::createAttribute(const char *name, const DataType &data_type, const DataSpace &data_space, @@ -141,7 +138,6 @@ H5Object::createAttribute(const char *name, const DataType &data_type, const Dat ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes /// a reference to an \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Attribute H5Object::createAttribute(const H5std_string &name, const DataType &data_type, const DataSpace &data_space, @@ -156,7 +152,6 @@ H5Object::createAttribute(const H5std_string &name, const DataType &data_type, c ///\param name - IN: Name of the attribute ///\return Attribute instance ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Attribute H5Object::openAttribute(const char *name) const @@ -177,7 +172,6 @@ H5Object::openAttribute(const char *name) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes /// a reference to an \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Attribute H5Object::openAttribute(const H5std_string &name) const @@ -191,7 +185,6 @@ H5Object::openAttribute(const H5std_string &name) const ///\param idx - IN: Index of the attribute, a 0-based, non-negative integer ///\return Attribute instance ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- Attribute H5Object::openAttribute(const unsigned int idx) const @@ -221,7 +214,6 @@ H5Object::openAttribute(const unsigned int idx) const ///\par Description /// The signature of user_op is /// void (*)(H5::H5Location&, H5std_string, void*). -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- int H5Object::iterateAttrs(attr_operator_t user_op, unsigned *_idx, void *op_data) @@ -281,7 +273,6 @@ H5Object::iterateAttrs(attr_operator_t user_op, unsigned *_idx, void *op_data) ///\par Description /// For information, please refer to the H5Ovisit3 API in the HDF5 /// C Reference Manual. -// Programmer Binh-Minh Ribler - Feb, 2019 //-------------------------------------------------------------------------- void H5Object::visit(H5_index_t idx_type, H5_iter_order_t order, visit_operator_t user_op, void *op_data, @@ -316,7 +307,6 @@ H5Object::visit(H5_index_t idx_type, H5_iter_order_t order, visit_operator_t use /// Exception will be thrown when: /// - an error returned by the C API /// - version number is not one of the valid values above -// Programmer Binh-Minh Ribler - December, 2016 //-------------------------------------------------------------------------- unsigned H5Object::objVersion() const @@ -344,7 +334,6 @@ H5Object::objVersion() const ///\brief Returns the number of attributes attached to this HDF5 object. ///\return Number of attributes ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- int H5Object::getNumAttrs() const @@ -362,7 +351,6 @@ H5Object::getNumAttrs() const ///\brief Checks whether the named attribute exists at this location. ///\param name - IN: Name of the attribute to be queried ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - 2013 //-------------------------------------------------------------------------- bool H5Object::attrExists(const char *name) const @@ -384,7 +372,6 @@ H5Object::attrExists(const char *name) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes /// a reference to an \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- bool H5Object::attrExists(const H5std_string &name) const @@ -397,7 +384,6 @@ H5Object::attrExists(const H5std_string &name) const ///\brief Removes the named attribute from this object. ///\param name - IN: Name of the attribute to be removed ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void H5Object::removeAttr(const char *name) const @@ -412,7 +398,6 @@ H5Object::removeAttr(const char *name) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes /// a reference to an \c H5std_string for \a name. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void H5Object::removeAttr(const H5std_string &name) const @@ -426,7 +411,6 @@ H5Object::removeAttr(const H5std_string &name) const ///\param oldname - IN: Name of the attribute to be renamed ///\param newname - IN: New name ame of the attribute ///\exception H5::AttributeIException -// Programmer Binh-Minh Ribler - Mar, 2005 //-------------------------------------------------------------------------- void H5Object::renameAttr(const char *oldname, const char *newname) const @@ -441,7 +425,6 @@ H5Object::renameAttr(const char *oldname, const char *newname) const ///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function in that it takes /// a reference to an \c H5std_string for the names. -// Programmer Binh-Minh Ribler - Mar, 2005 //-------------------------------------------------------------------------- void H5Object::renameAttr(const H5std_string &oldname, const H5std_string &newname) const @@ -453,7 +436,6 @@ H5Object::renameAttr(const H5std_string &oldname, const H5std_string &newname) c // Function: getObjName ///\brief Given an id, returns the type of the object. ///\return The name of the object -// Programmer Binh-Minh Ribler - Mar, 2014 //-------------------------------------------------------------------------- ssize_t H5Object::getObjName(char *obj_name, size_t buf_size) const @@ -477,7 +459,6 @@ H5Object::getObjName(char *obj_name, size_t buf_size) const ///\brief Returns the name of this object as an \a H5std_string. ///\return Name of the object ///\exception H5::Exception -// Programmer Binh-Minh Ribler - Mar, 2014 //-------------------------------------------------------------------------- H5std_string H5Object::getObjName() const @@ -529,7 +510,6 @@ H5Object::getObjName() const /// This function retrieves the object's name as an std string. /// buf_size can specify a specific length or default to 0, in /// which case the entire name will be retrieved. -// Programmer Binh-Minh Ribler - Mar, 2014 //-------------------------------------------------------------------------- ssize_t H5Object::getObjName(H5std_string &obj_name, size_t len) const @@ -565,7 +545,6 @@ H5Object::getObjName(H5std_string &obj_name, size_t len) const //-------------------------------------------------------------------------- // Function: H5Object destructor ///\brief Noop destructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5Object::~H5Object() { diff --git a/c++/src/H5OcreatProp.cpp b/c++/src/H5OcreatProp.cpp index 1391fc7..54808cb 100644 --- a/c++/src/H5OcreatProp.cpp +++ b/c++/src/H5OcreatProp.cpp @@ -37,7 +37,6 @@ ObjCreatPropList *ObjCreatPropList::DEFAULT_ = 0; // If ObjCreatPropList::DEFAULT_ already points to an allocated // object, throw a PropListIException. This scenario should not // happen. -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- ObjCreatPropList * ObjCreatPropList::getConstant() @@ -64,7 +63,6 @@ ObjCreatPropList::getConstant() // Purpose: Deletes the constant object that ObjCreatPropList::DEFAULT_ // points to. // exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- void ObjCreatPropList::deleteConstants() @@ -82,7 +80,6 @@ const ObjCreatPropList &ObjCreatPropList::DEFAULT = *getConstant(); //-------------------------------------------------------------------------- // Function: Default Constructor ///\brief Creates a file access property list -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- ObjCreatPropList::ObjCreatPropList() : PropList(H5P_OBJECT_CREATE) { @@ -92,7 +89,6 @@ ObjCreatPropList::ObjCreatPropList() : PropList(H5P_OBJECT_CREATE) // Function: ObjCreatPropList copy constructor ///\brief Copy constructor: same HDF5 object as \a original ///\param original - IN: ObjCreatPropList instance to copy -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- ObjCreatPropList::ObjCreatPropList(const ObjCreatPropList &original) : PropList(original) { @@ -102,7 +98,6 @@ ObjCreatPropList::ObjCreatPropList(const ObjCreatPropList &original) : PropList( // Function: ObjCreatPropList overloaded constructor ///\brief Creates a file access property list using the id of an /// existing one. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- ObjCreatPropList::ObjCreatPropList(const hid_t plist_id) : PropList(plist_id) { @@ -120,7 +115,6 @@ ObjCreatPropList::ObjCreatPropList(const hid_t plist_id) : PropList(plist_id) /// If \c max_compact is set to 0, dense storage will be used. /// For more detail about on attribute storage, please refer to the /// H5Pset_attr_phase_change API in the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - September 2015 //-------------------------------------------------------------------------- void ObjCreatPropList::setAttrPhaseChange(unsigned max_compact, unsigned min_dense) const @@ -143,7 +137,6 @@ ObjCreatPropList::setAttrPhaseChange(unsigned max_compact, unsigned min_dense) c /// If \c max_compact is set to 0, dense storage will be used. /// For more detail about on attribute storage, please refer to the /// H5Pget_attr_phase_change API in the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - September 2015 //-------------------------------------------------------------------------- void ObjCreatPropList::getAttrPhaseChange(unsigned &max_compact, unsigned &min_dense) const @@ -172,7 +165,6 @@ ObjCreatPropList::getAttrPhaseChange(unsigned &max_compact, unsigned &min_dense) /// creation time and to build the index later. /// For detail, please refer to the H5Pset_attr_creation_order API /// in the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - September 2015 //-------------------------------------------------------------------------- void ObjCreatPropList::setAttrCrtOrder(unsigned crt_order_flags) const @@ -194,7 +186,6 @@ ObjCreatPropList::setAttrCrtOrder(unsigned crt_order_flags) const /// creation order is neither tracked not indexed. /// For detail, please refer to the H5Pget_attr_creation_order API /// in the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - September 2015 //-------------------------------------------------------------------------- unsigned ObjCreatPropList::getAttrCrtOrder() const @@ -211,7 +202,6 @@ ObjCreatPropList::getAttrCrtOrder() const //-------------------------------------------------------------------------- // Function: ObjCreatPropList destructor ///\brief Noop destructor -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- ObjCreatPropList::~ObjCreatPropList() { diff --git a/c++/src/H5PredType.cpp b/c++/src/H5PredType.cpp index 5f5934e..6aa5b17 100644 --- a/c++/src/H5PredType.cpp +++ b/c++/src/H5PredType.cpp @@ -38,7 +38,6 @@ namespace H5 { // Description // This constructor creates a PredType object by copying // the provided HDF5 predefined datatype. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- PredType::PredType(const hid_t predtype_id) : AtomType(predtype_id) { @@ -48,7 +47,6 @@ PredType::PredType(const hid_t predtype_id) : AtomType(predtype_id) //-------------------------------------------------------------------------- // Function: PredType default constructor ///\brief Default constructor: Creates a stub predefined datatype -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- PredType::PredType() : AtomType() { @@ -59,7 +57,6 @@ PredType::PredType() : AtomType() // Function: PredType copy constructor ///\brief Copy constructor: same HDF5 object as \a original ///\param original - IN: PredType instance to copy -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- PredType::PredType(const PredType &original) : AtomType(original) { @@ -74,7 +71,6 @@ PredType::PredType(const PredType &original) : AtomType(original) // Description // Makes a copy of the type on the right hand side and stores // the new id in the left hand side object. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- PredType & PredType::operator=(const PredType &rhs) @@ -116,7 +112,6 @@ PredType::committed() //-------------------------------------------------------------------------- // Function: PredType destructor ///\brief Noop destructor. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- PredType::~PredType() { @@ -287,7 +282,6 @@ PredType *PredType::NATIVE_UINT_FAST64_; // Note that, there is a similar function to getPredTypes() in // other classes, that have global constants, is called getConstant(). // -// Programmer Binh-Minh Ribler - September 2015 //-------------------------------------------------------------------------- PredType * PredType::getPredTypes() @@ -313,7 +307,6 @@ PredType::getPredTypes() //-------------------------------------------------------------------------- // Function: PredType::makePredTypes // Purpose Allocate all PredType constants. -// Programmer Binh-Minh Ribler - September 2015 //-------------------------------------------------------------------------- void PredType::makePredTypes() @@ -469,7 +462,6 @@ PredType::makePredTypes() //-------------------------------------------------------------------------- // Function: PredType::deleteConstants // Purpose Deletes all PredType constant pointers. -// Programmer Binh-Minh Ribler - September 2015 //-------------------------------------------------------------------------- void PredType::deleteConstants() diff --git a/c++/src/H5PropList.cpp b/c++/src/H5PropList.cpp index 92a826e..a116494 100644 --- a/c++/src/H5PropList.cpp +++ b/c++/src/H5PropList.cpp @@ -38,7 +38,6 @@ PropList *PropList::DEFAULT_ = 0; // Description // If PropList::DEFAULT_ already points to an allocated object, // throw a PropListIException. This scenario should not happen. -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- PropList * PropList::getConstant() @@ -63,7 +62,6 @@ PropList::getConstant() //-------------------------------------------------------------------------- // Function: PropList::deleteConstants // Purpose Deletes the constant object that PropList::DEFAULT_ points to. -// Programmer Binh-Minh Ribler - 2015 //-------------------------------------------------------------------------- void PropList::deleteConstants() @@ -81,7 +79,6 @@ const PropList &PropList::DEFAULT = *getConstant(); //-------------------------------------------------------------------------- // Function: Default constructor ///\brief Default constructor: creates a stub property list object. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- PropList::PropList() : IdComponent(), id(H5P_DEFAULT) { @@ -91,7 +88,6 @@ PropList::PropList() : IdComponent(), id(H5P_DEFAULT) // Function: PropList copy constructor ///\brief Copy constructor: same HDF5 object as \a original ///\param original - IN: The original property list to copy -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- PropList::PropList(const PropList &original) : IdComponent(), id(original.id) { @@ -108,7 +104,6 @@ PropList::PropList(const PropList &original) : IdComponent(), id(original.id) // class is provided or makes a copy of a property list if one // is given. If the given id is anything else, then set this // property's id to H5P_DEFAULT. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- PropList::PropList(const hid_t plist_id) : IdComponent(), id{H5P_DEFAULT} { @@ -160,7 +155,6 @@ PropList::PropList(const hid_t plist_id) : IdComponent(), id{H5P_DEFAULT} ///\brief Makes a copy of an existing property list. ///\param like_plist - IN: Reference to the existing property list ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 // Modification // - Replaced resetIdComponent() with decRefCount() to use C // library ID reference counting mechanism - BMR, Jun 1, 2004 @@ -194,7 +188,6 @@ PropList::copy(const PropList &like_plist) // Description // Makes a copy of the property list on the right hand side // and stores the new id in the left hand side object. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- PropList & PropList::operator=(const PropList &rhs) @@ -210,7 +203,6 @@ PropList::operator=(const PropList &rhs) ///\param dest - IN: Destination property list or class ///\param name - IN: Name of the property to copy - \c char pointer ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - Jul, 2005 //-------------------------------------------------------------------------- void PropList::copyProp(PropList &dest, const char *name) const @@ -229,7 +221,6 @@ PropList::copyProp(PropList &dest, const char *name) const /// accepts. ///\param dest - IN: Destination property list or class ///\param name - IN: Name of the property to copy - \c H5std_string -// Programmer Binh-Minh Ribler - Jul, 2005 //-------------------------------------------------------------------------- void PropList::copyProp(PropList &dest, const H5std_string &name) const @@ -245,7 +236,6 @@ PropList::copyProp(PropList &dest, const H5std_string &name) const ///\param name - IN: Name of the property to copy - \c char pointer ///\note This member function will be removed in the next release ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void PropList::copyProp(PropList &dest, PropList &src, const char *name) const @@ -266,7 +256,6 @@ PropList::copyProp(PropList &dest, PropList &src, const char *name) const ///\param dest - IN: Destination property list or class ///\param src - IN: Source property list or class ///\param name - IN: Name of the property to copy - \c H5std_string -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void PropList::copyProp(PropList &dest, PropList &src, const H5std_string &name) const @@ -283,7 +272,6 @@ PropList::copyProp(PropList &dest, PropList &src, const H5std_string &name) cons // 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 //-------------------------------------------------------------------------- hid_t PropList::getId() const @@ -302,7 +290,6 @@ PropList::getId() const // The underlying reference counting in the C library ensures // that the current valid id of this object is properly closed. // Then the object's id is reset to the new id. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void PropList::p_setId(const hid_t new_id) @@ -325,7 +312,6 @@ PropList::p_setId(const hid_t new_id) ///\brief Closes the property list if it is not a default one. /// ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - Mar 9, 2005 //-------------------------------------------------------------------------- void PropList::close() @@ -345,7 +331,6 @@ PropList::close() ///\brief Returns the class of this property list, i.e. \c H5P_FILE_CREATE... ///\return The property list class if it is not equal to \c H5P_ROOT ///\exception H5::PropListIException -// Programmer Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- hid_t PropList::getClass() const @@ -367,7 +352,6 @@ PropList::getClass() const ///\par Description /// This routine checks if a property exists within a property /// list or class. -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- bool PropList::propExist(const char *name) const @@ -391,7 +375,6 @@ PropList::propExist(const char *name) const /// It differs from the above function only in what arguments it /// accepts. ///\param name - IN: Name of property to check for - \c H5std_string -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- bool PropList::propExist(const H5std_string &name) const @@ -407,7 +390,6 @@ PropList::propExist(const H5std_string &name) const ///\par Description /// Releases memory and detaches a class from the property /// list class hierarchy. -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void PropList::closeClass() const @@ -428,7 +410,6 @@ PropList::closeClass() const /// Retrieves a copy of the value for a property in a property /// list. The property name must exist or this routine will /// throw an exception. -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void PropList::getProperty(const char *name, void *value) const @@ -446,7 +427,6 @@ PropList::getProperty(const char *name, void *value) const ///\param name - IN: Name of property to query - \c char pointer ///\return The property that is a \c H5std_string. ///\exception H5::PropListIException -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- H5std_string PropList::getProperty(const char *name) const @@ -477,7 +457,6 @@ PropList::getProperty(const char *name) const /// accepts. ///\param name - IN: Name of property to query - \c H5std_string ///\param value - OUT: Pointer to the buffer for the property value -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void PropList::getProperty(const H5std_string &name, void *value) const @@ -491,7 +470,6 @@ PropList::getProperty(const H5std_string &name, void *value) const /// accepts. ///\param name - IN: Name of property to query - \c H5std_string ///\return The property that is a \c H5std_string. -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- H5std_string PropList::getProperty(const H5std_string &name) const @@ -510,7 +488,6 @@ PropList::getProperty(const H5std_string &name) const /// in bytes. Zero-sized properties are allowed and the return /// value will be of 0. This function works for both property /// lists and classes. -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- size_t PropList::getPropSize(const char *name) const @@ -529,7 +506,6 @@ PropList::getPropSize(const char *name) const /// accepts. ///\param name - IN: Name of property to query - \c H5std_string /// -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- size_t PropList::getPropSize(const H5std_string &name) const @@ -542,7 +518,6 @@ PropList::getPropSize(const H5std_string &name) const ///\brief Return the name of a generic property list class. ///\return A string containing the class name, if success, otherwise, /// an empty string. -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- H5std_string PropList::getClassName() const @@ -563,7 +538,6 @@ PropList::getClassName() const ///\brief Returns the number of properties in this property list or class. ///\return Size of the property. ///\exception H5::PropListIException -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- size_t PropList::getNumProps() const @@ -585,7 +559,6 @@ PropList::getNumProps() const // Description // Revision svn r29815 changed 'value' to const, hence, deprecated // the non-const setProperty. -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void PropList::setProperty(const char *name, const void *value) const @@ -599,7 +572,6 @@ PropList::setProperty(const char *name, const void *value) const //-------------------------------------------------------------------------- // Function: PropList::setProperty ///\brief Deprecated due to missing const in prototype. (1.10.1) -// Programmer: Binh-Minh Ribler - March, 2017 // Modification // Planned for removal. -BMR, 2017/03/17 1.10.1 //-------------------------------------------------------------------------- @@ -622,7 +594,6 @@ PropList::setProperty(const char *name, void *value) const // Description // Revision svn r29815 changed 'value' to const, hence, deprecated // the non-const setProperty. -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void PropList::setProperty(const char *name, const char *charptr) const @@ -640,7 +611,6 @@ PropList::setProperty(const char *name, const char *charptr) const /// accepts. ///\param name - IN: Name of property to set - \c char pointer ///\param strg - IN: Value for the property is a \c H5std_string -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void PropList::setProperty(const char *name, const H5std_string &strg) const @@ -651,7 +621,6 @@ PropList::setProperty(const char *name, const H5std_string &strg) const //-------------------------------------------------------------------------- // Function: PropList::setProperty ///\brief Deprecated due to missing const in prototype. (1.10.1) -// Programmer: Binh-Minh Ribler - March, 2017 // Modification // Planned for removal. -BMR, 2017/03/17 1.10.1 //-------------------------------------------------------------------------- @@ -668,7 +637,6 @@ PropList::setProperty(const char *name, H5std_string &strg) const /// accepts. ///\param name - IN: Name of property to set - \c H5std_string ///\param value - IN: Void pointer to the value for the property -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void PropList::setProperty(const H5std_string &name, const void *value) const @@ -679,7 +647,6 @@ PropList::setProperty(const H5std_string &name, const void *value) const //-------------------------------------------------------------------------- // Function: PropList::setProperty ///\brief Deprecated due to missing const in prototype. (1.10.1) -// Programmer: Binh-Minh Ribler - March, 2017 // Modification // Planned for removal. -BMR, 2017/03/17 1.10.1 //-------------------------------------------------------------------------- @@ -696,7 +663,6 @@ PropList::setProperty(const H5std_string &name, void *value) const /// accepts. ///\param name - IN: Name of property to set - \c H5std_string ///\param strg - IN: Value for the property is a \c H5std_string -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void PropList::setProperty(const H5std_string &name, const H5std_string &strg) const @@ -707,7 +673,6 @@ PropList::setProperty(const H5std_string &name, const H5std_string &strg) const //-------------------------------------------------------------------------- // Function: PropList::setProperty ///\brief Deprecated due to missing const in prototype. (1.10.1) -// Programmer: Binh-Minh Ribler - March, 2017 // Modification // Planned for removal. -BMR, 2017/03/17 1.10.1 //-------------------------------------------------------------------------- @@ -724,7 +689,6 @@ PropList::setProperty(const H5std_string &name, H5std_string &strg) const ///\return true if the property list is a member of the property list /// class, and false, otherwise. ///\exception H5::PropListIException -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- bool PropList::isAClass(const PropList &prop_class) const @@ -745,7 +709,6 @@ PropList::isAClass(const PropList &prop_class) const ///\brief Removes a property from a property list. ///\param name - IN: Name of property to remove - \c char pointer ///\exception H5::PropListIException -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void PropList::removeProp(const char *name) const @@ -762,7 +725,6 @@ PropList::removeProp(const char *name) const /// It differs from the above function only in what arguments it /// accepts. ///\param name - IN: Name of property to remove - \c H5std_string -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- void PropList::removeProp(const H5std_string &name) const @@ -777,7 +739,6 @@ PropList::removeProp(const H5std_string &name) const ///\return true if the property lists or classes are equal, and /// false, otherwise. ///\exception H5::PropListIException -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- bool PropList::operator==(const PropList &rhs) const @@ -798,7 +759,6 @@ PropList::operator==(const PropList &rhs) const ///\brief Returns the parent class of a generic property class ///\return The parent class of a property class ///\exception H5::PropListIException -// Programmer: Binh-Minh Ribler - April, 2004 //-------------------------------------------------------------------------- PropList PropList::getClassParent() const @@ -814,7 +774,6 @@ PropList::getClassParent() const //-------------------------------------------------------------------------- // Function: PropList destructor ///\brief Properly terminates access to this property list. -// Programmer Binh-Minh Ribler - 2000 // Modification // - Replaced resetIdComponent() with decRefCount() to use C // library ID reference counting mechanism - BMR, Jun 1, 2004 diff --git a/c++/src/H5StrType.cpp b/c++/src/H5StrType.cpp index 42011ee..2c47809 100644 --- a/c++/src/H5StrType.cpp +++ b/c++/src/H5StrType.cpp @@ -37,7 +37,6 @@ namespace H5 { //-------------------------------------------------------------------------- // Function: StrType default constructor ///\brief Default constructor: Creates a stub string datatype -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- StrType::StrType() : AtomType() { @@ -48,7 +47,6 @@ StrType::StrType() : AtomType() ///\brief Creates a string datatype using a predefined type. ///\param pred_type - IN: Predefined datatype ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- StrType::StrType(const PredType &pred_type) : AtomType() { @@ -74,7 +72,6 @@ StrType::StrType(const PredType &pred_type) : AtomType() // Note // The use of this constructor can be shortened by using // its overloaded below as StrType(0, size). -// Programmer Binh-Minh Ribler - 2000 // Modification // Planned for removal. -BMR, 2005/12/02 // Removed from documentation. -BMR, 2016/03/07 @@ -101,7 +98,6 @@ StrType::StrType(const PredType &pred_type, const size_t &size) : AtomType() /// StrType atype(PredType::C_S1, size) // Note // This constructor replaced the previous one. -// Programmer Binh-Minh Ribler - Nov 28, 2005 //-------------------------------------------------------------------------- StrType::StrType(const int dummy, const size_t &size) : AtomType() { @@ -119,7 +115,6 @@ StrType::StrType(const int dummy, const size_t &size) : AtomType() ///\brief Creates an StrType object using the id of an existing datatype. ///\param existing_id - IN: Id of an existing datatype ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- StrType::StrType(const hid_t existing_id) : AtomType(existing_id) { @@ -128,7 +123,6 @@ StrType::StrType(const hid_t existing_id) : AtomType(existing_id) //-------------------------------------------------------------------------- // Function: StrType copy constructor ///\brief Copy constructor: same HDF5 object as \a original -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- StrType::StrType(const StrType &original) : AtomType(original) { @@ -139,7 +133,6 @@ StrType::StrType(const StrType &original) : AtomType(original) ///\brief Gets the string datatype of the specified dataset ///\param dataset - IN: Dataset that this string datatype associates with ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- StrType::StrType(const DataSet &dataset) : AtomType() { @@ -158,7 +151,6 @@ StrType::StrType(const DataSet &dataset) : AtomType() ///\param loc - IN: Location of the type ///\param dtype_name - IN: String type name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openStrType(const char*) to @@ -177,7 +169,6 @@ StrType::StrType(const H5Location &loc, const char *dtype_name) : AtomType() ///\param loc - IN: Location of the type ///\param dtype_name - IN: String type name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openStrType(const H5std_string&) @@ -195,7 +186,6 @@ StrType::StrType(const H5Location &loc, const H5std_string &dtype_name) : AtomTy /// binary object description of this type. /// ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Aug 2017 //-------------------------------------------------------------------------- DataType * StrType::decode() const @@ -225,7 +215,6 @@ StrType::decode() const /// and usability problems. See the C API entry H5Pset_char_encoding for /// more information. ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5T_cset_t StrType::getCset() const @@ -252,7 +241,6 @@ StrType::getCset() const /// and usability problems. See the C API entry H5Pset_char_encoding for /// more information. ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void StrType::setCset(H5T_cset_t cset) const @@ -271,7 +259,6 @@ StrType::setCset(H5T_cset_t cset) const /// \li \c H5T_STR_NULLPAD (0) - Pad with zeros /// \li \c H5T_STR_SPACEPAD (0) - pad with spaces (as FORTRAN does) ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5T_str_t StrType::getStrpad() const @@ -293,7 +280,6 @@ StrType::getStrpad() const ///\par Description /// For information, please refer to the H5Tset_strpad API in /// the HDF5 C Reference Manual. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- void StrType::setStrpad(H5T_str_t strpad) const @@ -307,7 +293,6 @@ StrType::setStrpad(H5T_str_t strpad) const //-------------------------------------------------------------------------- // Function: StrType destructor ///\brief Properly terminates access to this string datatype. -// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- StrType::~StrType() { diff --git a/c++/src/H5VarLenType.cpp b/c++/src/H5VarLenType.cpp index 6043e14..e8b7cbb 100644 --- a/c++/src/H5VarLenType.cpp +++ b/c++/src/H5VarLenType.cpp @@ -41,7 +41,6 @@ VarLenType::VarLenType() : DataType() ///\brief Creates an VarLenType object using an existing id. ///\param existing_id - IN: Id of an existing datatype ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- VarLenType::VarLenType(const hid_t existing_id) : DataType(existing_id) { @@ -50,7 +49,6 @@ VarLenType::VarLenType(const hid_t existing_id) : DataType(existing_id) //-------------------------------------------------------------------------- // Function: VarLenType copy constructor ///\brief Copy constructor: same HDF5 object as \a original -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- VarLenType::VarLenType(const VarLenType &original) : DataType(original) { @@ -66,7 +64,6 @@ VarLenType::VarLenType(const VarLenType &original) : DataType(original) // constructor. // Updated: this is unnecessary. // -BMR, Sep, 2017 -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- VarLenType::VarLenType(const DataType *base_type) : DataType() { @@ -82,7 +79,6 @@ VarLenType::VarLenType(const DataType *base_type) : DataType() /// \a base_type. ///\param base_type - IN: An existing datatype ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- VarLenType::VarLenType(const DataType &base_type) : DataType() { @@ -99,7 +95,6 @@ VarLenType::VarLenType(const DataType &base_type) : DataType() ///\param loc - IN: Location of the type ///\param dtype_name - IN: Variable length type name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openVarLenType(const char*) to @@ -118,7 +113,6 @@ VarLenType::VarLenType(const H5Location &loc, const char *dtype_name) : DataType ///\param loc - IN: Location of the type ///\param dtype_name - IN: Variable length type name ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Dec 2016 // Description // In 1.10.1, this constructor was introduced and may replace the // existing function CommonFG::openVarLenType(const H5std_string&) @@ -136,7 +130,6 @@ VarLenType::VarLenType(const H5Location &loc, const H5std_string &dtype_name) : /// binary object description of this type. /// ///\exception H5::DataTypeIException -// Programmer Binh-Minh Ribler - Aug 2017 //-------------------------------------------------------------------------- DataType * VarLenType::decode() const @@ -156,7 +149,6 @@ VarLenType::decode() const //-------------------------------------------------------------------------- // Function: VarLenType destructor ///\brief Properly terminates access to this datatype. -// Programmer Binh-Minh Ribler - May, 2004 //-------------------------------------------------------------------------- VarLenType::~VarLenType() { diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp index 1a23f5e..9de6db1 100644 --- a/c++/test/dsets.cpp +++ b/c++/test/dsets.cpp @@ -404,9 +404,6 @@ const H5Z_class2_t H5Z_BOGUS[1] = {{ * Return Success: Data chunk size * * Failure: 0 - * - * Programmer Robb Matzke - * Tuesday, April 21, 1998 *------------------------------------------------------------------------- */ static size_t @@ -729,8 +726,8 @@ test_nbit_compression(H5File &file) SUBTEST("N-bit compression (setup)"); - HDmemset(orig_data, 0, DIM1 * DIM2 * sizeof(s1_t)); - HDmemset(new_data, 0, DIM1 * DIM2 * sizeof(s1_t)); + memset(orig_data, 0, DIM1 * DIM2 * sizeof(s1_t)); + memset(new_data, 0, DIM1 * DIM2 * sizeof(s1_t)); try { // Define datatypes of members of compound datatype @@ -1096,7 +1093,7 @@ test_getnativeinfo(H5File &file) // Get dataset header info H5O_native_info_t ninfo; - HDmemset(&ninfo, 0, sizeof(ninfo)); + memset(&ninfo, 0, sizeof(ninfo)); dataset.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_HDR); verify_val(static_cast(ninfo.hdr.nchunks), 1, "DataSet::getNativeObjinfo", __LINE__, __FILE__); dataset.close(); @@ -1104,7 +1101,7 @@ test_getnativeinfo(H5File &file) // Open the dataset we created above and then close it. This is one // way to open an existing dataset for accessing. dataset = file.openDataSet(DSET_DEFAULT_NAME); - HDmemset(&ninfo, 0, sizeof(ninfo)); + memset(&ninfo, 0, sizeof(ninfo)); dataset.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_ALL); verify_val(static_cast(ninfo.hdr.nchunks), 1, "DataSet::getNativeObjinfo", __LINE__, __FILE__); dataset.close(); @@ -1367,6 +1364,83 @@ test_operator(H5File &file) } // test_operator /*------------------------------------------------------------------------- + * Function: test_read_string + * + * Purpose Tests DataSet::read(H5std_string ...) + * + * Return Success: 0 + * + * Failure: -1 + *------------------------------------------------------------------------- + */ +static herr_t +test_read_string(H5File &file) +{ + SUBTEST("DataSet::read(H5std_string)"); + try { + const H5std_string DATASET_NAME("test_read_string"); + const unsigned long NX = 8; + const char DATA[NX] = {'a', 0, 0, 0, 0, 0, 0, 'Z'}; + const H5std_string EXPECTED_STR = H5std_string(DATA, NX); + H5std_string str; + + /* + * Write characters with internal null bytes + */ + + PredType datatype(PredType::NATIVE_INT8); + hsize_t dimsf[RANK1] = {NX}; + DataSpace dataspace(RANK1, dimsf); + DataSet dataset = file.createDataSet(DATASET_NAME, datatype, dataspace); + dataset.write(DATA, datatype); + dataset.close(); + + /* + * Read characters with internal null bytes as a string. + * The read std::string should NOT be truncated at the first null byte. + */ + + dataset = file.openDataSet(DATASET_NAME); + dataset.read(str, datatype); + dataset.close(); + verify_val(str.length(), NX, "test_read_string", __LINE__, __FILE__); + verify_val(str, EXPECTED_STR, "test_read_string", __LINE__, __FILE__); + + /* + * Write the H5std_string back to the dataset. + */ + dataset = file.openDataSet(DATASET_NAME); + dataset.write(str, datatype); + dataset.close(); + + /* + * Read characters with internal null bytes as a string, after rewrite. + * The read std::string should NOT be truncated at the first null byte. + */ + + dataset = file.openDataSet(DATASET_NAME); + dataset.read(str, datatype); + dataset.close(); + verify_val(str.length(), NX, "test_read_string", __LINE__, __FILE__); + verify_val(str, EXPECTED_STR, "test_read_string", __LINE__, __FILE__); + + /* + * Success + */ + PASSED(); + return 0; + } + catch (Exception &E) { + // H5_FAILED should probably be invoked before verify_val + H5_FAILED(); + issue_fail_msg("test_read_string", __LINE__, __FILE__); + + // clean up and return with failure + return -1; + } +} // test_read_string + +/*------------------------------------------------------------------------- * Function: test_dset * * Purpose Tests the dataset interface (H5D) @@ -1406,6 +1480,7 @@ test_dset() nerrors += test_virtual() < 0 ? 1 : 0; nerrors += test_operator(file) < 0 ? 1 : 0; nerrors += test_chunk_cache(fapl) < 0 ? 1 : 0; + nerrors += test_read_string(file) < 0 ? 1 : 0; // Close group "emit diagnostics". grp.close(); @@ -1429,8 +1504,6 @@ test_dset() * Purpose Cleanup temporary test files * * Return None - * - * Programmer (use C version) *------------------------------------------------------------------------- */ extern "C" void diff --git a/c++/test/h5cpputil.cpp b/c++/test/h5cpputil.cpp index 02805db..c3feefa 100644 --- a/c++/test/h5cpputil.cpp +++ b/c++/test/h5cpputil.cpp @@ -39,9 +39,6 @@ using namespace H5; * Return if any failure has occurred: 1 * * if no failure occurs: 0 - * - * Programmer Binh-Minh Ribler (using C code segment for reporting tests) - * Friday, February 6, 2001 *------------------------------------------------------------------------- */ int @@ -67,10 +64,6 @@ test_report(int nerrors, const H5std_string &testname) * Purpose Displays that a function has failed with its location. * * Return None - * - * Programmer Binh-Minh Ribler (copied and modified macro CHECK from C) - * Monday, December 20, 2004 - * *------------------------------------------------------------------------- */ void @@ -90,10 +83,6 @@ issue_fail_msg(const char *where, int line, const char *file_name, const char *m * Purpose Displays that a function has failed with its location. * * Return None - * - * Programmer Binh-Minh Ribler (copied and modified macro CHECK from C) - * Monday, December 20, 2004 - * *------------------------------------------------------------------------- */ void @@ -121,9 +110,6 @@ issue_fail_msg(const char *where, int line, const char *file_name, const char *f * Return Success: 0 * * Failure: -1 - * - * Programmer Binh-Minh Ribler (using C code segment for checking values) - * Friday, February 6, 2001 *------------------------------------------------------------------------- */ int @@ -147,10 +133,6 @@ check_values(hsize_t i, hsize_t j, int apoint, int acheck) * Return Success: 0 * * Failure: -1 - * - * Programmer Binh-Minh Ribler (using C code segment for checking values) - * Friday, September 16, 2016 - * *------------------------------------------------------------------------- */ void @@ -174,9 +156,6 @@ check_values(const char *value, const char *msg, int line, const char *file_name * Return Success: 0 * * Failure: -1 - * - * Programmer Binh-Minh Ribler - * May 2, 2010 *------------------------------------------------------------------------- */ void diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h index a5477b6..392382d 100644 --- a/c++/test/h5cpputil.h +++ b/c++/test/h5cpputil.h @@ -28,15 +28,15 @@ using std::cerr; using std::endl; #define MESSAGE(V, A) \ - { \ + do { \ if (HDGetTestVerbosity() > (V)) \ print_func A; \ - } + } while (0) #define SUBTEST(TEST) \ - { \ + do { \ printf(" Subtest: %-52s", TEST); \ fflush(stdout); \ - } + } while (0) int check_values(hsize_t i, hsize_t j, int apoint, int acheck); void check_values(const char *value, const char *msg, int line, const char *file_name); diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp index 63324ba..f616dcd 100644 --- a/c++/test/tarray.cpp +++ b/c++/test/tarray.cpp @@ -55,9 +55,6 @@ typedef enum int_t { * Purpose Tests 1-D array of compound datatypes (with array fields) * * Return None - * - * Programmer Binh-Minh Ribler (using C version) - * January, 2016 *------------------------------------------------------------------------- */ static void @@ -242,7 +239,7 @@ test_array_compound_array() verify_val(ndims, ARRAY1_RANK, "f2_atype_check.getArrayNDims", __LINE__, __FILE__); // Get the array dimensions - HDmemset(rdims1, 0, sizeof(rdims1)); + memset(rdims1, 0, sizeof(rdims1)); f2_atype_check.getArrayDims(rdims1); // Check the array dimensions @@ -307,9 +304,6 @@ getArr() * * Return None * - * Programmer Binh-Minh Ribler (using C version) - * March, 2016 - * * Description: * Used user's sample code in HDFFV-9562 *------------------------------------------------------------------------- @@ -364,9 +358,6 @@ test_array_assignment() * Purpose Tests getting array information using the const methods. * * Return None - * - * Programmer Binh-Minh Ribler - * April, 2016 *------------------------------------------------------------------------- */ static void @@ -508,9 +499,6 @@ test_array() * Purpose Cleanup temporary test files * * Return None - * - * Programmer Binh-Minh Ribler (using C version) - * January, 2016 *------------------------------------------------------------------------- */ extern "C" void diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp index 4a35763..e018ab1 100644 --- a/c++/test/tattr.cpp +++ b/c++/test/tattr.cpp @@ -297,7 +297,7 @@ test_attr_getname(FileAccPropList &fapl) // 1. With arbitrary buf_size that is larger than the name size size_t buf_size = FATTR1_NAME.length() + 10; char *fattr1_name = new char[buf_size + 1]; - HDmemset(fattr1_name, 0, buf_size + 1); + memset(fattr1_name, 0, buf_size + 1); ssize_t name_size = 0; // actual length of attribute name name_size = fattr1.getName(fattr1_name, buf_size + 1); CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__); @@ -312,7 +312,7 @@ test_attr_getname(FileAccPropList &fapl) buf_size = 4; char short_name[5] = "File"; // to verify the read name fattr1_name = new char[buf_size + 1]; - HDmemset(fattr1_name, 0, buf_size + 1); + memset(fattr1_name, 0, buf_size + 1); name_size = fattr1.getName(fattr1_name, buf_size + 1); CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__); verify_val(static_cast(name_size), FATTR1_NAME.size(), "Attribute::getName", __LINE__, @@ -324,7 +324,7 @@ test_attr_getname(FileAccPropList &fapl) // 3. With a buf_size that equals the name's length. buf_size = FATTR1_NAME.length(); fattr1_name = new char[buf_size + 1]; - HDmemset(fattr1_name, 0, buf_size + 1); + memset(fattr1_name, 0, buf_size + 1); name_size = fattr1.getName(fattr1_name, buf_size + 1); CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__); verify_val(fattr1_name, FATTR1_NAME, "Attribute::getName", __LINE__, __FILE__); @@ -531,7 +531,7 @@ test_attr_basic_read(FileAccPropList &fapl) // Verify the correct number of attributes another way H5O_info2_t oinfo; - HDmemset(&oinfo, 0, sizeof(oinfo)); + memset(&oinfo, 0, sizeof(oinfo)); dataset.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS); verify_val(static_cast(oinfo.num_attrs), 3, "DataSet::getObjinfo", __LINE__, __FILE__); @@ -560,7 +560,7 @@ test_attr_basic_read(FileAccPropList &fapl) verify_val(num_attrs, 1, "Group::getNumAttrs", __LINE__, __FILE__); // Verify the correct number of attributes another way - HDmemset(&oinfo, 0, sizeof(oinfo)); + memset(&oinfo, 0, sizeof(oinfo)); group.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS); verify_val(static_cast(oinfo.num_attrs), 1, "Group::getObjinfo", __LINE__, __FILE__); @@ -686,7 +686,7 @@ test_attr_compound_read(FileAccPropList &fapl) // Verify the correct number of attributes another way H5O_info2_t oinfo; - HDmemset(&oinfo, 0, sizeof(oinfo)); + memset(&oinfo, 0, sizeof(oinfo)); dataset.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS); verify_val(static_cast(oinfo.num_attrs), 1, "DataSet::getObjinfo", __LINE__, __FILE__); @@ -789,7 +789,7 @@ test_attr_compound_read(FileAccPropList &fapl) hsize_t ii, jj; for (ii = 0; ii < ATTR4_DIM1; ii++) for (jj = 0; jj < ATTR4_DIM2; jj++) - if (HDmemcmp(&attr_data4[ii][jj], &read_data4[ii][jj], sizeof(struct attr4_struct)) != 0) { + if (memcmp(&attr_data4[ii][jj], &read_data4[ii][jj], sizeof(struct attr4_struct)) != 0) { TestErrPrintf("%d:attribute data different: attr_data4[%" PRIuHSIZE "][%" PRIuHSIZE "].i=%d, " "read_data4[%" PRIuHSIZE "][%" PRIuHSIZE "].i=%d\n", @@ -1663,7 +1663,7 @@ test_string_attr(FileAccPropList &fapl) if (HDstrcmp(string_att_check, ATTRSTR_DATA.c_str()) != 0) TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,string_att_check=%s\n", __LINE__, ATTRSTR_DATA.c_str(), string_att_check); - HDfree(string_att_check); + free(string_att_check); /* Test Attribute::read(...,H5std_string& strg) with VL string */ // Read and verify the attribute string as an std::string. diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp index 96073d6..53939dd 100644 --- a/c++/test/tcompound.cpp +++ b/c++/test/tcompound.cpp @@ -40,9 +40,6 @@ typedef struct complex_t { * Purpose Tests various things about compound data types. * * Return None - * - * Programmer Binh-Minh Ribler (using C version) - * January, 2007 *------------------------------------------------------------------------- */ static void @@ -73,9 +70,6 @@ test_compound_1() * elements. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 *------------------------------------------------------------------------- */ static void @@ -100,9 +94,9 @@ test_compound_2() SUBTEST("Compound Element Reordering"); try { // Sizes should be the same, but be careful just in case - buf = static_cast(HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)))); - bkg = static_cast(HDmalloc(nelmts * sizeof(dst_typ_t))); - orig = static_cast(HDmalloc(nelmts * sizeof(src_typ_t))); + buf = static_cast(malloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)))); + bkg = static_cast(malloc(nelmts * sizeof(dst_typ_t))); + orig = static_cast(malloc(nelmts * sizeof(src_typ_t))); for (i = 0; i < nelmts; i++) { s_ptr = (reinterpret_cast(orig)) + i; s_ptr->a = i * 8 + 0; @@ -114,7 +108,7 @@ test_compound_2() s_ptr->d = i * 8 + 6; s_ptr->e = i * 8 + 7; } - HDmemcpy(buf, orig, nelmts * sizeof(src_typ_t)); + memcpy(buf, orig, nelmts * sizeof(src_typ_t)); // Build hdf5 datatypes array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four); @@ -161,9 +155,9 @@ test_compound_2() } } // Release resources - HDfree(buf); - HDfree(bkg); - HDfree(orig); + free(buf); + free(bkg); + free(orig); s_ptr = NULL; d_ptr = NULL; st.close(); @@ -186,9 +180,6 @@ test_compound_2() * members which appear in the source. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 *------------------------------------------------------------------------- */ static void @@ -213,9 +204,9 @@ test_compound_3() SUBTEST("Compound Datatype Subset Conversions"); try { /* Initialize */ - buf = static_cast(HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)))); - bkg = static_cast(HDmalloc(nelmts * sizeof(dst_typ_t))); - orig = static_cast(HDmalloc(nelmts * sizeof(src_typ_t))); + buf = static_cast(malloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)))); + bkg = static_cast(malloc(nelmts * sizeof(dst_typ_t))); + orig = static_cast(malloc(nelmts * sizeof(src_typ_t))); for (i = 0; i < nelmts; i++) { s_ptr = (reinterpret_cast(orig)) + i; s_ptr->a = i * 8 + 0; @@ -271,9 +262,9 @@ test_compound_3() } /* Release resources */ - HDfree(buf); - HDfree(bkg); - HDfree(orig); + free(buf); + free(bkg); + free(orig); s_ptr = NULL; d_ptr = NULL; st.close(); @@ -296,9 +287,6 @@ test_compound_3() * smaller. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 *------------------------------------------------------------------------- */ static void @@ -328,9 +316,9 @@ test_compound_4() SUBTEST("Compound Element Shrinking & Reordering"); try { /* Sizes should be the same, but be careful just in case */ - buf = static_cast(HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)))); - bkg = static_cast(HDmalloc(nelmts * sizeof(dst_typ_t))); - orig = static_cast(HDmalloc(nelmts * sizeof(src_typ_t))); + buf = static_cast(malloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)))); + bkg = static_cast(malloc(nelmts * sizeof(dst_typ_t))); + orig = static_cast(malloc(nelmts * sizeof(src_typ_t))); for (i = 0; i < nelmts; i++) { s_ptr = (reinterpret_cast(orig)) + i; s_ptr->a = i * 8 + 0; @@ -390,9 +378,9 @@ test_compound_4() } // for /* Release resources */ - HDfree(buf); - HDfree(bkg); - HDfree(orig); + free(buf); + free(bkg); + free(orig); s_ptr = NULL; d_ptr = NULL; st.close(); @@ -416,9 +404,6 @@ test_compound_4() * which must undergo a conversion. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 *------------------------------------------------------------------------- */ static void @@ -439,8 +424,8 @@ test_compound_5() hsize_t dims[1] = {4}; src_typ_t src[2] = {{"one", 102, {104, 105, 106, 107}}, {"two", 202, {204, 205, 206, 207}}}; dst_typ_t *dst; - void *buf = HDcalloc(2, sizeof(dst_typ_t)); - void *bkg = HDcalloc(2, sizeof(dst_typ_t)); + void *buf = calloc(2, sizeof(dst_typ_t)); + void *bkg = calloc(2, sizeof(dst_typ_t)); ArrayType *array_dt = NULL; // Output message about test being performed @@ -490,8 +475,8 @@ test_compound_5() } /* Free memory buffers */ - HDfree(buf); - HDfree(bkg); + free(buf); + free(bkg); dst = NULL; PASSED(); } // end of try block @@ -511,9 +496,6 @@ test_compound_5() * larger. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 *------------------------------------------------------------------------- */ static void @@ -539,9 +521,9 @@ test_compound_6() SUBTEST("Compound Element Growing"); try { /* Sizes should be the same, but be careful just in case */ - buf = static_cast(HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)))); - bkg = static_cast(HDmalloc(nelmts * sizeof(dst_typ_t))); - orig = static_cast(HDmalloc(nelmts * sizeof(src_typ_t))); + buf = static_cast(malloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)))); + bkg = static_cast(malloc(nelmts * sizeof(dst_typ_t))); + orig = static_cast(malloc(nelmts * sizeof(src_typ_t))); for (i = 0; i < nelmts; i++) { s_ptr = (reinterpret_cast(orig)) + i; s_ptr->b = (i * 8 + 1) & 0x7fff; @@ -574,9 +556,9 @@ test_compound_6() } /* Release resources */ - HDfree(buf); - HDfree(bkg); - HDfree(orig); + free(buf); + free(bkg); + free(orig); s_ptr = NULL; d_ptr = NULL; st.close(); @@ -596,9 +578,6 @@ test_compound_6() * overlaps the end of the compound datatype. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 *------------------------------------------------------------------------- */ static void @@ -662,9 +641,6 @@ test_compound_7() * Purpose Tests member function setSize() on compound datatype * * Return None - * - * Programmer Binh-Minh Ribler (use partial C version test_ooo_order) - * March, 2014 *------------------------------------------------------------------------- */ const H5std_string COMPFILE("tcompound_types.h5"); @@ -750,9 +726,6 @@ test_compound_set_size() * Purpose Main compound datatype testing routine * * Return None - * - * Programmer Binh-Minh Ribler - * January 2007 *------------------------------------------------------------------------- */ extern "C" void diff --git a/c++/test/tdspl.cpp b/c++/test/tdspl.cpp index 308285f..bccc41a 100644 --- a/c++/test/tdspl.cpp +++ b/c++/test/tdspl.cpp @@ -60,12 +60,12 @@ test_transfplist() // Find out the length of the transform expression, allocate the buffer // for it, then read and verify the expression from the copied plist size_t tran_len = static_cast(dxpl_c_to_f_copy.getDataTransform(NULL)); - char *c_to_f_read = static_cast(HDmalloc(tran_len + 1)); - HDmemset(c_to_f_read, 0, tran_len + 1); + char *c_to_f_read = static_cast(malloc(tran_len + 1)); + memset(c_to_f_read, 0, tran_len + 1); dxpl_c_to_f_copy.getDataTransform(c_to_f_read, tran_len + 1); verify_val(const_cast(c_to_f_read), const_cast(c_to_f), "DSetMemXferPropList::getDataTransform", __LINE__, __FILE__); - HDfree(c_to_f_read); + free(c_to_f_read); // // Read the expression of each of the prop lists and verify the read @@ -75,12 +75,12 @@ test_transfplist() // Get and verify the expression with: // ssize_t getDataTransform(char* exp, const size_t buf_size [default=0]) tran_len = static_cast(dxpl_c_to_f.getDataTransform(NULL)); - c_to_f_read = static_cast(HDmalloc(tran_len + 1)); - HDmemset(c_to_f_read, 0, tran_len + 1); + c_to_f_read = static_cast(malloc(tran_len + 1)); + memset(c_to_f_read, 0, tran_len + 1); dxpl_c_to_f.getDataTransform(c_to_f_read, tran_len + 1); verify_val(const_cast(c_to_f_read), const_cast(c_to_f), "DSetMemXferPropList::getDataTransform", __LINE__, __FILE__); - HDfree(c_to_f_read); + free(c_to_f_read); // Get and verify the expression with: // H5std_string DSetMemXferPropList::getDataTransform() @@ -91,12 +91,12 @@ test_transfplist() // Get and verify the expression with: // ssize_t getDataTransform(char* exp, const size_t buf_size) tran_len = static_cast(dxpl_utrans_inv.getDataTransform(NULL, 0)); - char *utrans_inv_read = static_cast(HDmalloc(tran_len + 1)); - HDmemset(utrans_inv_read, 0, tran_len + 1); + char *utrans_inv_read = static_cast(malloc(tran_len + 1)); + memset(utrans_inv_read, 0, tran_len + 1); dxpl_utrans_inv.getDataTransform(utrans_inv_read, tran_len + 1); verify_val(const_cast(utrans_inv_read), const_cast(utrans_inv), "DSetMemXferPropList::getDataTransform", __LINE__, __FILE__); - HDfree(utrans_inv_read); + free(utrans_inv_read); PASSED(); } diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp index d683797..212a241 100644 --- a/c++/test/tfile.cpp +++ b/c++/test/tfile.cpp @@ -61,10 +61,6 @@ const H5std_string FILE4("tfile4.h5"); * Purpose Test file and template creations * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2001 - * *------------------------------------------------------------------------- */ static void @@ -263,10 +259,6 @@ test_file_create() * Purpose Test file accesses * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2001 - * *------------------------------------------------------------------------- */ static void @@ -339,9 +331,6 @@ test_file_open() * Purpose Test file size. * * Return None - * - * Programmer Raymond Lu - * June, 2004 *------------------------------------------------------------------------- */ static void @@ -402,9 +391,6 @@ test_file_size() * Purpose Test file number. * * Return None - * - * Programmer Quincey Koziol - * April, 2019 *------------------------------------------------------------------------- */ static void @@ -459,9 +445,6 @@ test_file_num() * Purpose Test getting file's name. * * Return None - * - * Programmer Binh-Minh Ribler - * July, 2004 *------------------------------------------------------------------------- */ const int RANK = 2; @@ -643,7 +626,7 @@ test_file_attribute() verify_val(n_attrs, 1, "DataSet::getNumAttrs()", __LINE__, __FILE__); // Read back attribute's data - HDmemset(rdata, 0, sizeof(rdata)); + memset(rdata, 0, sizeof(rdata)); dattr.read(PredType::NATIVE_INT, rdata); /* Check results */ for (i = 0; i < ATTR1_DIM1; i++) { @@ -670,9 +653,6 @@ test_file_attribute() * versions for the right objects. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * March, 2015 *------------------------------------------------------------------------- */ const H5std_string FILE6("tfile5.h5"); @@ -702,7 +682,7 @@ test_libver_bounds_real(H5F_libver_t libver_create, unsigned oh_vers_create, H5F // Verify object header version another way H5O_native_info_t ninfo; - HDmemset(&ninfo, 0, sizeof(ninfo)); + memset(&ninfo, 0, sizeof(ninfo)); file.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_HDR); verify_val(ninfo.hdr.version, oh_vers_create, "H5File::getNativeObjinfo", __LINE__, __FILE__); @@ -729,7 +709,7 @@ test_libver_bounds_real(H5F_libver_t libver_create, unsigned oh_vers_create, H5F verify_val(obj_version, oh_vers_mod, "Group::objVersion", __LINE__, __FILE__); // Verify object header version another way - HDmemset(&ninfo, 0, sizeof(ninfo)); + memset(&ninfo, 0, sizeof(ninfo)); group.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_HDR); verify_val(ninfo.hdr.version, oh_vers_mod, "Group::getNativeObjinfo", __LINE__, __FILE__); @@ -769,9 +749,6 @@ test_libver_bounds_real(H5F_libver_t libver_create, unsigned oh_vers_create, H5F * libver bounds is handled correctly. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * March 2015 *------------------------------------------------------------------------- */ static void @@ -792,9 +769,6 @@ test_libver_bounds() * Purpose Verify that H5File works as a root group. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * March, 2015 *------------------------------------------------------------------------- */ static void @@ -855,9 +829,6 @@ test_commonfg() * when the file is re-opened. * * Return None - * - * Programmer Binh-Minh Ribler - * February, 2017 *------------------------------------------------------------------------- */ const H5std_string FILE7("tfile7.h5"); @@ -994,9 +965,6 @@ test_file_info() * Purpose Main file testing routine * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January 2001 *------------------------------------------------------------------------- */ extern "C" void diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp index 34078a7..5bfd34c 100644 --- a/c++/test/tfilter.cpp +++ b/c++/test/tfilter.cpp @@ -68,9 +68,6 @@ const H5Z_class2_t H5Z_BOGUS[1] = {{ * Return Success: Data chunk size * * Failure: 0 - * - * Programmer Robb Matzke - * Tuesday, April 21, 1998 *------------------------------------------------------------------------- */ static size_t @@ -92,10 +89,6 @@ filter_bogus(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values * Purpose Test null I/O filter by itself. * * Return None - * - * Programmer Binh-Minh Ribler (use C version, from dsets.c/test_filters) - * January, 2007 - * *------------------------------------------------------------------------- */ const hsize_t chunk_size[2] = {FILTER_CHUNK_DIM1, FILTER_CHUNK_DIM2}; @@ -139,10 +132,6 @@ test_null_filter() * Purpose Test SZIP filter by itself. * * Return None - * - * Programmer Binh-Minh Ribler (partly from dsets.c/test_filters) - * January, 2007 - * *------------------------------------------------------------------------- */ const H5std_string DSET_SZIP_NAME("szipped dataset"); diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp index b9a84e1..04bc3c0 100644 --- a/c++/test/th5s.cpp +++ b/c++/test/th5s.cpp @@ -83,10 +83,6 @@ int space5_data = 7; * Purpose Test basic H5S (dataspace) code * * Return None - * - * Programmer Binh-Minh Ribler (using C version) - * Mar 2001 - * *------------------------------------------------------------------------- */ static void @@ -120,8 +116,8 @@ test_h5s_basic() hsize_t tdims[4]; // Dimension array to test with ndims = sid1.getSimpleExtentDims(tdims); verify_val(ndims, SPACE1_RANK, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__); - verify_val(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(unsigned)), 0, - "DataSpace::getSimpleExtentDims", __LINE__, __FILE__); + verify_val(memcmp(tdims, dims1, SPACE1_RANK * sizeof(unsigned)), 0, "DataSpace::getSimpleExtentDims", + __LINE__, __FILE__); // Create simple dataspace sid2 hsize_t max2[] = {SPACE2_MAX1, SPACE2_MAX2, SPACE2_MAX3, SPACE2_MAX4}; @@ -139,9 +135,9 @@ test_h5s_basic() // Retrieves dimension size and max size of dataspace sid2 and // verify them ndims = sid2.getSimpleExtentDims(tdims, tmax); - verify_val(HDmemcmp(tdims, dims2, SPACE2_RANK * sizeof(unsigned)), 0, - "DataSpace::getSimpleExtentDims", __LINE__, __FILE__); - verify_val(HDmemcmp(tmax, max2, SPACE2_RANK * sizeof(unsigned)), 0, "DataSpace::getSimpleExtentDims", + verify_val(memcmp(tdims, dims2, SPACE2_RANK * sizeof(unsigned)), 0, "DataSpace::getSimpleExtentDims", + __LINE__, __FILE__); + verify_val(memcmp(tmax, max2, SPACE2_RANK * sizeof(unsigned)), 0, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__); // Check to be sure we can't create a simple data space that has too @@ -209,10 +205,6 @@ test_h5s_basic() * Purpose Test scalar H5S (dataspace) writing code * * Return None - * - * Programmer Binh-Minh Ribler (using C version) - * Mar 2001 - * *------------------------------------------------------------------------- */ static void @@ -266,10 +258,6 @@ test_h5s_scalar_write() * Purpose Test scalar H5S (dataspace) reading code * * Return None - * - * Programmer Binh-Minh Ribler (using C version) - * Mar 2001 - * *------------------------------------------------------------------------- */ static void @@ -320,10 +308,6 @@ test_h5s_scalar_read() * Purpose Test null H5S (dataspace) code * * Return None - * - * Programmer Raymond Lu (using C version) - * May 18, 2004 - * *------------------------------------------------------------------------- */ static void @@ -367,10 +351,6 @@ test_h5s_null() * datatypes * * Return None - * - * Programmer Binh-Minh Ribler (using C version) - * Mar 2001 - * *------------------------------------------------------------------------- */ static void @@ -428,10 +408,6 @@ test_h5s_compound_scalar_write() * datatypes * * Return None - * - * Programmer Binh-Minh Ribler (using C version) - * Mar 2001 - * *------------------------------------------------------------------------- */ static void @@ -468,7 +444,7 @@ test_h5s_compound_scalar_read() dataset.read(&rdata, type); // Verify read data - if (HDmemcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) { + if (memcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) { cerr << "scalar data different: space4_data.c1=" << space4_data.c1 << ", read_data4.c1=" << rdata.c1 << endl; cerr << "scalar data different: space4_data.u=" << space4_data.u << ", read_data4.u=" << rdata.u @@ -492,9 +468,6 @@ test_h5s_compound_scalar_read() * Purpose Main dataspace testing routine * * Return None - * - * Programmer Binh-Minh Ribler (using C version) - * Mar 2001 *------------------------------------------------------------------------- */ extern "C" void diff --git a/c++/test/titerate.cpp b/c++/test/titerate.cpp index 5d20f80..4c84d80 100644 --- a/c++/test/titerate.cpp +++ b/c++/test/titerate.cpp @@ -125,9 +125,6 @@ liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_t H5_ATTR * * Return Success: 0 * Failure: -1 - * - * Programmer Binh-Minh Ribler - * Friday, September 9, 2016 *------------------------------------------------------------------------- */ static void @@ -179,7 +176,7 @@ test_iter_group(FileAccPropList &fapl) check_values(lnames[NDATASETS], "HDstrdup returns NULL", __LINE__, __FILE__); /* Sort the dataset names */ - HDqsort(lnames, NDATASETS + 2, sizeof(char *), iter_strcmp); + qsort(lnames, NDATASETS + 2, sizeof(char *), iter_strcmp); /* Iterate through the datasets in the root group in various ways */ @@ -267,7 +264,7 @@ test_iter_group(FileAccPropList &fapl) /* Free the dataset names */ for (int i = 0; i < NDATASETS + 2; i++) - HDfree(lnames[i]); + free(lnames[i]); // Everything will be closed as they go out of scope @@ -384,9 +381,6 @@ printelems(const Group &group, const H5std_string &dsname, const H5std_string &a * Function: test_HDFFV_9920 * * Purpose Tests the fix for HDFFV-9920 - * - * Programmer Binh-Minh Ribler - * Friday, September 9, 2016 *------------------------------------------------------------------------- */ static void @@ -443,9 +437,6 @@ test_HDFFV_9920() * * Return Success: 0 * Failure: -1 - * - * Programmer Binh-Minh Ribler - * Tuesday, September 6, 2016 *------------------------------------------------------------------------- */ extern "C" void diff --git a/c++/test/tlinks.cpp b/c++/test/tlinks.cpp index ebb457a..7017217 100644 --- a/c++/test/tlinks.cpp +++ b/c++/test/tlinks.cpp @@ -67,9 +67,9 @@ test_basic_links(hid_t fapl_id, hbool_t new_format) try { if (new_format) - SUBTEST("Link creation (w/new group format)") + SUBTEST("Link creation (w/new group format)"); else - SUBTEST("Link creation") + SUBTEST("Link creation"); h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename); H5File file(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl); @@ -174,9 +174,9 @@ test_lcpl(hid_t fapl_id, hbool_t new_format) hsize_t dims[2]; if (new_format) - SUBTEST("Link creation property lists (w/new group format)") + SUBTEST("Link creation property lists (w/new group format)"); else - SUBTEST("Link creation property lists") + SUBTEST("Link creation property lists"); try { FileAccPropList fapl(fapl_id); @@ -254,9 +254,9 @@ test_move(hid_t fapl_id, hbool_t new_format) char filename[1024]; if (new_format) - SUBTEST("Group::moveLink (w/new group format)") + SUBTEST("Group::moveLink (w/new group format)"); else - SUBTEST("Group::moveLink") + SUBTEST("Group::moveLink"); try { FileAccPropList fapl(fapl_id); @@ -399,9 +399,9 @@ test_copy(hid_t fapl_id, hbool_t new_format) char filename[1024]; if (new_format) - SUBTEST("Group::copyLink (w/new group format)") + SUBTEST("Group::copyLink (w/new group format)"); else - SUBTEST("Group::copyLink") + SUBTEST("Group::copyLink"); try { // Create two new files @@ -537,9 +537,9 @@ test_num_links(hid_t fapl_id, hbool_t new_format) char filename[NAME_BUF_SIZE]; if (new_format) - SUBTEST("Setting number of links (w/new group format)") + SUBTEST("Setting number of links (w/new group format)"); else - SUBTEST("Setting number of links") + SUBTEST("Setting number of links"); try { // Use the file access template id to create a file access prop. list. @@ -622,9 +622,9 @@ test_visit(hid_t fapl_id, hbool_t new_format) char filename[NAME_BUF_SIZE]; if (new_format) - SUBTEST("H5Object::visit (w/new group format)") + SUBTEST("H5Object::visit (w/new group format)"); else - SUBTEST("H5Object::visit") + SUBTEST("H5Object::visit"); try { // Use the file access template id to create a file access prop. list diff --git a/c++/test/tobject.cpp b/c++/test/tobject.cpp index 696783d..741c628 100644 --- a/c++/test/tobject.cpp +++ b/c++/test/tobject.cpp @@ -57,9 +57,6 @@ const H5std_string DSET_IN_GRP1_2_PATH("/Top Group/Sub-Group 1.2/Dataset_in_Grou * * Return Success: 0 * Failure: -1 - * - * Programmer Binh-Minh Ribler - * Friday, March 4, 2014 *------------------------------------------------------------------------- */ static void @@ -159,9 +156,6 @@ test_get_objname() * * Return Success: 0 * Failure: -1 - * - * Programmer Binh-Minh Ribler - * Friday, March 4, 2014 *------------------------------------------------------------------------- */ static void @@ -242,9 +236,6 @@ test_existance() * * Return Success: 0 * Failure: -1 - * - * Programmer Binh-Minh Ribler - * March 4, 2014 *------------------------------------------------------------------------- */ static void @@ -341,9 +332,6 @@ test_get_objname_ontypes() * * Return Success: 0 * Failure: -1 - * - * Programmer Binh-Minh Ribler - * Friday, March 4, 2014 *------------------------------------------------------------------------- */ static void @@ -406,9 +394,6 @@ test_get_objtype() * Purpose Test Group::getObjId function. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * March, 2017 *------------------------------------------------------------------------- */ const H5std_string GROUPNAME("group"); @@ -551,8 +536,8 @@ test_getobjectinfo_same_file() Group grp2(file1.createGroup(GROUP2NAME)); // Reset object info - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); // Query the info of two groups and verify that they have the same // file number @@ -574,8 +559,8 @@ test_getobjectinfo_same_file() grp2 = file2.openGroup(GROUP2NAME); // Reset object info - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); // Query the info of two groups and verify that they have the same // file number @@ -584,8 +569,8 @@ test_getobjectinfo_same_file() verify_val(oinfo1.fileno, oinfo2.fileno, "file number from getObjinfo", __LINE__, __FILE__); // Reset object info - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); file1.getObjinfo(GROUP1NAME, oinfo1); file1.getObjinfo(GROUP2NAME, oinfo2); diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp index fc7931f..31c5022 100644 --- a/c++/test/trefer.cpp +++ b/c++/test/trefer.cpp @@ -80,9 +80,9 @@ test_reference_params() // Allocate write & read buffers size_t temp_size = MAX(sizeof(unsigned), sizeof(hobj_ref_t)); - wbuf = static_cast(HDmalloc(temp_size * SPACE1_DIM1)); - rbuf = static_cast(HDmalloc(temp_size * SPACE1_DIM1)); - tbuf = static_cast(HDmalloc(temp_size * SPACE1_DIM1)); + wbuf = static_cast(malloc(temp_size * SPACE1_DIM1)); + rbuf = static_cast(malloc(temp_size * SPACE1_DIM1)); + tbuf = static_cast(malloc(temp_size * SPACE1_DIM1)); // Create file FILE1 file1 = new H5File(FILE1, H5F_ACC_TRUNC); @@ -168,9 +168,9 @@ test_reference_params() // Let sid1 go out of scope // Free memory buffers - HDfree(wbuf); - HDfree(rbuf); - HDfree(tbuf); + free(wbuf); + free(rbuf); + free(tbuf); PASSED(); } // end try @@ -206,9 +206,9 @@ test_reference_obj() // Allocate write & read buffers size_t temp_size = MAX(sizeof(unsigned), sizeof(hobj_ref_t)); - wbuf = static_cast(HDmalloc(temp_size * SPACE1_DIM1)); - rbuf = static_cast(HDmalloc(temp_size * SPACE1_DIM1)); - tbuf = static_cast(HDmalloc(temp_size * SPACE1_DIM1)); + wbuf = static_cast(malloc(temp_size * SPACE1_DIM1)); + rbuf = static_cast(malloc(temp_size * SPACE1_DIM1)); + tbuf = static_cast(malloc(temp_size * SPACE1_DIM1)); // Create file FILE1 file1 = new H5File(FILE1, H5F_ACC_TRUNC); @@ -368,9 +368,9 @@ test_reference_obj() file1->close(); // Free allocated buffers - HDfree(wbuf); - HDfree(rbuf); - HDfree(tbuf); + free(wbuf); + free(rbuf); + free(tbuf); PASSED(); } // end try @@ -488,14 +488,14 @@ test_reference_group() // Check object type using Group::getObjinfo() H5O_info2_t oinfo; - HDmemset(&oinfo, 0, sizeof(oinfo)); + memset(&oinfo, 0, sizeof(oinfo)); group.getObjinfo(".", H5_INDEX_NAME, H5_ITER_INC, 0, oinfo); verify_val(static_cast(oinfo.type), static_cast(H5O_TYPE_DATASET), "Group::getObjinfo", __LINE__, __FILE__); // Check for out of bound query by index try { - HDmemset(&oinfo, 0, sizeof(oinfo)); + memset(&oinfo, 0, sizeof(oinfo)); group.getObjinfo(".", H5_INDEX_NAME, H5_ITER_INC, 9, oinfo); // Should FAIL but didn't, so throw an invalid action exception @@ -555,10 +555,10 @@ test_reference_region_1D() *drbuf; // Buffer for reading numeric data from disk // Allocate write & read buffers - wbuf = static_cast(HDcalloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1)); - rbuf = static_cast(HDmalloc(sizeof(hdset_reg_ref_t) * SPACE1_DIM1)); - dwbuf = static_cast(HDmalloc(sizeof(uint8_t) * SPACE3_DIM1)); - drbuf = static_cast(HDcalloc(sizeof(uint8_t), SPACE3_DIM1)); + wbuf = static_cast(calloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1)); + rbuf = static_cast(malloc(sizeof(hdset_reg_ref_t) * SPACE1_DIM1)); + dwbuf = static_cast(malloc(sizeof(uint8_t) * SPACE3_DIM1)); + drbuf = static_cast(calloc(sizeof(uint8_t), SPACE3_DIM1)); // Create file FILE1 H5File file1(FILE2, H5F_ACC_TRUNC); @@ -714,7 +714,7 @@ test_reference_region_1D() /* Allocate space for the hyperslab blocks */ coords = - static_cast(HDmalloc(static_cast(nelms) * SPACE3_RANK * sizeof(hsize_t) * 2)); + static_cast(malloc(static_cast(nelms) * SPACE3_RANK * sizeof(hsize_t) * 2)); // Get the list of hyperslab blocks currently selected reg_sp.getSelectHyperBlocklist(0, static_cast(nelms), coords); @@ -751,7 +751,7 @@ test_reference_region_1D() verify_val(static_cast(coords[28]), 72, "Hyperslab Coordinates", __LINE__, __FILE__); verify_val(static_cast(coords[29]), 73, "Hyperslab Coordinates", __LINE__, __FILE__); - HDfree(coords); + free(coords); // Check boundaries reg_sp.getSelectBounds(low, high); @@ -774,7 +774,7 @@ test_reference_region_1D() /* Allocate space for the hyperslab blocks */ coords = - static_cast(HDmalloc(static_cast(nelmspts) * SPACE3_RANK * sizeof(hsize_t))); + static_cast(malloc(static_cast(nelmspts) * SPACE3_RANK * sizeof(hsize_t))); // Get the list of element points currently selected elm_sp.getSelectElemPointlist(0, static_cast(nelmspts), coords); @@ -791,7 +791,7 @@ test_reference_region_1D() verify_val(coords[8], coord1[8][0], "Element Coordinates", __LINE__, __FILE__); verify_val(coords[9], coord1[9][0], "Element Coordinates", __LINE__, __FILE__); - HDfree(coords); + free(coords); // Check boundaries elm_sp.getSelectBounds(low, high); @@ -808,10 +808,10 @@ test_reference_region_1D() file1.close(); // Free memory buffers - HDfree(wbuf); - HDfree(rbuf); - HDfree(dwbuf); - HDfree(drbuf); + free(wbuf); + free(rbuf); + free(dwbuf); + free(drbuf); PASSED(); } // end try diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp index ff86213..322b72f 100644 --- a/c++/test/ttypes.cpp +++ b/c++/test/ttypes.cpp @@ -44,8 +44,8 @@ using namespace H5; /* #include "H5Tpkg.h" */ -const char *FILENAME[] = {"dtypes1.h5", "dtypes2.h5", "dtypes3.h5", "dtypes4.h5", - "encode_decode.h5", "h5_type_operators.h5", NULL}; +static const char *FILENAME[] = {"dtypes1.h5", "dtypes2.h5", "dtypes3.h5", "dtypes4.h5", + "encode_decode.h5", "h5_type_operators.h5", NULL}; typedef enum flt_t { FLT_FLOAT, FLT_DOUBLE, FLT_LDOUBLE, FLT_OTHER } flt_t; @@ -76,9 +76,6 @@ typedef struct { * Purpose Test type classes * * Return None. - * - * Programmer Binh-Minh Ribler (using C version) - * January, 2007 *------------------------------------------------------------------------- */ static void @@ -113,9 +110,6 @@ test_classes() * Purpose Test datatype copy functionality * * Return None - * - * Programmer Binh-Minh Ribler (using C version) - * January, 2007 *------------------------------------------------------------------------- */ static void @@ -165,9 +159,6 @@ test_copy() * Purpose Test DataType::detectClass() * * Return None - * - * Programmer Binh-Minh Ribler (using C version) - * August, 2017 *------------------------------------------------------------------------- */ typedef struct { /* Struct with atomic fields */ @@ -359,9 +350,6 @@ test_detect_type_class() * Purpose Tests VarLenType class * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * August, 2017 *------------------------------------------------------------------------- */ static void @@ -432,9 +420,6 @@ test_vltype() * Purpose Tests query functions of compound and enumeration types. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 *------------------------------------------------------------------------- */ const H5std_string CompT_NAME("Compound_type"); @@ -462,11 +447,16 @@ test_query() // Create a enumerate datatype EnumType tid2(sizeof(short)); - tid2.insert("RED", (enum_val = 0, &enum_val)); - tid2.insert("GREEN", (enum_val = 1, &enum_val)); - tid2.insert("BLUE", (enum_val = 2, &enum_val)); - tid2.insert("ORANGE", (enum_val = 3, &enum_val)); - tid2.insert("YELLOW", (enum_val = 4, &enum_val)); + enum_val = 0; + tid2.insert("RED", &enum_val); + enum_val = 1; + tid2.insert("GREEN", &enum_val); + enum_val = 2; + tid2.insert("BLUE", &enum_val); + enum_val = 3; + tid2.insert("ORANGE", &enum_val); + enum_val = 4; + tid2.insert("YELLOW", &enum_val); // Query member number and member index by name, for compound type int nmembs = tid1.getNmembers(); @@ -552,9 +542,6 @@ test_query() * Purpose Tests transient datatypes. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 *------------------------------------------------------------------------- */ @@ -631,9 +618,6 @@ test_transient() * Purpose Tests named datatypes. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 *------------------------------------------------------------------------- */ @@ -798,9 +782,6 @@ test_named() * Purpose Test datatype encode/decode functionality. * * Return None - * - * Programmer Binh-Minh Ribler (using C version) - * August, 2017 *------------------------------------------------------------------------- */ const int ARRAY1_RANK = 1; @@ -859,11 +840,16 @@ test_encode_decode() // Create a enumerate datatype EnumType enumtyp(sizeof(short)); - enumtyp.insert("RED", (enum_val = 0, &enum_val)); - enumtyp.insert("GREEN", (enum_val = 1, &enum_val)); - enumtyp.insert("BLUE", (enum_val = 2, &enum_val)); - enumtyp.insert("ORANGE", (enum_val = 3, &enum_val)); - enumtyp.insert("YELLOW", (enum_val = 4, &enum_val)); + enum_val = 0; + enumtyp.insert("RED", &enum_val); + enum_val = 1; + enumtyp.insert("GREEN", &enum_val); + enum_val = 2; + enumtyp.insert("BLUE", &enum_val); + enum_val = 3; + enumtyp.insert("ORANGE", &enum_val); + enum_val = 4; + enumtyp.insert("YELLOW", &enum_val); // Encode compound type in a buffer enumtyp.encode(); @@ -1018,9 +1004,6 @@ test_encode_decode() * Purpose Test datatype encode/decode functionality. * * Return None - * - * Programmer Binh-Minh Ribler (using C version) - * August, 2017 *------------------------------------------------------------------------- */ @@ -1060,9 +1043,12 @@ test_operators() // Create an enumerate datatype EnumType enumtyp(sizeof(short)); - enumtyp.insert("RED", (enum_val = 0, &enum_val)); - enumtyp.insert("GREEN", (enum_val = 1, &enum_val)); - enumtyp.insert("BLUE", (enum_val = 2, &enum_val)); + enum_val = 0; + enumtyp.insert("RED", &enum_val); + enum_val = 1; + enumtyp.insert("GREEN", &enum_val); + enum_val = 2; + enumtyp.insert("BLUE", &enum_val); // Verify that operator== and operator!= work properly verify_val(cmptyp == enumtyp, false, "DataType::operator==", __LINE__, __FILE__); diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp index 1cde7f1..748333f 100644 --- a/c++/test/tvlstr.cpp +++ b/c++/test/tvlstr.cpp @@ -65,7 +65,7 @@ static void *test_vlstr_alloc_custom(size_t size, void *info) extra=MAX(sizeof(void *),sizeof(size_t)); - if((ret_value=HDmalloc(extra+size))!=NULL) { + if((ret_value=malloc(extra+size))!=NULL) { *(size_t *)ret_value=size; *mem_used+=size; } // end if @@ -108,7 +108,7 @@ static void test_vlstr_free_custom(void *_mem, void *info) if(_mem!=NULL) { mem=((unsigned char *)_mem)-extra; *mem_used-=*(size_t *)mem; - HDfree(mem); + free(mem); } // end if } #endif @@ -119,10 +119,6 @@ static void test_vlstr_free_custom(void *_mem, void *info) * Purpose Test writing/reading VL strings on datasets. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 - * *------------------------------------------------------------------------- */ // String for testing datasets @@ -166,7 +162,7 @@ test_vlstring_dataset() TestErrPrintf("Line %d: Attribute data different: DSET1_DATA=%s,string_ds_check=%s\n", __LINE__, DSET1_DATA.c_str(), string_ds_check); - HDfree(string_ds_check); // note: no need for std::string test + free(string_ds_check); // note: no need for std::string test string_ds_check = NULL; // Read and verify the dataset string as an std::string. @@ -182,8 +178,8 @@ test_vlstring_dataset() // Test scalar type dataset with 1 value. dset1 = root.createDataSet("test_scalar_small", vlst, ds_space); - dynstring_ds_write = static_cast(HDcalloc(2, sizeof(char))); - HDmemset(dynstring_ds_write, 'A', 1); + dynstring_ds_write = static_cast(calloc(2, sizeof(char))); + memset(dynstring_ds_write, 'A', 1); // Write data to the dataset, then read it back. dset1.write(&dynstring_ds_write, vlst); @@ -193,7 +189,7 @@ test_vlstring_dataset() if (HDstrcmp(string_ds_check, dynstring_ds_write) != 0) TestErrPrintf("VL string datasets don't match!, dynstring_ds_write=%s, string_ds_check=%s\n", dynstring_ds_write, string_ds_check); - HDfree(string_ds_check); + free(string_ds_check); string_ds_check = NULL; dset1.close(); @@ -213,9 +209,9 @@ test_vlstring_dataset() } if (dynstring_ds_write) - HDfree(dynstring_ds_write); + free(dynstring_ds_write); if (string_ds_check) - HDfree(string_ds_check); + free(string_ds_check); } // test_vlstring_dataset() /*------------------------------------------------------------------------- @@ -224,10 +220,6 @@ test_vlstring_dataset() * Purpose Test writing/reading VL string array to/from datasets. * * Return None - * - * Programmer Binh-Minh Ribler - * July, 2009 - * *------------------------------------------------------------------------- */ const H5std_string DSSTRARR_NAME("StringArray_dset"); @@ -268,7 +260,7 @@ test_vlstring_array_dataset() TestErrPrintf("Line %d: Dataset data different: written=%s,read=%s\n", __LINE__, string_ds_array[ii], string_ds_check[ii]); - HDfree(string_ds_check[ii]); + free(string_ds_check[ii]); } // Close objects that are no longer needed. @@ -284,8 +276,8 @@ test_vlstring_array_dataset() // Create and write another dataset. DataSet dataset2(file1->createDataSet("Dataset2", vlst, scalar_space)); - char *wdata2 = static_cast(HDcalloc(65534, sizeof(char))); - HDmemset(wdata2, 'A', 65533); + char *wdata2 = static_cast(calloc(65534, sizeof(char))); + memset(wdata2, 'A', 65533); dataset2.write(&wdata2, vlst); char *rdata2; @@ -296,8 +288,8 @@ test_vlstring_array_dataset() // Release resources from second dataset operation. scalar_space.close(); dataset2.close(); - HDfree(wdata2); - HDfree(rdata2); + free(wdata2); + free(rdata2); // Close objects and file. dataset2.close(); @@ -322,10 +314,6 @@ test_vlstring_array_dataset() * zero-sized. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 - * *------------------------------------------------------------------------- */ static void @@ -442,10 +430,6 @@ test_vlstrings_special() * Purpose Test if VL string is treated as string. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 - * *------------------------------------------------------------------------- */ const H5std_string VLSTR_TYPE("vl_string_type"); @@ -541,10 +525,6 @@ test_vlstring_type() * Purpose Test storing VL strings in compact datasets. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 - * *------------------------------------------------------------------------- */ static void @@ -620,10 +600,6 @@ test_compact_vlstring() * Purpose Test writing/reading VL strings on attributes. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 - * *------------------------------------------------------------------------- */ static char *string_att_write = NULL; @@ -662,7 +638,7 @@ test_vlstring_attribute() TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,string_att_check=%s\n", __LINE__, ATTRSTR_DATA.c_str(), string_att_check); - HDfree(string_att_check); // note: no need for std::string test + free(string_att_check); // note: no need for std::string test // Read and verify the attribute string as an std::string. H5std_string read_str; @@ -677,8 +653,8 @@ test_vlstring_attribute() // Test creating a "large" sized string attribute gr_attr = root.createAttribute("test_scalar_large", vlst, att_space); - string_att_write = static_cast(HDcalloc(8192, sizeof(char))); - HDmemset(string_att_write, 'A', 8191); + string_att_write = static_cast(calloc(8192, sizeof(char))); + memset(string_att_write, 'A', 8191); // Write data to the attribute, then read it back. gr_attr.write(vlst, &string_att_write); @@ -690,8 +666,8 @@ test_vlstring_attribute() string_att_write, string_att_check); // Release resources. - HDfree(string_att_check); - HDfree(string_att_write); + free(string_att_check); + free(string_att_write); gr_attr.close(); file1.close(); @@ -711,10 +687,6 @@ test_vlstring_attribute() * Purpose Test reading VL strings from attributes. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 - * *------------------------------------------------------------------------- */ static void test_read_vl_string_attribute() @@ -739,7 +711,7 @@ static void test_read_vl_string_attribute() att.read(vlst, &string_att_check); if(HDstrcmp(string_att_check,ATTRSTR_DATA.c_str())!=0) TestErrPrintf("VL string attributes don't match!, string_att=%s, string_att_check=%s\n",ATTRSTR_DATA.c_str(),string_att_check); - HDfree(string_att_check); + free(string_att_check); att.close(); // Test reading "large" sized string attribute @@ -747,8 +719,8 @@ static void test_read_vl_string_attribute() att.read(vlst, &string_att_check); if(HDstrcmp(string_att_check,string_att_write)!=0) TestErrPrintf("VL string attributes don't match!, string_att_write=%s, string_att_check=%s\n",string_att_write,string_att_check); - HDfree(string_att_check); - HDfree(string_att_write); // Free string allocated in test_write_vl_string_attribute + free(string_att_check); + free(string_att_write); // Free string allocated in test_write_vl_string_attribute // Close objects and file. att.close(); @@ -773,10 +745,6 @@ static void test_read_vl_string_attribute() * Purpose Test writing/reading VL string array to/from attributes. * * Return None - * - * Programmer Binh-Minh Ribler - * July, 2009 - * *------------------------------------------------------------------------- */ const H5std_string ATTRSTRARR_NAME("StringArray_attr"); @@ -821,7 +789,7 @@ test_vlstring_array_attribute() TestErrPrintf("Line %d: Attribute data different: written=%s,read=%s\n", __LINE__, string_att_check[ii], string_att_check[ii]); - HDfree(string_att_check[ii]); // note: no need for std::string test + free(string_att_check[ii]); // note: no need for std::string test } // Close group's attribute. @@ -869,7 +837,7 @@ read_scalar_dset(H5File &file, DataType &type, DataSpace &space, char *name, cha if (HDstrcmp(data, data_read) != 0) TestErrPrintf("Expected %s for dataset %s but read %s\n", data, name, data_read); - HDfree(data_read); + free(data_read); } // end try catch (FileIException &ferr) { throw; @@ -886,10 +854,6 @@ read_scalar_dset(H5File &file, DataType &type, DataSpace &space, char *name, cha * have been linked/unlinked. * * Return None - * - * Programmer Binh-Minh Ribler (use C version) - * January, 2007 - * *------------------------------------------------------------------------- */ const H5std_string FILENAME2("tvlstr2.h5"); @@ -967,10 +931,6 @@ test_vl_rewrite() * Purpose VL string testing main routine. * * Return None - * - * Programmer Binh-Minh Ribler - * January, 2007 - * *------------------------------------------------------------------------- */ extern "C" void -- cgit v0.12