diff options
author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2006-06-05 16:17:36 (GMT) |
---|---|---|
committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2006-06-05 16:17:36 (GMT) |
commit | 32d3e6f04f2cc68d05fd59c567c2bdf4e4a50443 (patch) | |
tree | 7dfbe078ff910c575768c51fb1c38c0f4f8c1f58 /c++/src/H5PredType.cpp | |
parent | f5a16e9bfa5ee701d6ee40ddd98cfcb03aad6e1b (diff) | |
download | hdf5-32d3e6f04f2cc68d05fd59c567c2bdf4e4a50443.zip hdf5-32d3e6f04f2cc68d05fd59c567c2bdf4e4a50443.tar.gz hdf5-32d3e6f04f2cc68d05fd59c567c2bdf4e4a50443.tar.bz2 |
[svn-r12404] Purpose: Fix typos/formats
Description:
Fixed typos and re-arranged some functions to be in sync with 1.6.
Platforms tested:
Linux 2.4 (heping)
SunOS 5.9 (shanti)
AIX 5.1 (copper)
Diffstat (limited to 'c++/src/H5PredType.cpp')
-rw-r--r-- | c++/src/H5PredType.cpp | 56 |
1 files changed, 38 insertions, 18 deletions
diff --git a/c++/src/H5PredType.cpp b/c++/src/H5PredType.cpp index 510c659..50f3f16 100644 --- a/c++/src/H5PredType.cpp +++ b/c++/src/H5PredType.cpp @@ -178,6 +178,14 @@ const PredType PredType::NATIVE_HBOOL( H5T_NATIVE_HBOOL ); const PredType PredType::NATIVE_INT8( H5T_NATIVE_INT8 ); const PredType PredType::NATIVE_UINT8( H5T_NATIVE_UINT8 ); +const PredType PredType::NATIVE_INT16( H5T_NATIVE_INT16 ); +const PredType PredType::NATIVE_UINT16( H5T_NATIVE_UINT16 ); +const PredType PredType::NATIVE_INT32( H5T_NATIVE_INT32 ); +const PredType PredType::NATIVE_UINT32( H5T_NATIVE_UINT32 ); +const PredType PredType::NATIVE_INT64( H5T_NATIVE_INT64 ); +const PredType PredType::NATIVE_UINT64( H5T_NATIVE_UINT64 ); + +// LEAST types #if H5_SIZEOF_INT_LEAST8_T != 0 const PredType PredType::NATIVE_INT_LEAST8( H5T_NATIVE_INT_LEAST8 ); #endif /* H5_SIZEOF_INT_LEAST8_T */ @@ -185,8 +193,6 @@ const PredType PredType::NATIVE_INT_LEAST8( H5T_NATIVE_INT_LEAST8 ); const PredType PredType::NATIVE_UINT_LEAST8( H5T_NATIVE_UINT_LEAST8 ); #endif /* H5_SIZEOF_UINT_LEAST8_T */ -const PredType PredType::NATIVE_INT16( H5T_NATIVE_INT16 ); -const PredType PredType::NATIVE_UINT16( H5T_NATIVE_UINT16 ); #if H5_SIZEOF_INT_LEAST16_T != 0 const PredType PredType::NATIVE_INT_LEAST16( H5T_NATIVE_INT_LEAST16 ); #endif /* H5_SIZEOF_INT_LEAST16_T */ @@ -194,8 +200,6 @@ const PredType PredType::NATIVE_INT_LEAST16( H5T_NATIVE_INT_LEAST16 ); const PredType PredType::NATIVE_UINT_LEAST16( H5T_NATIVE_UINT_LEAST16 ); #endif /* H5_SIZEOF_UINT_LEAST16_T */ -const PredType PredType::NATIVE_INT32( H5T_NATIVE_INT32 ); -const PredType PredType::NATIVE_UINT32( H5T_NATIVE_UINT32 ); #if H5_SIZEOF_INT_LEAST32_T != 0 const PredType PredType::NATIVE_INT_LEAST32( H5T_NATIVE_INT_LEAST32 ); #endif /* H5_SIZEOF_INT_LEAST32_T */ @@ -203,8 +207,6 @@ const PredType PredType::NATIVE_INT_LEAST32( H5T_NATIVE_INT_LEAST32 ); const PredType PredType::NATIVE_UINT_LEAST32( H5T_NATIVE_UINT_LEAST32 ); #endif /* H5_SIZEOF_UINT_LEAST32_T */ -const PredType PredType::NATIVE_INT64( H5T_NATIVE_INT64 ); -const PredType PredType::NATIVE_UINT64( H5T_NATIVE_UINT64 ); #if H5_SIZEOF_INT_LEAST64_T != 0 const PredType PredType::NATIVE_INT_LEAST64( H5T_NATIVE_INT_LEAST64 ); #endif /* H5_SIZEOF_INT_LEAST64_T */ @@ -212,16 +214,34 @@ const PredType PredType::NATIVE_INT_LEAST64( H5T_NATIVE_INT_LEAST64 ); const PredType PredType::NATIVE_UINT_LEAST64( H5T_NATIVE_UINT_LEAST64 ); #endif /* H5_SIZEOF_UINT_LEAST64_T */ -// These are new types and waiting for enabling with C99; currently, -// the H5T_NATIVE_xxx_FASTn are -1 on sol. 11/14/05 -//const PredType PredType::NATIVE_INT_FAST8( H5T_NATIVE_INT_FAST8 ); -//const PredType PredType::NATIVE_UINT_FAST8( H5T_NATIVE_UINT_FAST8 ); -//const PredType PredType::NATIVE_INT_FAST16( H5T_NATIVE_INT_FAST16 ); -//const PredType PredType::NATIVE_UINT_FAST16( H5T_NATIVE_UINT_FAST16 ); -//const PredType PredType::NATIVE_INT_FAST32( H5T_NATIVE_INT_FAST32 ); -//const PredType PredType::NATIVE_UINT_FAST32( H5T_NATIVE_UINT_FAST32 ); -//const PredType PredType::NATIVE_INT_FAST64( H5T_NATIVE_INT_FAST64 ); -//const PredType PredType::NATIVE_UINT_FAST64( H5T_NATIVE_UINT_FAST64 ); +// FAST types +#if H5_SIZEOF_INT_FAST8_T != 0 +const PredType PredType::NATIVE_INT_FAST8( H5T_NATIVE_INT_FAST8 ); +#endif /* H5_SIZEOF_INT_FAST8_T */ +#if H5_SIZEOF_UINT_FAST8_T != 0 +const PredType PredType::NATIVE_UINT_FAST8( H5T_NATIVE_UINT_FAST8 ); +#endif /* H5_SIZEOF_UINT_FAST8_T */ + +#if H5_SIZEOF_INT_FAST16_T != 0 +const PredType PredType::NATIVE_INT_FAST16( H5T_NATIVE_INT_FAST16 ); +#endif /* H5_SIZEOF_INT_FAST16_T */ +#if H5_SIZEOF_UINT_FAST16_T != 0 +const PredType PredType::NATIVE_UINT_FAST16( H5T_NATIVE_UINT_FAST16 ); +#endif /* H5_SIZEOF_UINT_FAST16_T */ + +#if H5_SIZEOF_INT_FAST32_T != 0 +const PredType PredType::NATIVE_INT_FAST32( H5T_NATIVE_INT_FAST32 ); +#endif /* H5_SIZEOF_INT_FAST32_T */ +#if H5_SIZEOF_UINT_FAST32_T != 0 +const PredType PredType::NATIVE_UINT_FAST32( H5T_NATIVE_UINT_FAST32 ); +#endif /* H5_SIZEOF_UINT_FAST32_T */ + +#if H5_SIZEOF_INT_FAST64_T != 0 +const PredType PredType::NATIVE_INT_FAST64( H5T_NATIVE_INT_FAST64 ); +#endif /* H5_SIZEOF_INT_FAST64_T */ +#if H5_SIZEOF_UINT_FAST64_T != 0 +const PredType PredType::NATIVE_UINT_FAST64( H5T_NATIVE_UINT_FAST64 ); +#endif /* H5_SIZEOF_UINT_FAST64_T */ #endif // DOXYGEN_SHOULD_SKIP_THIS //-------------------------------------------------------------------------- @@ -239,8 +259,8 @@ PredType& PredType::operator=( const PredType& rhs ) { if (this != &rhs) { - copy(rhs); - return(*this); + copy(rhs); + return(*this); } } |