[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, 31 insertions, 31 deletions

diff --git a/c++/src/H5CommonFG.h b/c++/src/H5CommonFG.h
index 05ddc7c..5418952 100644
--- a/c++/src/H5CommonFG.h
+++ b/c++/src/H5CommonFG.h
@@ -33,37 +33,37 @@ class H5_DLLCPP CommonFG {
 	// Creates a new group at this location which can be a file
 	// or another group.
 	Group createGroup(const char* name, size_t size_hint = 0) const;
-	Group createGroup(const H5_std::string& name, size_t size_hint = 0) const;
+	Group createGroup(const H5std_string& name, size_t size_hint = 0) const;
 
 	// Opens an existing group in a location which can be a file
 	// or another group.
 	Group openGroup(const char* name) const;
-	Group openGroup(const H5_std::string& name) const;
+	Group openGroup(const H5std_string& name) const;
 
 	// Creates a new dataset at this location.
 	DataSet createDataSet(const char* name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist = DSetCreatPropList::DEFAULT) const;
-	DataSet createDataSet(const H5_std::string& name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist = DSetCreatPropList::DEFAULT) const;
+	DataSet createDataSet(const H5std_string& name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist = DSetCreatPropList::DEFAULT) const;
 
 	// Opens an existing dataset at this location.
 	DataSet openDataSet(const char* name) const;
-	DataSet openDataSet(const H5_std::string& name) const;
+	DataSet openDataSet(const H5std_string& name) const;
 
 	// Retrieves comment for the HDF5 object specified by its name.
-	H5_std::string getComment(const H5_std::string& name) const;
-	H5_std::string getComment(const char* name, size_t bufsize) const;
-	H5_std::string getComment(const H5_std::string& name, size_t bufsize) const;
+	H5std_string getComment(const H5std_string& name) const;
+	H5std_string getComment(const char* name, size_t bufsize) const;
+	H5std_string getComment(const H5std_string& name, size_t bufsize) const;
 
 	// Removes the comment for the HDF5 object specified by its name.
 	void removeComment(const char* name) const;
-	void removeComment(const H5_std::string& name) const;
+	void removeComment(const H5std_string& name) const;
 
 	// Sets the comment for an HDF5 object specified by its name.
 	void setComment(const char* name, const char* comment) const;
-	void setComment(const H5_std::string& name, const H5_std::string& comment) const;
+	void setComment(const H5std_string& name, const H5std_string& comment) const;
 
 	// Returns the name of the HDF5 object that the symbolic link points to.
-	H5_std::string getLinkval(const char* name, size_t size) const;
-	H5_std::string getLinkval(const H5_std::string& name, size_t size) const;
+	H5std_string getLinkval(const char* name, size_t size) const;
+	H5std_string getLinkval(const H5std_string& name, size_t size) const;
 
 	// Returns the number of objects in this group.
 	hsize_t getNumObjs() const;
@@ -71,77 +71,77 @@ class H5_DLLCPP CommonFG {
 	// Returns information about an HDF5 object, given by its name,
 	// at this location.
 	void getObjinfo(const char* name, hbool_t follow_link, H5G_stat_t& statbuf) const;
-	void getObjinfo(const H5_std::string& name, hbool_t follow_link, H5G_stat_t& statbuf) const;
+	void getObjinfo(const H5std_string& name, hbool_t follow_link, H5G_stat_t& statbuf) const;
 	void getObjinfo(const char* name, H5G_stat_t& statbuf) const;
-	void getObjinfo(const H5_std::string& name, H5G_stat_t& statbuf) const;
+	void getObjinfo(const H5std_string& name, H5G_stat_t& statbuf) const;
 
 	// Retrieves the name of an object in this group, given the
 	// object's index.
-	ssize_t getObjnameByIdx(hsize_t idx, H5_std::string& name, size_t size) const;
-	H5_std::string getObjnameByIdx(hsize_t idx) const;
+	ssize_t getObjnameByIdx(hsize_t idx, H5std_string& name, size_t size) const;
+	H5std_string getObjnameByIdx(hsize_t idx) const;
 
 	// Returns the type of an object in this group, given the
 	// object's index.
 	H5G_obj_t getObjTypeByIdx(hsize_t idx) const;
-	H5G_obj_t getObjTypeByIdx(hsize_t idx, H5_std::string& type_name) const;
+	H5G_obj_t getObjTypeByIdx(hsize_t idx, H5std_string& type_name) const;
 
 	// Iterates over the elements of this group - not implemented in
 	// C++ style yet.
 	int iterateElems(const char* name, int *idx, H5G_iterate_t op, void *op_data);
-	int iterateElems(const H5_std::string& name, int *idx, H5G_iterate_t op, void *op_data);
+	int iterateElems(const H5std_string& name, int *idx, H5G_iterate_t op, void *op_data);
 
 	// Creates a link of the specified type from new_name to current_name;
 	// both names are interpreted relative to the specified location id.
 	void link(H5G_link_t link_type, const char* curr_name, const char* new_name) const;
-	void link(H5G_link_t link_type, const H5_std::string& curr_name, const H5_std::string& new_name) const;
+	void link(H5G_link_t link_type, const H5std_string& curr_name, const H5std_string& new_name) const;
 
 	// Removes the specified name at this location.
 	void unlink(const char* name) const;
-	void unlink(const H5_std::string& name) const;
+	void unlink(const H5std_string& name) const;
 
 	// Mounts the file 'child' onto this location.
 	void mount(const char* name, H5File& child, PropList& plist) const;
-	void mount(const H5_std::string& name, H5File& child, PropList& plist) const;
+	void mount(const H5std_string& name, H5File& child, PropList& plist) const;
 
 	// Unmounts the file named 'name' from this parent location.
 	void unmount(const char* name) const;
-	void unmount(const H5_std::string& name) const;
+	void unmount(const H5std_string& name) const;
 
 	// Renames an object at this location.
 	void move(const char* src, const char* dst) const;
-	void move(const H5_std::string& src, const H5_std::string& dst) const;
+	void move(const H5std_string& src, const H5std_string& dst) const;
 
 	// Opens a generic named datatype in this location.
 	DataType openDataType(const char* name) const;
-	DataType openDataType(const H5_std::string& name) const;
+	DataType openDataType(const H5std_string& name) const;
 
 	// Opens a named array datatype in this location.
 	ArrayType openArrayType(const char* name) const;
-	ArrayType openArrayType(const H5_std::string& name) const;
+	ArrayType openArrayType(const H5std_string& name) const;
 
 	// Opens a named compound datatype in this location.
 	CompType openCompType(const char* name) const;
-	CompType openCompType(const H5_std::string& name) const;
+	CompType openCompType(const H5std_string& name) const;
 
 	// Opens a named enumeration datatype in this location.
 	EnumType openEnumType(const char* name) const;
-	EnumType openEnumType(const H5_std::string& name) const;
+	EnumType openEnumType(const H5std_string& name) const;
 
 	// Opens a named integer datatype in this location.
 	IntType openIntType(const char* name) const;
-	IntType openIntType(const H5_std::string& name) const;
+	IntType openIntType(const H5std_string& name) const;
 
 	// Opens a named floating-point datatype in this location.
 	FloatType openFloatType(const char* name) const;
-	FloatType openFloatType(const H5_std::string& name) const;
+	FloatType openFloatType(const H5std_string& name) const;
 
 	// Opens a named string datatype in this location.
 	StrType openStrType(const char* name) const;
-	StrType openStrType(const H5_std::string& name) const;
+	StrType openStrType(const H5std_string& name) const;
 
 	// Opens a named variable length datatype in this location.
 	VarLenType openVarLenType(const char* name) const;
-	VarLenType openVarLenType(const H5_std::string& name) const;
+	VarLenType openVarLenType(const H5std_string& name) const;
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 	/// For subclasses, H5File and Group, to return the correct
@@ -151,7 +151,7 @@ class H5_DLLCPP CommonFG {
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 	/// For subclasses, H5File and Group, to throw appropriate exception.
-	virtual void throwException(const H5_std::string func_name, const H5_std::string msg) const = 0;
+	virtual void throwException(const H5std_string func_name, const H5std_string msg) const = 0;
 
 	// Default constructor.
 	CommonFG();