[svn-r11755] Purpose: Code improvement

Description:
    There was a workaround for predefined types, in the C++ library,
    implemented when the C++ library was handling the reference
    counting of the object ids on its own.  Currently, the C++ library
    is using the available APIs from the C library for that purpose,
    and there were bugs reported involving that part of the C++ library.
    So, I decided to remove the workaround completely.

    Also, improved the use of std members.

Platforms tested:
    Linux 2.4 (heping)
    SunOS 5.8 64-bit (sol)
    Linux 2.4 w/PGI (colonelk)

1 files changed, 148 insertions, 426 deletions

diff --git a/c++/src/H5PredType.cpp b/c++/src/H5PredType.cpp
index ace3522..fc18d73 100644
--- a/c++/src/H5PredType.cpp
+++ b/c++/src/H5PredType.cpp
@@ -13,6 +13,11 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
+#ifndef H5_NO_NAMESPACE
+#ifndef H5_NO_STD
+    using std::string;
+#endif  // H5_NO_STD
+#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
@@ -37,13 +42,13 @@ namespace H5 {
 ///		predefined datatype.
 ///\param	predtype_id - IN: Id of a predefined datatype
 // Description
-// 		This constructor creates a predefined datatype, so it sets
-// 		DataType::is_predtype to true.
+// 		This constructor creates a PredType object by copying
+//		the provided HDF5 predefined datatype.
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 PredType::PredType( const hid_t predtype_id ) : AtomType( predtype_id )
 {
-   is_predtype = true;
+    id = H5Tcopy(predtype_id);
 }
 
 //--------------------------------------------------------------------------
@@ -64,152 +69,148 @@ PredType::PredType( const PredType& original ) : AtomType( original ) {}
 const PredType PredType::NotAtexit;	// only for atexit/global dest. problem
 
 // Definition of pre-defined types
-// Note: the parameter E_xxxx_yyyy is the enum value that represents
-// the corresponding HDF5 predefined type H5T_xxxx_yyyy.  This enum value
-// is stored in PredType::id since it is a PredType object id, in a way.
-// In addition, this storage makes things safely simpler.  When a PredType
-// object is used, the virtual PredType::getId will base on the enum
-// value to return the correct HDF5 predefined type id.
-
-const PredType PredType::C_S1( E_C_S1 );
-const PredType PredType::FORTRAN_S1( E_FORTRAN_S1 );
-
-const PredType PredType::STD_I8BE( E_STD_I8BE );
-const PredType PredType::STD_I8LE( E_STD_I8LE );
-const PredType PredType::STD_I16BE( E_STD_I16BE );
-const PredType PredType::STD_I16LE( E_STD_I16LE );
-const PredType PredType::STD_I32BE( E_STD_I32BE );
-const PredType PredType::STD_I32LE( E_STD_I32LE );
-const PredType PredType::STD_I64BE( E_STD_I64BE );
-const PredType PredType::STD_I64LE( E_STD_I64LE );
-const PredType PredType::STD_U8BE( E_STD_U8BE );
-const PredType PredType::STD_U8LE( E_STD_U8LE );
-const PredType PredType::STD_U16BE( E_STD_U16BE );
-const PredType PredType::STD_U16LE( E_STD_U16LE );
-const PredType PredType::STD_U32BE( E_STD_U32BE );
-const PredType PredType::STD_U32LE( E_STD_U32LE );
-const PredType PredType::STD_U64BE( E_STD_U64BE );
-const PredType PredType::STD_U64LE( E_STD_U64LE );
-const PredType PredType::STD_B8BE( E_STD_B8BE );
-const PredType PredType::STD_B8LE( E_STD_B8LE );
-
-const PredType PredType::STD_B16BE( E_STD_B16BE );
-const PredType PredType::STD_B16LE( E_STD_B16LE );
-const PredType PredType::STD_B32BE( E_STD_B32BE );
-const PredType PredType::STD_B32LE( E_STD_B32LE );
-const PredType PredType::STD_B64BE( E_STD_B64BE );
-const PredType PredType::STD_B64LE( E_STD_B64LE );
-const PredType PredType::STD_REF_OBJ( E_STD_REF_OBJ );
-const PredType PredType::STD_REF_DSETREG( E_STD_REF_DSETREG );
-
-const PredType PredType::IEEE_F32BE( E_IEEE_F32BE );
-const PredType PredType::IEEE_F32LE( E_IEEE_F32LE );
-const PredType PredType::IEEE_F64BE( E_IEEE_F64BE );
-const PredType PredType::IEEE_F64LE( E_IEEE_F64LE );
-
-const PredType PredType::UNIX_D32BE( E_UNIX_D32BE );
-const PredType PredType::UNIX_D32LE( E_UNIX_D32LE );
-const PredType PredType::UNIX_D64BE( E_UNIX_D64BE );
-const PredType PredType::UNIX_D64LE( E_UNIX_D64LE );
-
-const PredType PredType::INTEL_I8( E_INTEL_I8 );
-const PredType PredType::INTEL_I16( E_INTEL_I16 );
-const PredType PredType::INTEL_I32( E_INTEL_I32 );
-const PredType PredType::INTEL_I64( E_INTEL_I64 );
-const PredType PredType::INTEL_U8( E_INTEL_U8 );
-const PredType PredType::INTEL_U16( E_INTEL_U16 );
-const PredType PredType::INTEL_U32( E_INTEL_U32 );
-const PredType PredType::INTEL_U64( E_INTEL_U64 );
-const PredType PredType::INTEL_B8( E_INTEL_B8 );
-const PredType PredType::INTEL_B16( E_INTEL_B16 );
-const PredType PredType::INTEL_B32( E_INTEL_B32 );
-const PredType PredType::INTEL_B64( E_INTEL_B64 );
-const PredType PredType::INTEL_F32( E_INTEL_F32 );
-const PredType PredType::INTEL_F64( E_INTEL_F64 );
-
-const PredType PredType::ALPHA_I8( E_ALPHA_I8 );
-const PredType PredType::ALPHA_I16( E_ALPHA_I16 );
-const PredType PredType::ALPHA_I32( E_ALPHA_I32 );
-const PredType PredType::ALPHA_I64( E_ALPHA_I64 );
-const PredType PredType::ALPHA_U8( E_ALPHA_U8 );
-const PredType PredType::ALPHA_U16( E_ALPHA_U16 );
-const PredType PredType::ALPHA_U32( E_ALPHA_U32 );
-const PredType PredType::ALPHA_U64( E_ALPHA_U64 );
-const PredType PredType::ALPHA_B8( E_ALPHA_B8 );
-const PredType PredType::ALPHA_B16( E_ALPHA_B16 );
-const PredType PredType::ALPHA_B32( E_ALPHA_B32 );
-const PredType PredType::ALPHA_B64( E_ALPHA_B64 );
-const PredType PredType::ALPHA_F32( E_ALPHA_F32 );
-const PredType PredType::ALPHA_F64( E_ALPHA_F64 );
-
-const PredType PredType::MIPS_I8( E_MIPS_I8 );
-const PredType PredType::MIPS_I16( E_MIPS_I16 );
-const PredType PredType::MIPS_I32( E_MIPS_I32 );
-const PredType PredType::MIPS_I64( E_MIPS_I64 );
-const PredType PredType::MIPS_U8( E_MIPS_U8 );
-const PredType PredType::MIPS_U16( E_MIPS_U16 );
-const PredType PredType::MIPS_U32( E_MIPS_U32 );
-const PredType PredType::MIPS_U64( E_MIPS_U64 );
-const PredType PredType::MIPS_B8( E_MIPS_B8 );
-const PredType PredType::MIPS_B16( E_MIPS_B16 );
-const PredType PredType::MIPS_B32( E_MIPS_B32 );
-const PredType PredType::MIPS_B64( E_MIPS_B64 );
-const PredType PredType::MIPS_F32( E_MIPS_F32 );
-const PredType PredType::MIPS_F64( E_MIPS_F64 );
-
-const PredType PredType::NATIVE_CHAR( E_NATIVE_CHAR );
-const PredType PredType::NATIVE_INT( E_NATIVE_INT );
-const PredType PredType::NATIVE_FLOAT( E_NATIVE_FLOAT );
-const PredType PredType::NATIVE_SCHAR( E_NATIVE_SCHAR );
-const PredType PredType::NATIVE_UCHAR( E_NATIVE_UCHAR );
-const PredType PredType::NATIVE_SHORT( E_NATIVE_SHORT );
-const PredType PredType::NATIVE_USHORT( E_NATIVE_USHORT );
-const PredType PredType::NATIVE_UINT( E_NATIVE_UINT );
-const PredType PredType::NATIVE_LONG( E_NATIVE_LONG );
-const PredType PredType::NATIVE_ULONG( E_NATIVE_ULONG );
-const PredType PredType::NATIVE_LLONG( E_NATIVE_LLONG );
-const PredType PredType::NATIVE_ULLONG( E_NATIVE_ULLONG );
-const PredType PredType::NATIVE_DOUBLE( E_NATIVE_DOUBLE );
+const PredType PredType::C_S1( H5T_C_S1 );
+const PredType PredType::FORTRAN_S1( H5T_FORTRAN_S1 );
+
+const PredType PredType::STD_I8BE( H5T_STD_I8BE );
+const PredType PredType::STD_I8LE( H5T_STD_I8LE );
+const PredType PredType::STD_I16BE( H5T_STD_I16BE );
+const PredType PredType::STD_I16LE( H5T_STD_I16LE );
+const PredType PredType::STD_I32BE( H5T_STD_I32BE );
+const PredType PredType::STD_I32LE( H5T_STD_I32LE );
+const PredType PredType::STD_I64BE( H5T_STD_I64BE );
+const PredType PredType::STD_I64LE( H5T_STD_I64LE );
+const PredType PredType::STD_U8BE( H5T_STD_U8BE );
+const PredType PredType::STD_U8LE( H5T_STD_U8LE );
+const PredType PredType::STD_U16BE( H5T_STD_U16BE );
+const PredType PredType::STD_U16LE( H5T_STD_U16LE );
+const PredType PredType::STD_U32BE( H5T_STD_U32BE );
+const PredType PredType::STD_U32LE( H5T_STD_U32LE );
+const PredType PredType::STD_U64BE( H5T_STD_U64BE );
+const PredType PredType::STD_U64LE( H5T_STD_U64LE );
+const PredType PredType::STD_B8BE( H5T_STD_B8BE );
+const PredType PredType::STD_B8LE( H5T_STD_B8LE );
+
+const PredType PredType::STD_B16BE( H5T_STD_B16BE );
+const PredType PredType::STD_B16LE( H5T_STD_B16LE );
+const PredType PredType::STD_B32BE( H5T_STD_B32BE );
+const PredType PredType::STD_B32LE( H5T_STD_B32LE );
+const PredType PredType::STD_B64BE( H5T_STD_B64BE );
+const PredType PredType::STD_B64LE( H5T_STD_B64LE );
+const PredType PredType::STD_REF_OBJ( H5T_STD_REF_OBJ );
+const PredType PredType::STD_REF_DSETREG( H5T_STD_REF_DSETREG );
+
+const PredType PredType::IEEE_F32BE( H5T_IEEE_F32BE );
+const PredType PredType::IEEE_F32LE( H5T_IEEE_F32LE );
+const PredType PredType::IEEE_F64BE( H5T_IEEE_F64BE );
+const PredType PredType::IEEE_F64LE( H5T_IEEE_F64LE );
+
+const PredType PredType::UNIX_D32BE( H5T_UNIX_D32BE );
+const PredType PredType::UNIX_D32LE( H5T_UNIX_D32LE );
+const PredType PredType::UNIX_D64BE( H5T_UNIX_D64BE );
+const PredType PredType::UNIX_D64LE( H5T_UNIX_D64LE );
+
+const PredType PredType::INTEL_I8( H5T_INTEL_I8 );
+const PredType PredType::INTEL_I16( H5T_INTEL_I16 );
+const PredType PredType::INTEL_I32( H5T_INTEL_I32 );
+const PredType PredType::INTEL_I64( H5T_INTEL_I64 );
+const PredType PredType::INTEL_U8( H5T_INTEL_U8 );
+const PredType PredType::INTEL_U16( H5T_INTEL_U16 );
+const PredType PredType::INTEL_U32( H5T_INTEL_U32 );
+const PredType PredType::INTEL_U64( H5T_INTEL_U64 );
+const PredType PredType::INTEL_B8( H5T_INTEL_B8 );
+const PredType PredType::INTEL_B16( H5T_INTEL_B16 );
+const PredType PredType::INTEL_B32( H5T_INTEL_B32 );
+const PredType PredType::INTEL_B64( H5T_INTEL_B64 );
+const PredType PredType::INTEL_F32( H5T_INTEL_F32 );
+const PredType PredType::INTEL_F64( H5T_INTEL_F64 );
+
+const PredType PredType::ALPHA_I8( H5T_ALPHA_I8 );
+const PredType PredType::ALPHA_I16( H5T_ALPHA_I16 );
+const PredType PredType::ALPHA_I32( H5T_ALPHA_I32 );
+const PredType PredType::ALPHA_I64( H5T_ALPHA_I64 );
+const PredType PredType::ALPHA_U8( H5T_ALPHA_U8 );
+const PredType PredType::ALPHA_U16( H5T_ALPHA_U16 );
+const PredType PredType::ALPHA_U32( H5T_ALPHA_U32 );
+const PredType PredType::ALPHA_U64( H5T_ALPHA_U64 );
+const PredType PredType::ALPHA_B8( H5T_ALPHA_B8 );
+const PredType PredType::ALPHA_B16( H5T_ALPHA_B16 );
+const PredType PredType::ALPHA_B32( H5T_ALPHA_B32 );
+const PredType PredType::ALPHA_B64( H5T_ALPHA_B64 );
+const PredType PredType::ALPHA_F32( H5T_ALPHA_F32 );
+const PredType PredType::ALPHA_F64( H5T_ALPHA_F64 );
+
+const PredType PredType::MIPS_I8( H5T_MIPS_I8 );
+const PredType PredType::MIPS_I16( H5T_MIPS_I16 );
+const PredType PredType::MIPS_I32( H5T_MIPS_I32 );
+const PredType PredType::MIPS_I64( H5T_MIPS_I64 );
+const PredType PredType::MIPS_U8( H5T_MIPS_U8 );
+const PredType PredType::MIPS_U16( H5T_MIPS_U16 );
+const PredType PredType::MIPS_U32( H5T_MIPS_U32 );
+const PredType PredType::MIPS_U64( H5T_MIPS_U64 );
+const PredType PredType::MIPS_B8( H5T_MIPS_B8 );
+const PredType PredType::MIPS_B16( H5T_MIPS_B16 );
+const PredType PredType::MIPS_B32( H5T_MIPS_B32 );
+const PredType PredType::MIPS_B64( H5T_MIPS_B64 );
+const PredType PredType::MIPS_F32( H5T_MIPS_F32 );
+const PredType PredType::MIPS_F64( H5T_MIPS_F64 );
+
+const PredType PredType::NATIVE_CHAR( H5T_NATIVE_CHAR );
+const PredType PredType::NATIVE_INT( H5T_NATIVE_INT );
+const PredType PredType::NATIVE_FLOAT( H5T_NATIVE_FLOAT );
+const PredType PredType::NATIVE_SCHAR( H5T_NATIVE_SCHAR );
+const PredType PredType::NATIVE_UCHAR( H5T_NATIVE_UCHAR );
+const PredType PredType::NATIVE_SHORT( H5T_NATIVE_SHORT );
+const PredType PredType::NATIVE_USHORT( H5T_NATIVE_USHORT );
+const PredType PredType::NATIVE_UINT( H5T_NATIVE_UINT );
+const PredType PredType::NATIVE_LONG( H5T_NATIVE_LONG );
+const PredType PredType::NATIVE_ULONG( H5T_NATIVE_ULONG );
+const PredType PredType::NATIVE_LLONG( H5T_NATIVE_LLONG );
+const PredType PredType::NATIVE_ULLONG( H5T_NATIVE_ULLONG );
+const PredType PredType::NATIVE_DOUBLE( H5T_NATIVE_DOUBLE );
 #if H5_SIZEOF_LONG_DOUBLE !=0
-const PredType PredType::NATIVE_LDOUBLE( E_NATIVE_LDOUBLE );
+const PredType PredType::NATIVE_LDOUBLE( H5T_NATIVE_LDOUBLE );
 #endif
-const PredType PredType::NATIVE_B8( E_NATIVE_B8 );
-const PredType PredType::NATIVE_B16( E_NATIVE_B16 );
-const PredType PredType::NATIVE_B32( E_NATIVE_B32 );
-const PredType PredType::NATIVE_B64( E_NATIVE_B64 );
-const PredType PredType::NATIVE_OPAQUE( E_NATIVE_OPAQUE );
-const PredType PredType::NATIVE_HSIZE( E_NATIVE_HSIZE );
-const PredType PredType::NATIVE_HSSIZE( E_NATIVE_HSSIZE );
-const PredType PredType::NATIVE_HERR( E_NATIVE_HERR );
-const PredType PredType::NATIVE_HBOOL( E_NATIVE_HBOOL );
-
-const PredType PredType::NATIVE_INT8( E_NATIVE_INT8 );
-const PredType PredType::NATIVE_UINT8( E_NATIVE_UINT8 );
-const PredType PredType::NATIVE_INT_LEAST8( E_NATIVE_INT_LEAST8 );
-const PredType PredType::NATIVE_UINT_LEAST8( E_NATIVE_UINT_LEAST8 );
-const PredType PredType::NATIVE_INT_FAST8( E_NATIVE_INT_FAST8 );
-const PredType PredType::NATIVE_UINT_FAST8( E_NATIVE_UINT_FAST8 );
-
-const PredType PredType::NATIVE_INT16( E_NATIVE_INT16 );
-const PredType PredType::NATIVE_UINT16( E_NATIVE_UINT16 );
-const PredType PredType::NATIVE_INT_LEAST16( E_NATIVE_INT_LEAST16 );
-const PredType PredType::NATIVE_UINT_LEAST16( E_NATIVE_UINT_LEAST16 );
-const PredType PredType::NATIVE_INT_FAST16( E_NATIVE_INT_FAST16 );
-const PredType PredType::NATIVE_UINT_FAST16( E_NATIVE_UINT_FAST16 );
-
-const PredType PredType::NATIVE_INT32( E_NATIVE_INT32 );
-const PredType PredType::NATIVE_UINT32( E_NATIVE_UINT32 );
-const PredType PredType::NATIVE_INT_LEAST32( E_NATIVE_INT_LEAST32 );
-const PredType PredType::NATIVE_UINT_LEAST32( E_NATIVE_UINT_LEAST32 );
-const PredType PredType::NATIVE_INT_FAST32( E_NATIVE_INT_FAST32 );
-const PredType PredType::NATIVE_UINT_FAST32( E_NATIVE_UINT_FAST32 );
-
-const PredType PredType::NATIVE_INT64( E_NATIVE_INT64 );
-const PredType PredType::NATIVE_UINT64( E_NATIVE_UINT64 );
-const PredType PredType::NATIVE_INT_LEAST64( E_NATIVE_INT_LEAST64 );
-const PredType PredType::NATIVE_UINT_LEAST64( E_NATIVE_UINT_LEAST64 );
-const PredType PredType::NATIVE_INT_FAST64( E_NATIVE_INT_FAST64 );
-const PredType PredType::NATIVE_UINT_FAST64( E_NATIVE_UINT_FAST64 );
+const PredType PredType::NATIVE_B8( H5T_NATIVE_B8 );
+const PredType PredType::NATIVE_B16( H5T_NATIVE_B16 );
+const PredType PredType::NATIVE_B32( H5T_NATIVE_B32 );
+const PredType PredType::NATIVE_B64( H5T_NATIVE_B64 );
+const PredType PredType::NATIVE_OPAQUE( H5T_NATIVE_OPAQUE );
+const PredType PredType::NATIVE_HSIZE( H5T_NATIVE_HSIZE );
+const PredType PredType::NATIVE_HSSIZE( H5T_NATIVE_HSSIZE );
+const PredType PredType::NATIVE_HERR( H5T_NATIVE_HERR );
+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_INT_LEAST8( H5T_NATIVE_INT_LEAST8 );
+const PredType PredType::NATIVE_UINT_LEAST8( H5T_NATIVE_UINT_LEAST8 );
+
+const PredType PredType::NATIVE_INT16( H5T_NATIVE_INT16 );
+const PredType PredType::NATIVE_UINT16( H5T_NATIVE_UINT16 );
+const PredType PredType::NATIVE_INT_LEAST16( H5T_NATIVE_INT_LEAST16 );
+const PredType PredType::NATIVE_UINT_LEAST16( H5T_NATIVE_UINT_LEAST16 );
+
+const PredType PredType::NATIVE_INT32( H5T_NATIVE_INT32 );
+const PredType PredType::NATIVE_UINT32( H5T_NATIVE_UINT32 );
+const PredType PredType::NATIVE_INT_LEAST32( H5T_NATIVE_INT_LEAST32 );
+const PredType PredType::NATIVE_UINT_LEAST32( H5T_NATIVE_UINT_LEAST32 );
+
+const PredType PredType::NATIVE_INT64( H5T_NATIVE_INT64 );
+const PredType PredType::NATIVE_UINT64( H5T_NATIVE_UINT64 );
+const PredType PredType::NATIVE_INT_LEAST64( H5T_NATIVE_INT_LEAST64 );
+const PredType PredType::NATIVE_UINT_LEAST64( H5T_NATIVE_UINT_LEAST64 );
+
+// 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 );
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
@@ -229,285 +230,6 @@ PredType& PredType::operator=( const PredType& rhs )
    return(*this);
 }
 
-//--------------------------------------------------------------------------
-// Function:	PredType::getId
-///\brief	Returns the HDF5 predefined type id.
-///\return	HDF5 predefined type id or INVALID
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-hid_t PredType::getId() const
-{
-    switch( id ) {
-	case E_C_S1:
-	    return( H5T_C_S1 );
-	case E_FORTRAN_S1:
-	    return( H5T_FORTRAN_S1 );
-
-	case E_STD_I8BE:
-	    return( H5T_STD_I8BE );
-	case E_STD_I8LE:
-	    return( H5T_STD_I8LE );
-	case E_STD_I16BE:
-	    return( H5T_STD_I16BE );
-	case E_STD_I16LE:
-	    return( H5T_STD_I16LE );
-	case E_STD_I32BE:
-	    return( H5T_STD_I32BE );
-	case E_STD_I32LE:
-	    return( H5T_STD_I32LE );
-	case E_STD_I64BE:
-	    return( H5T_STD_I64BE );
-	case E_STD_I64LE:
-	    return( H5T_STD_I64LE );
-	case E_STD_U8BE:
-	    return( H5T_STD_U8BE );
-	case E_STD_U8LE:
-	    return( H5T_STD_U8LE );
-	case E_STD_U16BE:
-	    return( H5T_STD_U16BE );
-	case E_STD_U16LE:
-	    return( H5T_STD_U16LE );
-	case E_STD_U32BE:
-	    return( H5T_STD_U32BE );
-	case E_STD_U32LE:
-	    return( H5T_STD_U32LE );
-	case E_STD_U64BE:
-	    return( H5T_STD_U64BE );
-	case E_STD_U64LE:
-	    return( H5T_STD_U64LE );
-	case E_STD_B8BE:
-	    return( H5T_STD_B8BE );
-	case E_STD_B8LE:
-	    return( H5T_STD_B8LE );
-
-	case E_STD_B16BE:
-	    return( H5T_STD_B16BE );
-	case E_STD_B16LE:
-	    return( H5T_STD_B16LE );
-	case E_STD_B32BE:
-	    return( H5T_STD_B32BE );
-	case E_STD_B32LE:
-	    return( H5T_STD_B32LE );
-	case E_STD_B64BE:
-	    return( H5T_STD_B64BE );
-	case E_STD_B64LE:
-	    return( H5T_STD_B64LE );
-	case E_STD_REF_OBJ:
-	    return( H5T_STD_REF_OBJ );
-	case E_STD_REF_DSETREG:
-	    return( H5T_STD_REF_DSETREG );
-
-	case E_IEEE_F32BE:
-	    return( H5T_IEEE_F32BE );
-	case E_IEEE_F32LE:
-	    return( H5T_IEEE_F32LE );
-	case E_IEEE_F64BE:
-	    return( H5T_IEEE_F64BE );
-	case E_IEEE_F64LE:
-	    return( H5T_IEEE_F64LE );
-
-	case E_UNIX_D32BE:
-	    return( H5T_UNIX_D32BE );
-	case E_UNIX_D32LE:
-	    return( H5T_UNIX_D32LE );
-	case E_UNIX_D64BE:
-	    return( H5T_UNIX_D64BE );
-	case E_UNIX_D64LE:
-	    return( H5T_UNIX_D64LE );
-
-	case E_INTEL_I8:
-	    return( H5T_INTEL_I8 );
-	case E_INTEL_I16:
-	    return( H5T_INTEL_I16 );
-	case E_INTEL_I32:
-	    return( H5T_INTEL_I32 );
-	case E_INTEL_I64:
-	    return( H5T_INTEL_I64 );
-	case E_INTEL_U8:
-	    return( H5T_INTEL_U8 );
-	case E_INTEL_U16:
-	    return( H5T_INTEL_U16 );
-	case E_INTEL_U32:
-	    return( H5T_INTEL_U32 );
-	case E_INTEL_U64:
-	    return( H5T_INTEL_U64 );
-	case E_INTEL_B8:
-	    return( H5T_INTEL_B8 );
-	case E_INTEL_B16:
-	    return( H5T_INTEL_B16 );
-	case E_INTEL_B32:
-	    return( H5T_INTEL_B32 );
-	case E_INTEL_B64:
-	    return( H5T_INTEL_B64 );
-	case E_INTEL_F32:
-	    return( H5T_INTEL_F32 );
-	case E_INTEL_F64:
-	    return( H5T_INTEL_F64 );
-
-	case E_ALPHA_I8:
-	    return( H5T_ALPHA_I8 );
-	case E_ALPHA_I16:
-	    return( H5T_ALPHA_I16 );
-	case E_ALPHA_I32:
-	    return( H5T_ALPHA_I32 );
-	case E_ALPHA_I64:
-	    return( H5T_ALPHA_I64 );
-	case E_ALPHA_U8:
-	    return( H5T_ALPHA_U8 );
-	case E_ALPHA_U16:
-	    return( H5T_ALPHA_U16 );
-	case E_ALPHA_U32:
-	    return( H5T_ALPHA_U32 );
-	case E_ALPHA_U64:
-	    return( H5T_ALPHA_U64 );
-	case E_ALPHA_B8:
-	    return( H5T_ALPHA_B8 );
-	case E_ALPHA_B16:
-	    return( H5T_ALPHA_B16 );
-	case E_ALPHA_B32:
-	    return( H5T_ALPHA_B32 );
-	case E_ALPHA_B64:
-	    return( H5T_ALPHA_B64 );
-	case E_ALPHA_F32:
-	    return( H5T_ALPHA_F32 );
-	case E_ALPHA_F64:
-	    return( H5T_ALPHA_F64 );
-
-	case E_MIPS_I8:
-	    return( H5T_MIPS_I8 );
-	case E_MIPS_I16:
-	    return( H5T_MIPS_I16 );
-	case E_MIPS_I32:
-	    return( H5T_MIPS_I32 );
-	case E_MIPS_I64:
-	    return( H5T_MIPS_I64 );
-	case E_MIPS_U8:
-	    return( H5T_MIPS_U8 );
-	case E_MIPS_U16:
-	    return( H5T_MIPS_U16 );
-	case E_MIPS_U32:
-	    return( H5T_MIPS_U32 );
-	case E_MIPS_U64:
-	    return( H5T_MIPS_U64 );
-	case E_MIPS_B8:
-	    return( H5T_MIPS_B8 );
-	case E_MIPS_B16:
-	    return( H5T_MIPS_B16 );
-	case E_MIPS_B32:
-	    return( H5T_MIPS_B32 );
-	case E_MIPS_B64:
-	    return( H5T_MIPS_B64 );
-	case E_MIPS_F32:
-	    return( H5T_MIPS_F32 );
-	case E_MIPS_F64:
-	    return( H5T_MIPS_F64 );
-
-	case E_NATIVE_CHAR:
-	    return( H5T_NATIVE_CHAR );
-	case E_NATIVE_INT:
-	    return( H5T_NATIVE_INT );
-	case E_NATIVE_FLOAT:
-	    return( H5T_NATIVE_FLOAT );
-	case E_NATIVE_SCHAR:
-	    return( H5T_NATIVE_SCHAR );
-	case E_NATIVE_UCHAR:
-	    return( H5T_NATIVE_UCHAR );
-	case E_NATIVE_SHORT:
-	    return( H5T_NATIVE_SHORT );
-	case E_NATIVE_USHORT:
-	    return( H5T_NATIVE_USHORT );
-	case E_NATIVE_UINT:
-	    return( H5T_NATIVE_UINT );
-	case E_NATIVE_LONG:
-	    return( H5T_NATIVE_LONG );
-	case E_NATIVE_ULONG:
-	    return( H5T_NATIVE_ULONG );
-	case E_NATIVE_LLONG:
-	    return( H5T_NATIVE_LLONG );
-	case E_NATIVE_ULLONG:
-	    return( H5T_NATIVE_ULLONG );
-	case E_NATIVE_DOUBLE:
-	    return( H5T_NATIVE_DOUBLE );
-#if H5_SIZEOF_LONG_DOUBLE !=0
-	case E_NATIVE_LDOUBLE:
-	    return( H5T_NATIVE_LDOUBLE );
-#endif
-	case E_NATIVE_B8:
-	    return( H5T_NATIVE_B8 );
-	case E_NATIVE_B16:
-	    return( H5T_NATIVE_B16 );
-	case E_NATIVE_B32:
-	    return( H5T_NATIVE_B32 );
-	case E_NATIVE_B64:
-	    return( H5T_NATIVE_B64 );
-	case E_NATIVE_OPAQUE:
-	    return( H5T_NATIVE_OPAQUE );
-	case E_NATIVE_HSIZE:
-	    return( H5T_NATIVE_HSIZE );
-	case E_NATIVE_HSSIZE:
-	    return( H5T_NATIVE_HSSIZE );
-	case E_NATIVE_HERR:
-	    return( H5T_NATIVE_HERR );
-	case E_NATIVE_HBOOL:
-	    return( H5T_NATIVE_HBOOL );
-
-	case E_NATIVE_INT8:
-	    return( H5T_NATIVE_INT8 );
-	case E_NATIVE_UINT8:
-	    return( H5T_NATIVE_UINT8 );
-	case E_NATIVE_INT_LEAST8:
-	    return( H5T_NATIVE_INT_LEAST8 );
-	case E_NATIVE_UINT_LEAST8:
-	    return( H5T_NATIVE_UINT_LEAST8 );
-	case E_NATIVE_INT_FAST8:
-	    return( H5T_NATIVE_INT_FAST8 );
-	case E_NATIVE_UINT_FAST8:
-	    return( H5T_NATIVE_UINT_FAST8 );
-
-	case E_NATIVE_INT16:
-	    return( H5T_NATIVE_INT16 );
-	case E_NATIVE_UINT16:
-	    return( H5T_NATIVE_UINT16 );
-	case E_NATIVE_INT_LEAST16:
-	    return( H5T_NATIVE_INT_LEAST16 );
-	case E_NATIVE_UINT_LEAST16:
-	    return( H5T_NATIVE_UINT_LEAST16 );
-	case E_NATIVE_INT_FAST16:
-	    return( H5T_NATIVE_INT_FAST16 );
-	case E_NATIVE_UINT_FAST16:
-	    return( H5T_NATIVE_UINT_FAST16 );
-
-	case E_NATIVE_INT32:
-	    return( H5T_NATIVE_INT32 );
-	case E_NATIVE_UINT32:
-	    return( H5T_NATIVE_UINT32 );
-	case E_NATIVE_INT_LEAST32:
-	    return( H5T_NATIVE_INT_LEAST32 );
-	case E_NATIVE_UINT_LEAST32:
-	    return( H5T_NATIVE_UINT_LEAST32 );
-	case E_NATIVE_INT_FAST32:
-	    return( H5T_NATIVE_INT_FAST32 );
-	case E_NATIVE_UINT_FAST32:
-	    return( H5T_NATIVE_UINT_FAST32 );
-
-	case E_NATIVE_INT64:
-	    return( H5T_NATIVE_INT64 );
-	case E_NATIVE_UINT64:
-	    return( H5T_NATIVE_UINT64 );
-	case E_NATIVE_INT_LEAST64:
-	    return( H5T_NATIVE_INT_LEAST64 );
-	case E_NATIVE_UINT_LEAST64:
-	    return( H5T_NATIVE_UINT_LEAST64 );
-	case E_NATIVE_INT_FAST64:
-	    return( H5T_NATIVE_INT_FAST64 );
-	case E_NATIVE_UINT_FAST64:
-	    return( H5T_NATIVE_UINT_FAST64 );
-
-	default:
-	    return( INVALID );
-    }   // end switch
-}   // end of getId()
-
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 // These dummy functions do not inherit from DataType - they'll
 // throw an DataTypeIException if invoked.