Description:

Removed commented out code and fixed miscellaneous typos.
Platforms tested:
    Linux/32 2.6 (jam) (very minor)
This commit is contained in:
Binh-Minh Ribler 2016-12-23 13:24:45 -06:00
parent cc06c9702b
commit e05da1b533
19 changed files with 9 additions and 65 deletions

View File

@ -34,7 +34,7 @@ class H5_DLLCPP ArrayType : public DataType {
// Assignment operator
ArrayType& operator=(const ArrayType& rhs);
// Constructors that opens a named array datatype, given a location.
// Constructors that open an array datatype, given a location.
ArrayType(const H5Location& loc, const char* name);
ArrayType(const H5Location& loc, const H5std_string& name);

View File

@ -20,6 +20,7 @@
#endif
#include <string>
#include "H5private.h" // for HDfree
#include "H5Include.h"
#include "H5Exception.h"
#include "H5IdComponent.h"
@ -34,7 +35,6 @@
#include "H5DataType.h"
#include "H5DataSpace.h"
#include "H5Attribute.h"
#include "H5private.h" // for HDfree
namespace H5 {
using std::cerr;

View File

@ -25,8 +25,6 @@ namespace H5 {
class PropList;
class FileCreatPropList;
class FileAccPropList;
/* class LinkAccPropList;
*/
class DSetCreatPropList;
class DSetMemXferPropList;
class DTypePropList;

View File

@ -28,7 +28,6 @@
#include "H5AbstractDs.h"
#include "H5DataSpace.h"
#include "H5DataSet.h"
#include "H5private.h"
namespace H5 {

View File

@ -42,7 +42,7 @@ class H5_DLLCPP CompType : public DataType {
// Copy constructor - makes a copy of original object
CompType( const CompType& original );
// Constructors that opens a compound datatype, given a location.
// Constructors that open a compound datatype, given a location.
CompType(const H5Location& loc, const char* name);
CompType(const H5Location& loc, const H5std_string& name);

View File

@ -27,8 +27,6 @@
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5DxferProp.h"
/* #include "H5LaccProp.h"
*/
#include "H5Location.h"
#include "H5Object.h"
#include "H5AbstractDs.h"

View File

@ -14,9 +14,6 @@
* access to either file, you may request a copy from help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
// Class DataType inherits from H5Object and has several subclasses for
// specific HDF5 data types.
#ifndef __H5DataType_H
#define __H5DataType_H

View File

@ -14,9 +14,6 @@
* access to either file, you may request a copy from help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
// Class DSetCreatPropList represents the HDF5 dataset creation property list
// and inherits from PropList.
#ifndef __H5DSCreatPropList_H
#define __H5DSCreatPropList_H

View File

@ -14,9 +14,6 @@
* access to either file, you may request a copy from help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
// Class DSetMemXferPropList represents the HDF5 dataset transfer property list
// and inherits from PropList.
#ifndef __H5DSetMemXferPropList_H
#define __H5DSetMemXferPropList_H

View File

@ -38,7 +38,7 @@ class H5_DLLCPP EnumType : public DataType {
// Creates a new enum datatype based on an integer datatype
EnumType( const IntType& data_type ); // H5Tenum_create
// Constructors that opens an enum datatype, given a location.
// Constructors that open an enum datatype, given a location.
EnumType(const H5Location& loc, const char* name);
EnumType(const H5Location& loc, const H5std_string& name);

View File

@ -14,9 +14,6 @@
* access to either file, you may request a copy from help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
// Class FileAccPropList represents the HDF5 file access property list and
// inherits from DataType.
#ifndef __H5FileAccPropList_H
#define __H5FileAccPropList_H

View File

@ -33,7 +33,7 @@ class H5_DLLCPP FloatType : public AtomType {
// Gets the floating-point datatype of the specified dataset.
FloatType( const DataSet& dataset );
// Constructors that opens an HDF5 float datatype, given a location.
// Constructors that open an HDF5 float datatype, given a location.
FloatType(const H5Location& loc, const char* name);
FloatType(const H5Location& loc, const H5std_string& name);

View File

@ -20,7 +20,6 @@
#endif
#include <string>
#include "H5private.h" // for HDstrcpy
#include "H5Include.h"
#include "H5Exception.h"
#include "H5IdComponent.h"

View File

@ -33,7 +33,7 @@ class H5_DLLCPP IntType : public AtomType {
// Gets the integer datatype of the specified dataset
IntType(const DataSet& dataset);
// Constructors that opens an HDF5 integer datatype, given a location.
// Constructors that open an HDF5 integer datatype, given a location.
IntType(const H5Location& loc, const char* name);
IntType(const H5Location& loc, const H5std_string& name);

View File

@ -256,40 +256,6 @@ int H5Object::iterateAttrs( attr_operator_t user_op, unsigned *_idx, void *op_da
throw AttributeIException(inMemFunc("iterateAttrs"), "H5Aiterate2 failed");
}
//--------------------------------------------------------------------------
// Function: H5Object::objVersion
///\brief Returns the header version of this HDF5 object.
///\return Object version, which can have the following values:
/// \li \c H5O_VERSION_1
/// \li \c H5O_VERSION_2
///\exception H5::ObjHeaderIException
/// 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
{
H5O_info_t objinfo;
unsigned version = 0;
// Use C API to get information of the object
herr_t ret_value = H5Oget_info(getId(), &objinfo);
// Throw exception if C API returns failure
if (ret_value < 0)
throw Exception(inMemFunc("objVersion"), "H5Oget_info failed");
// Return a valid version or throw an exception for invalid value
else
{
version = objinfo.hdr.version;
if (version != H5O_VERSION_1 && version != H5O_VERSION_2)
throw ObjHeaderIException("objVersion", "Invalid version for object");
}
return(version);
}
*/
//--------------------------------------------------------------------------
// Function: H5Object::getNumAttrs
///\brief Returns the number of attributes attached to this HDF5 object.

View File

@ -77,10 +77,6 @@ class H5_DLLCPP H5Object : public H5Location {
// Iterate user's function over the attributes of this object.
int iterateAttrs(attr_operator_t user_op, unsigned* idx = NULL, void* op_data = NULL);
// Returns the object header version of an object
/* unsigned objVersion() const;
*/
// Determines the number of attributes belong to this object.
int getNumAttrs() const;

View File

@ -21,7 +21,7 @@
#include <string>
#include "H5private.h" // for HDfree
#include "H5private.h" // for HDmemset
#include "H5Include.h"
#include "H5Exception.h"
#include "H5IdComponent.h"

View File

@ -39,7 +39,7 @@ class H5_DLLCPP StrType : public AtomType {
// Gets the string datatype of the specified dataset
StrType(const DataSet& dataset);
// Constructors that opens an HDF5 string datatype, given a location.
// Constructors that open an HDF5 string datatype, given a location.
StrType(const H5Location& loc, const char* name);
StrType(const H5Location& loc, const H5std_string& name);

View File

@ -40,7 +40,7 @@ class H5_DLLCPP VarLenType : public DataType {
// Constructor that takes an existing id
VarLenType( const hid_t existing_id );
// Constructors that opens a variable-length datatype, given a location.
// Constructors that open a variable-length datatype, given a location.
VarLenType(const H5Location& loc, const char* name);
VarLenType(const H5Location& loc, const H5std_string& name);