[svn-r12200] Purpose: Maintenance

Description:
    Changed to alias string instead of std, i.e. H5std_string instead
    of H5std, because the old way wasn't working when std didn't exist.

Platforms tested:
    Linux 2.4 (heping)
    SunOS 5.8 64-bit (sol)
    HPUX 11.00 (kelgia) - this was the problematic platform but I wasn't
                                able to test before.

1 files changed, 6 insertions, 6 deletions

diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h
index 32551fb..f89cbe3 100644
--- a/c++/src/H5Object.h
+++ b/c++/src/H5Object.h
@@ -32,7 +32,7 @@ class H5_DLLCPP H5Object;  // forward declaration for UserData4Aiterate
 
 // Define the operator function pointer for H5Aiterate().
 typedef void (*attr_operator_t)( H5Object& loc/*in*/,
-				 const H5_std::string attr_name/*in*/,
+				 const H5std_string attr_name/*in*/,
 				 void *operator_data/*in,out*/);
 
 class UserData4Aiterate { // user data for attribute iteration
@@ -51,11 +51,11 @@ class H5_DLLCPP H5Object : public IdComponent {
 	// Creates an attribute for a group, dataset, or named datatype.
 	// PropList is currently not used, so always be default.
 	Attribute createAttribute( const char* name, const DataType& type, const DataSpace& space, const PropList& create_plist = PropList::DEFAULT ) const;
-	Attribute createAttribute( const H5_std::string& name, const DataType& type, const DataSpace& space, const PropList& create_plist = PropList::DEFAULT ) const;
+	Attribute createAttribute( const H5std_string& name, const DataType& type, const DataSpace& space, const PropList& create_plist = PropList::DEFAULT ) const;
 
 	// Opens an attribute given its name.
 	Attribute openAttribute( const char* name ) const;
-	Attribute openAttribute( const H5_std::string& name ) const;
+	Attribute openAttribute( const H5std_string& name ) const;
 
 	// Opens an attribute given its index.
 	Attribute openAttribute( const unsigned int idx ) const;
@@ -64,7 +64,7 @@ class H5_DLLCPP H5Object : public IdComponent {
 	void flush( H5F_scope_t scope ) const;
 
 	// Gets the name of the file, in which this HDF5 object belongs.
-	H5_std::string getFileName() const;
+	H5std_string getFileName() const;
 
 	// Determines the number of attributes attached to this object.
 	int getNumAttrs() const;
@@ -74,11 +74,11 @@ class H5_DLLCPP H5Object : public IdComponent {
 
 	// Removes the named attribute from this object.
 	void removeAttr( const char* name ) const;
-	void removeAttr( const H5_std::string& name ) const;
+	void removeAttr( const H5std_string& name ) const;
 
 	// Renames the attribute to a new name.
 	void renameAttr(const char* oldname, const char* newname) const;
-	void renameAttr(const H5_std::string& oldname, const H5_std::string& newname) const;
+	void renameAttr(const H5std_string& oldname, const H5std_string& newname) const;
 
 	// Copy constructor: makes copy of an H5Object object.
 	H5Object(const H5Object& original);