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/H5IdComponent.h | |
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/H5IdComponent.h')
-rw-r--r-- | c++/src/H5IdComponent.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/c++/src/H5IdComponent.h b/c++/src/H5IdComponent.h index 431863b..25aeb1e 100644 --- a/c++/src/H5IdComponent.h +++ b/c++/src/H5IdComponent.h @@ -20,9 +20,6 @@ #ifndef H5_NO_NAMESPACE namespace H5 { -#ifndef H5_NO_STD - using std::string; -#endif // H5_NO_STD #endif class H5_DLLCPP IdComponent { @@ -64,10 +61,10 @@ class H5_DLLCPP IdComponent { // Makes and returns the string "<class-name>::<func_name>"; // <class-name> is returned by fromClass(). - string inMemFunc(const char* func_name) const; + H5_std::string inMemFunc(const char* func_name) const; // Returns this class name. - virtual string fromClass() const { return("IdComponent");} + virtual H5_std::string fromClass() const { return("IdComponent");} #endif // DOXYGEN_SHOULD_SKIP_THIS @@ -82,7 +79,7 @@ class H5_DLLCPP IdComponent { IdComponent(); // Gets the name of the file, in which an HDF5 object belongs. - string p_get_file_name() const; + H5_std::string p_get_file_name() const; // Gets the id of the H5 file in which the given object is located. hid_t p_get_file_id(); |