[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.
This commit is contained in:
Binh-Minh Ribler
2006-04-05 11:23:39 -05:00
parent 12f01d9cd4
commit 6f7076f47b
40 changed files with 251 additions and 251 deletions

View File

@@ -26,12 +26,12 @@ class H5_DLLCPP H5File : public IdComponent, public CommonFG {
H5File( const char* name, unsigned int flags,
const FileCreatPropList& create_plist = FileCreatPropList::DEFAULT,
const FileAccPropList& access_plist = FileAccPropList::DEFAULT );
H5File( const H5_std::string& name, unsigned int flags,
H5File( const H5std_string& name, unsigned int flags,
const FileCreatPropList& create_plist = FileCreatPropList::DEFAULT,
const FileAccPropList& access_plist = FileAccPropList::DEFAULT );
// Open the file
void openFile(const H5_std::string& name, unsigned int flags,
void openFile(const H5std_string& name, unsigned int flags,
const FileAccPropList& access_plist = FileAccPropList::DEFAULT);
void openFile(const char* name, unsigned int flags,
const FileAccPropList& access_plist = FileAccPropList::DEFAULT);
@@ -49,7 +49,7 @@ class H5_DLLCPP H5File : public IdComponent, public CommonFG {
FileCreatPropList getCreatePlist() const;
// Gets the name of this file.
H5_std::string getFileName() const;
H5std_string getFileName() const;
// Retrieves the file size of an opened file.
hsize_t getFileSize() const;
@@ -78,7 +78,7 @@ class H5_DLLCPP H5File : public IdComponent, public CommonFG {
// Determines if a file, specified by its name, is in HDF5 format
static bool isHdf5(const char* name );
static bool isHdf5(const H5_std::string& name );
static bool isHdf5(const H5std_string& name );
// Reopens this file.
void reOpen(); // added for better name
@@ -90,13 +90,13 @@ class H5_DLLCPP H5File : public IdComponent, public CommonFG {
// Creates a reference to a named Hdf5 object in this object.
void* Reference(const char* name) const;
void* Reference(const H5_std::string& name) const;
void* Reference(const H5std_string& name) const;
// Returns this class name
virtual H5_std::string fromClass () const { return("H5File"); }
virtual H5std_string fromClass () const { return("H5File"); }
// Throw file exception.
virtual void throwException(const H5_std::string func_name, const H5_std::string msg) const;
virtual void throwException(const H5std_string func_name, const H5std_string msg) const;
// Gets the file id
virtual hid_t getLocId() const;