diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2006-03-30 18:06:58 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2006-03-30 18:06:58 (GMT) |
| commit | a7e993d72be8fed2f0d63a8169e185bb2a298842 (patch) | |
| tree | 420d7ea5ab1fd6415710f5f623f9667721f3f78e /c++/src/H5EnumType.cpp | |
| parent | 5a90c6b31c8904a407bb91ee4cc6a7aeecf73bed (diff) | |
| download | hdf5-a7e993d72be8fed2f0d63a8169e185bb2a298842.zip hdf5-a7e993d72be8fed2f0d63a8169e185bb2a298842.tar.gz hdf5-a7e993d72be8fed2f0d63a8169e185bb2a298842.tar.bz2 | |
[svn-r12180] Purpose: Maintenance
Description:
Added alias H5_std so either the global or std namespace can be
used, depending on H5_NO_STD.
Platforms tested:
Linux 2.4 (heping)
SunOS 5.8 64-bit (sol)
AIX 5.1 (copper)
Diffstat (limited to 'c++/src/H5EnumType.cpp')
| -rw-r--r-- | c++/src/H5EnumType.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/c++/src/H5EnumType.cpp b/c++/src/H5EnumType.cpp index 621f65c..462c767 100644 --- a/c++/src/H5EnumType.cpp +++ b/c++/src/H5EnumType.cpp @@ -14,9 +14,6 @@ #include <string> #ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::string; -#endif // H5_NO_STD #endif #include "H5Include.h" @@ -137,7 +134,7 @@ void EnumType::insert( const char* name, void *value ) const /// argument \a name. // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -void EnumType::insert( const string& name, void *value ) const +void EnumType::insert( const H5_std::string& name, void *value ) const { insert( name.c_str(), value ); } @@ -151,7 +148,7 @@ void EnumType::insert( const string& name, void *value ) const ///\exception H5::DataTypeIException // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -string EnumType::nameOf( void *value, size_t size ) const +H5_std::string EnumType::nameOf( void *value, size_t size ) const { char* name_C = new char[size+1]; // temporary C-string for C API @@ -164,7 +161,7 @@ string EnumType::nameOf( void *value, size_t size ) const throw DataTypeIException("EnumType::nameOf", "H5Tenum_nameof failed"); } // otherwise, create the string to hold the datatype name and return it - string name = string( name_C ); + H5_std::string name = H5_std::string( name_C ); delete [] name_C; return( name ); } @@ -195,7 +192,7 @@ void EnumType::valueOf( const char* name, void *value ) const /// argument \a name. // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -void EnumType::valueOf( const string& name, void *value ) const +void EnumType::valueOf( const H5_std::string& name, void *value ) const { valueOf( name.c_str(), value ); } @@ -228,7 +225,7 @@ int EnumType::getMemberIndex(const char *name) const /// argument \a name. // Programmer Binh-Minh Ribler - May 16, 2002 //-------------------------------------------------------------------------- -int EnumType::getMemberIndex(const string& name) const +int EnumType::getMemberIndex(const H5_std::string& name) const { return(EnumType::getMemberIndex(name.c_str())); } |