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/H5CompType.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/H5CompType.cpp')
-rw-r--r-- | c++/src/H5CompType.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/c++/src/H5CompType.cpp b/c++/src/H5CompType.cpp index e74b972..21a32f5 100644 --- a/c++/src/H5CompType.cpp +++ b/c++/src/H5CompType.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" @@ -118,7 +115,7 @@ int CompType::getNmembers() const ///\exception H5::DataTypeIException // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -string CompType::getMemberName( unsigned member_num ) const +H5_std::string CompType::getMemberName( unsigned member_num ) const { char* member_name_C = H5Tget_member_name( id, member_num ); if( member_name_C == NULL ) // NULL means failure @@ -126,7 +123,7 @@ string CompType::getMemberName( unsigned member_num ) const throw DataTypeIException("CompType::getMemberName", "H5Tget_member_name returns NULL for member name"); } - string member_name = string(member_name_C); // convert C string to string + H5_std::string member_name = H5_std::string(member_name_C); // convert C string to string HDfree(member_name_C); // free the C string return( member_name ); // return the member name string } @@ -153,7 +150,7 @@ int CompType::getMemberIndex(const char* name) const } return( member_index ); } -int CompType::getMemberIndex(const string& name) const +int CompType::getMemberIndex(const H5_std::string& name) const { return(getMemberIndex(name.c_str())); } @@ -421,7 +418,7 @@ void CompType::getMemberType( unsigned member_num, StrType& strtype ) const ///\exception H5::DataTypeIException // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -void CompType::insertMember( const string& name, size_t offset, const DataType& new_member ) const +void CompType::insertMember( const H5_std::string& name, size_t offset, const DataType& new_member ) const { // Convert string to C-string const char* name_C; |