summaryrefslogtreecommitdiffstats
path: root/c++/src/H5AtomType.h
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2006-03-30 18:06:58 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2006-03-30 18:06:58 (GMT)
commita7e993d72be8fed2f0d63a8169e185bb2a298842 (patch)
tree420d7ea5ab1fd6415710f5f623f9667721f3f78e /c++/src/H5AtomType.h
parent5a90c6b31c8904a407bb91ee4cc6a7aeecf73bed (diff)
downloadhdf5-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/H5AtomType.h')
-rw-r--r--c++/src/H5AtomType.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/c++/src/H5AtomType.h b/c++/src/H5AtomType.h
index 4a09c05..9a1242b 100644
--- a/c++/src/H5AtomType.h
+++ b/c++/src/H5AtomType.h
@@ -27,7 +27,7 @@ namespace H5 {
class H5_DLLCPP AtomType : public DataType {
public:
// Returns the byte order of an atomic datatype.
- H5T_order_t getOrder( string& order_string ) const;
+ H5T_order_t getOrder( H5_std::string& order_string ) const;
H5T_order_t getOrder() const;
// Sets the byte ordering of an atomic datatype.
@@ -56,7 +56,7 @@ class H5_DLLCPP AtomType : public DataType {
void setSize( size_t size ) const;
// Returns this class name
- virtual string fromClass () const { return("AtomType"); }
+ virtual H5_std::string fromClass () const { return("AtomType"); }
// Copy constructor - makes copy of the original object
AtomType( const AtomType& original );