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/H5FloatType.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/H5FloatType.cpp')
| -rw-r--r-- | c++/src/H5FloatType.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/c++/src/H5FloatType.cpp b/c++/src/H5FloatType.cpp index d56c4a7..53d8de2 100644 --- a/c++/src/H5FloatType.cpp +++ b/c++/src/H5FloatType.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" @@ -185,7 +182,7 @@ void FloatType::setEbias( size_t ebias ) const /// \a norm_string. // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -H5T_norm_t FloatType::getNorm( string& norm_string ) const +H5T_norm_t FloatType::getNorm( H5_std::string& norm_string ) const { H5T_norm_t norm = H5Tget_norm( id ); // C routine // Returns a valid normalization type if successful @@ -238,7 +235,7 @@ void FloatType::setNorm( H5T_norm_t norm ) const /// \a pad_string. // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -H5T_pad_t FloatType::getInpad( string& pad_string ) const +H5T_pad_t FloatType::getInpad( H5_std::string& pad_string ) const { H5T_pad_t pad_type = H5Tget_inpad( id ); // Returns a valid padding type if successful |