summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2012-09-28 22:18:33 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2012-09-28 22:18:33 (GMT)
commit9c3f82fbd762af5711ce11e394fed4360156c5af (patch)
tree305e340b8fda154db0a5905816ec7a3141dce8e1
parent51bb0fe2d2d03b5744d0358f379ec3139090503c (diff)
downloadhdf5-9c3f82fbd762af5711ce11e394fed4360156c5af.zip
hdf5-9c3f82fbd762af5711ce11e394fed4360156c5af.tar.gz
hdf5-9c3f82fbd762af5711ce11e394fed4360156c5af.tar.bz2
[svn-r22845] Purpose: Misc fixes
Description: Fixed miscellaneous inconsistencies and typos, which also took care of the failure in Packet Table test on daily test today. Platforms tested: Linux/32 2.6 (jam) Linux/64 2.6 (koala) Mac Lion (duck)
-rw-r--r--c++/src/H5AbstractDs.h2
-rw-r--r--c++/src/H5ArrayType.h2
-rw-r--r--c++/src/H5AtomType.h2
-rw-r--r--c++/src/H5Attribute.h2
-rw-r--r--c++/src/H5CompType.h20
-rw-r--r--c++/src/H5CppDoc.h2
-rw-r--r--c++/src/H5DataSet.cpp21
-rw-r--r--c++/src/H5DataSet.h4
-rw-r--r--c++/src/H5DataSpace.h2
-rw-r--r--c++/src/H5DataType.cpp20
-rw-r--r--c++/src/H5DataType.h2
-rw-r--r--c++/src/H5DcreatProp.h2
-rw-r--r--c++/src/H5DxferProp.h2
-rw-r--r--c++/src/H5EnumType.h2
-rw-r--r--c++/src/H5FaccProp.h2
-rw-r--r--c++/src/H5FcreatProp.h2
-rw-r--r--c++/src/H5File.cpp82
-rw-r--r--c++/src/H5File.h13
-rw-r--r--c++/src/H5FloatType.h2
-rw-r--r--c++/src/H5Group.cpp20
-rw-r--r--c++/src/H5Group.h2
-rw-r--r--c++/src/H5IdComponent.h2
-rw-r--r--c++/src/H5IntType.h2
-rw-r--r--c++/src/H5Object.cpp21
-rw-r--r--c++/src/H5Object.h20
-rw-r--r--c++/src/H5PredType.h2
-rw-r--r--c++/src/H5PropList.h2
-rw-r--r--c++/src/H5StrType.h2
-rw-r--r--c++/src/H5VarLenType.h2
-rw-r--r--c++/test/dsets.cpp11
-rw-r--r--c++/test/th5s.cpp2
31 files changed, 50 insertions, 224 deletions
diff --git a/c++/src/H5AbstractDs.h b/c++/src/H5AbstractDs.h
index 1d04d6c..354b47b 100644
--- a/c++/src/H5AbstractDs.h
+++ b/c++/src/H5AbstractDs.h
@@ -65,7 +65,7 @@ class H5_DLLCPP AbstractDs {
// dataset - pure virtual.
virtual hsize_t getStorageSize() const = 0;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass() const = 0;
// Copy constructor
diff --git a/c++/src/H5ArrayType.h b/c++/src/H5ArrayType.h
index d50017a..7daafed 100644
--- a/c++/src/H5ArrayType.h
+++ b/c++/src/H5ArrayType.h
@@ -36,7 +36,7 @@ class H5_DLLCPP ArrayType : public DataType {
// Returns the sizes of dimensions of this array datatype.
int getArrayDims(hsize_t* dims);
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("ArrayType"); }
// Copy constructor: makes copy of the original object.
diff --git a/c++/src/H5AtomType.h b/c++/src/H5AtomType.h
index 1ddfd7d..25770f5 100644
--- a/c++/src/H5AtomType.h
+++ b/c++/src/H5AtomType.h
@@ -57,7 +57,7 @@ class H5_DLLCPP AtomType : public DataType {
// Sets the total size for an atomic datatype.
void setSize( size_t size ) const;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("AtomType"); }
// Copy constructor - makes copy of the original object
diff --git a/c++/src/H5Attribute.h b/c++/src/H5Attribute.h
index ff4dac6..dd37a99 100644
--- a/c++/src/H5Attribute.h
+++ b/c++/src/H5Attribute.h
@@ -55,7 +55,7 @@ class H5_DLLCPP Attribute : public AbstractDs, public IdComponent {
// attribute to disk
void flush( H5F_scope_t scope ) const;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("Attribute"); }
// Creates a copy of an existing attribute using the attribute id
diff --git a/c++/src/H5CompType.h b/c++/src/H5CompType.h
index ae030ee..9b2b572 100644
--- a/c++/src/H5CompType.h
+++ b/c++/src/H5CompType.h
@@ -26,12 +26,21 @@ namespace H5 {
class H5_DLLCPP CompType : public DataType {
public:
+ // Default constructor
+ CompType();
+
+ // Creates a compound datatype using an existing id
+ CompType( const hid_t existing_id );
+
// Creates a new compound datatype, given the type's size
CompType( size_t size ); // H5Tcreate
// Gets the compound datatype of the specified dataset
CompType( const DataSet& dataset ); // H5Dget_type
+ // Copy constructor - makes a copy of original object
+ CompType( const CompType& original );
+
// Returns the type class of the specified member of this compound
// datatype. It provides to the user a way of knowing what type
// to create another datatype of the same class
@@ -88,18 +97,9 @@ class H5_DLLCPP CompType : public DataType {
// Recursively removes padding from within this compound datatype.
void pack() const;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("CompType"); }
- // Default constructor
- CompType();
-
- // Creates a compound datatype using an existing id
- CompType( const hid_t existing_id );
-
- // Copy constructor - makes a copy of original object
- CompType( const CompType& original );
-
// Noop destructor.
virtual ~CompType();
diff --git a/c++/src/H5CppDoc.h b/c++/src/H5CppDoc.h
index b974238..ab3fa79 100644
--- a/c++/src/H5CppDoc.h
+++ b/c++/src/H5CppDoc.h
@@ -30,7 +30,7 @@
* It is assumed that the user has knowledge of the HDF5 file format
* and its components. If you are not familiar with HDF5 file format,
* and would like to find out more, please refer to the HDF5 documentation
- * at http://hdf.ncsa.uiuc.edu/HDF5/doc/H5.intro.html
+ * at http://www.hdfgroup.org/HDF5/doc/index.html
*
* Because the HDF5 library maps very well to
* the object oriented design approach, classes in the C++ API can
diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp
index 624aa6f..6a1524d 100644
--- a/c++/src/H5DataSet.cpp
+++ b/c++/src/H5DataSet.cpp
@@ -645,27 +645,6 @@ void DataSet::fillMemBuf(void *buf, DataType& buf_type, DataSpace& space)
}
//--------------------------------------------------------------------------
-// Function: DataSet::getRegion
-///\brief Retrieves a dataspace with the region pointed to selected.
-///\param ref - IN: Reference to get region of
-///\param ref_type - IN: Type of reference to get region of - default
-/// to H5R_DATASET_REGION
-///\return DataSpace instance
-///\exception H5::DataSetIException
-// Programmer Binh-Minh Ribler - May, 2004
-//--------------------------------------------------------------------------
-DataSpace DataSet::getRegion(void *ref, H5R_type_t ref_type) const
-{
- try {
- DataSpace dataspace(p_get_region(ref, ref_type));
- return(dataspace);
- }
- catch (IdComponentException E) {
- throw DataSetIException("DataSet::getRegion", E.getDetailMsg());
- }
-}
-
-//--------------------------------------------------------------------------
// Function: DataSet::getId
///\brief Get the id of this dataset.
// Description:
diff --git a/c++/src/H5DataSet.h b/c++/src/H5DataSet.h
index 406f7e2..54e9d6f 100644
--- a/c++/src/H5DataSet.h
+++ b/c++/src/H5DataSet.h
@@ -79,7 +79,7 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
// Retrieves a dataspace with the region pointed to selected.
DataSpace getRegion(void *ref, H5R_type_t ref_type = H5R_DATASET_REGION) const;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("DataSet"); }
// Creates a dataset by way of dereference.
@@ -105,6 +105,7 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
private:
hid_t id; // HDF5 dataset id
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
// This function contains the common code that is used by
// getTypeClass and various API functions getXxxType
// defined in AbstractDs for generic datatype and specific
@@ -118,6 +119,7 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
protected:
// Sets the dataset id.
virtual void p_setId(const hid_t new_id);
+#endif // DOXYGEN_SHOULD_SKIP_THIS
};
#ifndef H5_NO_NAMESPACE
}
diff --git a/c++/src/H5DataSpace.h b/c++/src/H5DataSpace.h
index 80842f7..9afb8ab 100644
--- a/c++/src/H5DataSpace.h
+++ b/c++/src/H5DataSpace.h
@@ -103,7 +103,7 @@ class H5_DLLCPP DataSpace : public IdComponent {
// Sets or resets the size of this dataspace.
void setExtentSimple( int rank, const hsize_t *current_size, const hsize_t *maximum_size = NULL ) const;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("DataSpace"); }
// Creates a DataSpace object using an existing dataspace id.
diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp
index 7533da2..99525bc 100644
--- a/c++/src/H5DataType.cpp
+++ b/c++/src/H5DataType.cpp
@@ -680,26 +680,6 @@ bool DataType::isVariableStr() const
}
//--------------------------------------------------------------------------
-// Function: DataType::getRegion
-///\brief Retrieves a dataspace with the region pointed to selected.
-///\param ref - IN: Reference to get region of
-///\param ref_type - IN: Type of reference to get region of - default
-///\return DataSpace instance
-///\exception H5::DataTypeIException
-// Programmer Binh-Minh Ribler - May, 2004
-//--------------------------------------------------------------------------
-DataSpace DataType::getRegion(void *ref, H5R_type_t ref_type) const
-{
- try {
- DataSpace dataspace(p_get_region(ref, ref_type));
- return(dataspace);
- }
- catch (IdComponentException E) {
- throw DataTypeIException(inMemFunc("getRegion"), E.getDetailMsg());
- }
-}
-
-//--------------------------------------------------------------------------
// Function: DataType::getId
// Purpose: Get the id of this attribute
// Modification:
diff --git a/c++/src/H5DataType.h b/c++/src/H5DataType.h
index 258bdc7..98514bb 100644
--- a/c++/src/H5DataType.h
+++ b/c++/src/H5DataType.h
@@ -104,7 +104,7 @@ class H5_DLLCPP DataType : public H5Object {
// Retrieves a dataspace with the region pointed to selected.
DataSpace getRegion(void *ref, H5R_type_t ref_type = H5R_DATASET_REGION) const;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("DataType"); }
// Creates a copy of an existing DataType using its id
diff --git a/c++/src/H5DcreatProp.h b/c++/src/H5DcreatProp.h
index b7f5823..ac7664e 100644
--- a/c++/src/H5DcreatProp.h
+++ b/c++/src/H5DcreatProp.h
@@ -107,7 +107,7 @@ class H5_DLLCPP DSetCreatPropList : public PropList {
// Sets SZIP compression method.
void setSzip(unsigned int options_mask, unsigned int pixels_per_block) const;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("DSetCreatPropList"); }
// Copy constructor: creates a copy of a DSetCreatPropList object.
diff --git a/c++/src/H5DxferProp.h b/c++/src/H5DxferProp.h
index 11e15fc..66216d8 100644
--- a/c++/src/H5DxferProp.h
+++ b/c++/src/H5DxferProp.h
@@ -92,7 +92,7 @@ class H5_DLLCPP DSetMemXferPropList : public PropList {
// Determines whether error-detection is enabled for dataset reads.
H5Z_EDC_t getEDCCheck();
- // Returns this class name.
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("DSetMemXferPropList"); }
// Copy constructor: makes a copy of a DSetMemXferPropList object.
diff --git a/c++/src/H5EnumType.h b/c++/src/H5EnumType.h
index 2a2c263..914eb66 100644
--- a/c++/src/H5EnumType.h
+++ b/c++/src/H5EnumType.h
@@ -57,7 +57,7 @@ class H5_DLLCPP EnumType : public DataType {
void valueOf( const char* name, void *value ) const;
void valueOf( const H5std_string& name, void *value ) const;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("EnumType"); }
// Default constructor
diff --git a/c++/src/H5FaccProp.h b/c++/src/H5FaccProp.h
index 7f133bb..0c2cc21 100644
--- a/c++/src/H5FaccProp.h
+++ b/c++/src/H5FaccProp.h
@@ -123,7 +123,7 @@ class H5_DLLCPP FileAccPropList : public PropList {
// Returns garbage collecting references setting.
unsigned getGcReferences() const;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("FileAccPropList"); }
// Copy constructor: creates a copy of a FileAccPropList object.
diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h
index 1aa102f..61074ea 100644
--- a/c++/src/H5FcreatProp.h
+++ b/c++/src/H5FcreatProp.h
@@ -62,7 +62,7 @@ class H5_DLLCPP FileCreatPropList : public PropList {
// indexing chunked datasets.
void setIstorek( unsigned ik ) const;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("FileCreatPropList"); }
// Copy constructor: creates a copy of a FileCreatPropList object.
diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp
index d023001..92c4d32 100644
--- a/c++/src/H5File.cpp
+++ b/c++/src/H5File.cpp
@@ -50,7 +50,7 @@ namespace H5 {
///\brief Default constructor: creates a stub H5File object.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
-H5File::H5File() : H5Location(0) {}
+H5File::H5File() : H5Location(), id(0) {}
//--------------------------------------------------------------------------
// Function: H5File overloaded constructor
@@ -148,7 +148,7 @@ H5File::H5File(const H5File& original) : H5Location(original)
//--------------------------------------------------------------------------
// Function: H5File::isHdf5
-///\brief Determines whether a file in HDF5 format.
+///\brief Determines whether a file in HDF5 format. (Static)
///\param name - IN: Name of the file
///\return true if the file is in HDF5 format, and false, otherwise
///\exception H5::FileIException
@@ -172,7 +172,7 @@ bool H5File::isHdf5(const char* name)
//--------------------------------------------------------------------------
// Function: H5File::isHdf5
///\brief This is an overloaded member function, provided for convenience.
-/// It takes an \c H5std_string for \a name.
+/// It takes an \c H5std_string for \a name. (Static)
///\param name - IN: Name of the file - \c H5std_string
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
@@ -250,8 +250,8 @@ void H5File::reOpen()
throw FileIException("H5File::reOpen", close_error.getDetailMsg());
}
- // call C routine to reopen the file - Note: not sure about this
- // does id need to be closed later? which id to be the parameter?
+ // call C routine to reopen the file - Note: not sure about this,
+ // which id to be the parameter when closing?
id = H5Freopen( id );
if( id < 0 ) // Raise exception when H5Freopen returns a neg value
throw FileIException("H5File::reOpen", "H5Freopen failed");
@@ -259,12 +259,10 @@ void H5File::reOpen()
//--------------------------------------------------------------------------
// Function: H5File::reopen
-///\brief Reopens this file.
-///
-///\exception H5::FileIException
-///\par Description
-/// This function will be replaced by the above function \c reOpen
-/// in future releases.
+// Purpose: Reopens this file.
+// Exception H5::FileIException
+// Description
+// This function is replaced by the above function reOpen.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void H5File::reopen()
@@ -470,27 +468,6 @@ void H5File::getVFDHandle(void **file_handle) const
}
}
-
-//--------------------------------------------------------------------------
-// Function: H5File::getRegion
-///\brief Retrieves a dataspace with the region pointed to selected.
-///\param ref - IN: Reference to get region of
-///\param ref_type - IN: Type of reference to get region of - default
-///\return DataSpace instance
-///\exception H5::FileIException
-// Programmer Binh-Minh Ribler - May, 2004
-//--------------------------------------------------------------------------
-DataSpace H5File::getRegion(void *ref, H5R_type_t ref_type) const
-{
- try {
- DataSpace dataspace(p_get_region(ref, ref_type));
- return(dataspace);
- }
- catch (IdComponentException E) {
- throw FileIException("H5File::getRegion", E.getDetailMsg());
- }
-}
-
//--------------------------------------------------------------------------
// Function: H5File::getFileSize
///\brief Returns the file size of the HDF5 file.
@@ -513,47 +490,6 @@ hsize_t H5File::getFileSize() const
}
//--------------------------------------------------------------------------
-// Function: H5File::p_reference (protected)
-// Purpose Creates a reference to an HDF5 object or a dataset region.
-// Parameters
-// name - IN: Name of the object to be referenced
-// dataspace - IN: Dataspace with selection
-// ref_type - IN: Type of reference; default to \c H5R_DATASET_REGION
-// Exception H5::IdComponentException
-// Programmer Binh-Minh Ribler - May, 2004
-//--------------------------------------------------------------------------
-void H5File::p_reference(void* ref, const char* name, hid_t space_id, H5R_type_t ref_type) const
-{
- herr_t ret_value = H5Rcreate(ref, getId(), name, ref_type, space_id);
- if (ret_value < 0)
- {
- throw IdComponentException("", "H5Rcreate failed");
- }
-}
-
-
-//--------------------------------------------------------------------------
-// Function: H5File::p_get_region (protected)
-// Purpose Retrieves a dataspace with the region pointed to selected.
-// Parameters
-// ref_type - IN: Type of reference to get region of - default
-// to H5R_DATASET_REGION
-// ref - IN: Reference to get region of
-// Return Dataspace id
-// Exception H5::IdComponentException
-// Programmer Binh-Minh Ribler - May, 2004
-//--------------------------------------------------------------------------
-hid_t H5File::p_get_region(void *ref, H5R_type_t ref_type) const
-{
- hid_t space_id = H5Rget_region(getId(), ref_type, ref);
- if (space_id < 0)
- {
- throw IdComponentException("", "H5Rget_region failed");
- }
- return(space_id);
-}
-
-//--------------------------------------------------------------------------
// Function: H5File::getLocId
// Purpose: Get the id of this file
// Description
diff --git a/c++/src/H5File.h b/c++/src/H5File.h
index ad1dee7..cfb6bdf 100644
--- a/c++/src/H5File.h
+++ b/c++/src/H5File.h
@@ -76,7 +76,7 @@ class H5_DLLCPP H5File : public H5Location, public CommonFG {
void reOpen(); // added for better name
void reopen();
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("H5File"); }
// Throw file exception.
@@ -106,17 +106,6 @@ class H5_DLLCPP H5File : public H5Location, public CommonFG {
// constructors taking a string or a char*
void p_get_file( const char* name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist );
- // Creates a reference to an HDF5 object or a dataset region.
- void p_reference(void* ref, const char* name, hid_t space_id, H5R_type_t ref_type) const;
-
-#ifndef H5_NO_DEPRECATED_SYMBOLS
- // Retrieves the type of object that an object reference points to.
- H5G_obj_t p_get_obj_type(void *ref, H5R_type_t ref_type) const;
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-
- // Retrieves a dataspace with the region pointed to selected.
- hid_t p_get_region(void *ref, H5R_type_t ref_type) const;
-
protected:
// Sets the HDF5 file id.
virtual void p_setId(const hid_t new_id);
diff --git a/c++/src/H5FloatType.h b/c++/src/H5FloatType.h
index 7444bd5..cbb9541 100644
--- a/c++/src/H5FloatType.h
+++ b/c++/src/H5FloatType.h
@@ -53,7 +53,7 @@ class H5_DLLCPP FloatType : public AtomType {
// Sets the mantissa normalization of a floating-point datatype.
void setNorm( H5T_norm_t norm ) const;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("FloatType"); }
// Default constructor
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp
index f620310..e83b635 100644
--- a/c++/src/H5Group.cpp
+++ b/c++/src/H5Group.cpp
@@ -148,26 +148,6 @@ Group::Group(Attribute& attr, const void* ref, H5R_type_t ref_type) : H5Object()
}
//--------------------------------------------------------------------------
-// Function: Group::getRegion
-///\brief Retrieves a dataspace with the region pointed to selected.
-///\param ref - IN: Reference to get region of
-///\param ref_type - IN: Type of reference to get region of - default
-///\return DataSpace instance
-///\exception H5::GroupIException
-// Programmer Binh-Minh Ribler - May, 2004
-//--------------------------------------------------------------------------
-DataSpace Group::getRegion(void *ref, H5R_type_t ref_type) const
-{
- try {
- DataSpace dataspace(p_get_region(ref, ref_type));
- return(dataspace);
- }
- catch (IdComponentException E) {
- throw GroupIException("Group::getRegion", E.getDetailMsg());
- }
-}
-
-//--------------------------------------------------------------------------
// Function: Group::getId
// Purpose: Get the id of this attribute
// Modification:
diff --git a/c++/src/H5Group.h b/c++/src/H5Group.h
index c4213a8..e4c2415 100644
--- a/c++/src/H5Group.h
+++ b/c++/src/H5Group.h
@@ -29,7 +29,7 @@ class H5_DLLCPP Group : public H5Object, public CommonFG {
// Retrieves a dataspace with the region pointed to selected.
DataSpace getRegion(void *ref, H5R_type_t ref_type = H5R_DATASET_REGION) const;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("Group"); }
// Throw group exception.
diff --git a/c++/src/H5IdComponent.h b/c++/src/H5IdComponent.h
index b217c10..7dc1da3 100644
--- a/c++/src/H5IdComponent.h
+++ b/c++/src/H5IdComponent.h
@@ -65,7 +65,7 @@ class H5_DLLCPP IdComponent {
// <class-name> is returned by fromClass().
H5std_string inMemFunc(const char* func_name) const;
- // Returns this class name.
+ ///\brief Returns this class name.
virtual H5std_string fromClass() const { return("IdComponent");}
#endif // DOXYGEN_SHOULD_SKIP_THIS
diff --git a/c++/src/H5IntType.h b/c++/src/H5IntType.h
index b712103..53864ee 100644
--- a/c++/src/H5IntType.h
+++ b/c++/src/H5IntType.h
@@ -35,7 +35,7 @@ class H5_DLLCPP IntType : public AtomType {
// Sets the sign proprety for an integer type.
void setSign( H5T_sign_t sign ) const;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("IntType"); }
// Default constructor
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp
index 1fdaf3f..e29e80e 100644
--- a/c++/src/H5Object.cpp
+++ b/c++/src/H5Object.cpp
@@ -37,30 +37,11 @@ namespace H5 {
#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
-// userAttrOpWrpr simply interfaces between the user's function and the
-// C library function H5Aiterate2; used to resolve the different prototype
-// problem. May be moved to Iterator later.
-extern "C" herr_t userAttrOpWrpr1(hid_t loc_id, const char *attr_name,
- const H5A_info_t *ainfo, void *op_data)
-{
- H5std_string s_attr_name = H5std_string( attr_name );
-#ifdef NO_STATIC_CAST
- UserData4Aiterate* myData = (UserData4Aiterate *) op_data;
-#else
- UserData4Aiterate* myData = static_cast <UserData4Aiterate *> (op_data);
-#endif
- myData->op( *myData->location, s_attr_name, myData->opData );
- return 0;
-}
-
//--------------------------------------------------------------------------
// Function: H5Object default constructor (protected)
-// Description
-// The id is set by H5Location() but subclass constructor will
-// set it to a valid HDF5 id.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
-H5Object::H5Object() : H5Location(0) {}
+H5Object::H5Object() : H5Location() {}
//--------------------------------------------------------------------------
// Function: H5Object overloaded constructor (protected)
diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h
index 5c264ec..bfd5e6f 100644
--- a/c++/src/H5Object.h
+++ b/c++/src/H5Object.h
@@ -24,7 +24,7 @@
// Group, DataSet, and DataType.
// DataType, in turn, has several specific datatypes as subclasses.
// Modification:
-// Sept 18, 2012: Added class H5Location in between IdComponent and
+// Sept 18, 2012: Added class H5Location in between IdComponent and
// H5Object. An H5File now inherits from H5Location. All HDF5
// wrappers in H5Object are moved up to H5Location. H5Object
// is left mostly empty for future wrappers that are only for
@@ -38,24 +38,6 @@
namespace H5 {
#endif
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-class H5_DLLCPP H5Object; // forward declaration for UserData4Aiterate
-
-// Define the operator function pointer for H5Aiterate().
-typedef void (*attr1_operator_t)( H5Object& loc/*in*/,
- const H5std_string attr_name/*in*/,
- void *operator_data/*in,out*/);
-
-class UserData4Aiterate1 { // user data for attribute iteration
- public:
- attr1_operator_t op;
- void* opData;
- H5Object* object;
-};
-#endif // DOXYGEN_SHOULD_SKIP_THIS
-
-// The above part is being moved into Iterator, but not completed
-
class H5_DLLCPP H5Object : public H5Location {
public:
// Copy constructor: makes copy of an H5Object object.
diff --git a/c++/src/H5PredType.h b/c++/src/H5PredType.h
index 9cb1c65..8a04f0c 100644
--- a/c++/src/H5PredType.h
+++ b/c++/src/H5PredType.h
@@ -36,7 +36,7 @@ namespace H5 {
class H5_DLLCPP PredType : public AtomType {
public:
- ///\brief Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("PredType"); }
// Makes a copy of the predefined type and stores the new
diff --git a/c++/src/H5PropList.h b/c++/src/H5PropList.h
index 5dfa538..7e47b32 100644
--- a/c++/src/H5PropList.h
+++ b/c++/src/H5PropList.h
@@ -94,7 +94,7 @@ class H5_DLLCPP PropList : public IdComponent {
void removeProp(const char *name) const;
void removeProp(const H5std_string& name) const;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("PropList"); }
// Default constructor: creates a stub PropList object.
diff --git a/c++/src/H5StrType.h b/c++/src/H5StrType.h
index d4a0016..be9fed8 100644
--- a/c++/src/H5StrType.h
+++ b/c++/src/H5StrType.h
@@ -47,7 +47,7 @@ class H5_DLLCPP StrType : public AtomType {
// Defines the storage mechanism for character strings.
void setStrpad(H5T_str_t strpad) const;
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("StrType"); }
// default constructor
diff --git a/c++/src/H5VarLenType.h b/c++/src/H5VarLenType.h
index 91f653e..0cee219 100644
--- a/c++/src/H5VarLenType.h
+++ b/c++/src/H5VarLenType.h
@@ -30,7 +30,7 @@ class H5_DLLCPP VarLenType : public DataType {
// on the specified base type.
VarLenType(const DataType* base_type);
- // Returns this class name
+ ///\brief Returns this class name.
virtual H5std_string fromClass () const { return("VarLenType"); }
// Copy constructor: makes copy of the original object.
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index 26abace..e822b36 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -61,7 +61,6 @@ const int H5Z_FILTER_BOGUS = 305;
static size_t filter_bogus(unsigned int flags, size_t cd_nelmts,
const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
-
/*-------------------------------------------------------------------------
* Function: test_create
*
@@ -179,7 +178,7 @@ test_create( H5File& file)
return -1;
}
} // test_create
-
+
/*-------------------------------------------------------------------------
* Function: test_simple_io
*
@@ -266,7 +265,7 @@ test_simple_io( H5File& file)
return -1;
}
} // test_simple_io
-
+
/*-------------------------------------------------------------------------
* Function: test_datasize
*
@@ -337,7 +336,7 @@ test_datasize()
return -1;
}
} // test_datasize
-
+
/*-------------------------------------------------------------------------
* Function: test_tconv
*
@@ -460,7 +459,6 @@ filter_bogus(unsigned int flags, size_t cd_nelmts,
return nbytes;
}
-
/*-------------------------------------------------------------------------
* Function: test_compression
*
@@ -830,7 +828,6 @@ test_multiopen (H5File& file)
}
} // test_multiopen
-
/*-------------------------------------------------------------------------
* Function: test_types
*
@@ -1019,7 +1016,7 @@ test_types(H5File& file)
return -1;
}
} // test_types
-
+
/*-------------------------------------------------------------------------
* Function: test_dset
*
diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
index 221a61b..32c40d5 100644
--- a/c++/test/th5s.cpp
+++ b/c++/test/th5s.cpp
@@ -188,7 +188,7 @@ static void test_h5s_basic()
* If this test fails and the H5S_MAX_RANK variable has changed, follow
* the instructions in space_overflow.c for regenating the th5s.h5 file.
*/
- const char *testfile = H5_get_srcdir_filename(TESTFILE.c_str());
+ const char *testfile = H5_get_srcdir_filename(TESTFILE.c_str());
// Create file
H5File fid1(testfile, H5F_ACC_RDONLY);