philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r12200] Purpose: Maintenance

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

12
c++/src/H5Object.cpp
View File

@@ -36,7 +36,7 @@ namespace H5 {
// problem. May be moved to Iterator later.
extern "C" herr_t userAttrOpWrpr( hid_t loc_id, const char* attr_name, void* op_data )
{
H5_std::string s_attr_name = H5_std::string( attr_name );
H5std_string s_attr_name = H5std_string( attr_name );
#ifdef NO_STATIC_CAST
UserData4Aiterate* myData = (UserData4Aiterate *) op_data;
#else
@@ -122,7 +122,7 @@ Attribute H5Object::createAttribute( const char* name, const DataType& data_type
/// a reference to an \c std::string for \a name.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
Attribute H5Object::createAttribute( const H5_std::string& name, const DataType& data_type, const DataSpace& data_space, const PropList& create_plist ) const
Attribute H5Object::createAttribute( const H5std_string& name, const DataType& data_type, const DataSpace& data_space, const PropList& create_plist ) const
{
return( createAttribute( name.c_str(), data_type, data_space, create_plist ));
}
@@ -156,7 +156,7 @@ Attribute H5Object::openAttribute( const char* name ) const
/// a reference to an \c std::string for \a name.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
Attribute H5Object::openAttribute( const H5_std::string& name ) const
Attribute H5Object::openAttribute( const H5std_string& name ) const
{
return( openAttribute( name.c_str()) );
}
@@ -263,7 +263,7 @@ void H5Object::removeAttr( const char* name ) const
/// a reference to an \c std::string for \a name.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void H5Object::removeAttr( const H5_std::string& name ) const
void H5Object::removeAttr( const H5std_string& name ) const
{
removeAttr( name.c_str() );
}
@@ -292,7 +292,7 @@ void H5Object::renameAttr(const char* oldname, const char* newname) const
/// a reference to an \c std::string for the names.
// Programmer Binh-Minh Ribler - Mar, 2005
//--------------------------------------------------------------------------
void H5Object::renameAttr(const H5_std::string& oldname, const H5_std::string& newname) const
void H5Object::renameAttr(const H5std_string& oldname, const H5std_string& newname) const
{
renameAttr (oldname.c_str(), newname.c_str());
}
@@ -325,7 +325,7 @@ void H5Object::flush(H5F_scope_t scope ) const
///\exception H5::IdComponentException
// Programmer Binh-Minh Ribler - Jul, 2004
//--------------------------------------------------------------------------
H5_std::string H5Object::getFileName() const
H5std_string H5Object::getFileName() const
{
try {
return(p_get_file_name());