summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2016-12-23 19:24:45 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2016-12-23 19:24:45 (GMT)
commite05da1b533d5eb9527a5b67ba2683379f8e1e7ac (patch)
tree4b8d76febf5fa13163d1fefe1fefa8856376681a
parentcc06c9702bfc3d0ff6bf3de1a07ac2b1d0594c0f (diff)
downloadhdf5-e05da1b533d5eb9527a5b67ba2683379f8e1e7ac.zip
hdf5-e05da1b533d5eb9527a5b67ba2683379f8e1e7ac.tar.gz
hdf5-e05da1b533d5eb9527a5b67ba2683379f8e1e7ac.tar.bz2
Description:
Removed commented out code and fixed miscellaneous typos. Platforms tested: Linux/32 2.6 (jam) (very minor)
-rw-r--r--c++/src/H5ArrayType.h2
-rw-r--r--c++/src/H5Attribute.cpp2
-rw-r--r--c++/src/H5Classes.h2
-rw-r--r--c++/src/H5CompType.cpp1
-rw-r--r--c++/src/H5CompType.h2
-rw-r--r--c++/src/H5Cpp.h2
-rw-r--r--c++/src/H5DataType.h3
-rw-r--r--c++/src/H5DcreatProp.h3
-rw-r--r--c++/src/H5DxferProp.h3
-rw-r--r--c++/src/H5EnumType.h2
-rw-r--r--c++/src/H5FaccProp.h3
-rw-r--r--c++/src/H5FloatType.h2
-rw-r--r--c++/src/H5Group.cpp1
-rw-r--r--c++/src/H5IntType.h2
-rw-r--r--c++/src/H5Object.cpp34
-rw-r--r--c++/src/H5Object.h4
-rw-r--r--c++/src/H5PropList.cpp2
-rw-r--r--c++/src/H5StrType.h2
-rw-r--r--c++/src/H5VarLenType.h2
19 files changed, 9 insertions, 65 deletions
diff --git a/c++/src/H5ArrayType.h b/c++/src/H5ArrayType.h
index 42e1c2b..65917ae 100644
--- a/c++/src/H5ArrayType.h
+++ b/c++/src/H5ArrayType.h
@@ -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);
diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index 74d246f..c71c035 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -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;
diff --git a/c++/src/H5Classes.h b/c++/src/H5Classes.h
index a1525cc..bed0cae 100644
--- a/c++/src/H5Classes.h
+++ b/c++/src/H5Classes.h
@@ -25,8 +25,6 @@ namespace H5 {
class PropList;
class FileCreatPropList;
class FileAccPropList;
- /* class LinkAccPropList;
- */
class DSetCreatPropList;
class DSetMemXferPropList;
class DTypePropList;
diff --git a/c++/src/H5CompType.cpp b/c++/src/H5CompType.cpp
index 887151e..0562e75 100644
--- a/c++/src/H5CompType.cpp
+++ b/c++/src/H5CompType.cpp
@@ -28,7 +28,6 @@
#include "H5AbstractDs.h"
#include "H5DataSpace.h"
#include "H5DataSet.h"
-#include "H5private.h"
namespace H5 {
diff --git a/c++/src/H5CompType.h b/c++/src/H5CompType.h
index 879e4f1..3337df7 100644
--- a/c++/src/H5CompType.h
+++ b/c++/src/H5CompType.h
@@ -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);
diff --git a/c++/src/H5Cpp.h b/c++/src/H5Cpp.h
index 967f689..90f0a2a 100644
--- a/c++/src/H5Cpp.h
+++ b/c++/src/H5Cpp.h
@@ -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"
diff --git a/c++/src/H5DataType.h b/c++/src/H5DataType.h
index 7036836..4e904a6 100644
--- a/c++/src/H5DataType.h
+++ b/c++/src/H5DataType.h
@@ -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
diff --git a/c++/src/H5DcreatProp.h b/c++/src/H5DcreatProp.h
index 787d3ec..60ce1d5 100644
--- a/c++/src/H5DcreatProp.h
+++ b/c++/src/H5DcreatProp.h
@@ -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
diff --git a/c++/src/H5DxferProp.h b/c++/src/H5DxferProp.h
index 81361cf..42194fb 100644
--- a/c++/src/H5DxferProp.h
+++ b/c++/src/H5DxferProp.h
@@ -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
diff --git a/c++/src/H5EnumType.h b/c++/src/H5EnumType.h
index b4ffe43..054811b 100644
--- a/c++/src/H5EnumType.h
+++ b/c++/src/H5EnumType.h
@@ -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);
diff --git a/c++/src/H5FaccProp.h b/c++/src/H5FaccProp.h
index a0605e0..aec5fcc 100644
--- a/c++/src/H5FaccProp.h
+++ b/c++/src/H5FaccProp.h
@@ -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
diff --git a/c++/src/H5FloatType.h b/c++/src/H5FloatType.h
index 1f3b409..1f4b227 100644
--- a/c++/src/H5FloatType.h
+++ b/c++/src/H5FloatType.h
@@ -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);
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp
index fa0a206..4325a68 100644
--- a/c++/src/H5Group.cpp
+++ b/c++/src/H5Group.cpp
@@ -20,7 +20,6 @@
#endif
#include <string>
-#include "H5private.h" // for HDstrcpy
#include "H5Include.h"
#include "H5Exception.h"
#include "H5IdComponent.h"
diff --git a/c++/src/H5IntType.h b/c++/src/H5IntType.h
index 09a311f..74786b9 100644
--- a/c++/src/H5IntType.h
+++ b/c++/src/H5IntType.h
@@ -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);
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp
index 66699d4..d656ccf 100644
--- a/c++/src/H5Object.cpp
+++ b/c++/src/H5Object.cpp
@@ -257,40 +257,6 @@ int H5Object::iterateAttrs( attr_operator_t user_op, unsigned *_idx, void *op_da
}
//--------------------------------------------------------------------------
-// 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.
///\return Number of attributes
diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h
index 70acda9..72a9f50 100644
--- a/c++/src/H5Object.h
+++ b/c++/src/H5Object.h
@@ -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;
diff --git a/c++/src/H5PropList.cpp b/c++/src/H5PropList.cpp
index 42c9b83..f0eb847 100644
--- a/c++/src/H5PropList.cpp
+++ b/c++/src/H5PropList.cpp
@@ -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"
diff --git a/c++/src/H5StrType.h b/c++/src/H5StrType.h
index 5ff88b6..b920a3b 100644
--- a/c++/src/H5StrType.h
+++ b/c++/src/H5StrType.h
@@ -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);
diff --git a/c++/src/H5VarLenType.h b/c++/src/H5VarLenType.h
index accb13e..af4f7b7 100644
--- a/c++/src/H5VarLenType.h
+++ b/c++/src/H5VarLenType.h
@@ -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);