Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

1 files changed, 386 insertions, 497 deletions

diff --git a/c++/src/H5PredType.cpp b/c++/src/H5PredType.cpp
index 57ba5e5..9458fb7 100644
--- a/c++/src/H5PredType.cpp
+++ b/c++/src/H5PredType.cpp
@@ -6,7 +6,7 @@
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -51,7 +51,9 @@ PredType::PredType(const hid_t predtype_id) : AtomType(predtype_id)
 ///\brief       Default constructor: Creates a stub predefined datatype
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-PredType::PredType() : AtomType() {}
+PredType::PredType() : AtomType()
+{
+}
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
@@ -60,7 +62,9 @@ PredType::PredType() : AtomType() {}
 ///\param       original - IN: PredType instance to copy
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-PredType::PredType(const PredType& original) : AtomType(original) {}
+PredType::PredType(const PredType &original) : AtomType(original)
+{
+}
 
 //--------------------------------------------------------------------------
 // Function:    PredType::operator=
@@ -73,29 +77,39 @@ PredType::PredType(const PredType& original) : AtomType(original) {}
 //              the new id in the left hand side object.
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-PredType& PredType::operator=(const PredType& rhs)
+PredType &
+PredType::operator=(const PredType &rhs)
 {
     if (this != &rhs)
         copy(rhs);
-    return(*this);
+    return (*this);
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 // These dummy functions do not inherit from DataType - they'll
 // throw an DataTypeIException if invoked.
-void PredType::commit(H5Location& loc, const char* name)
+void
+PredType::commit(H5Location &loc, const char *name)
 {
-    throw DataTypeIException("PredType::commit", "Error: Attempted to commit a predefined datatype.  Invalid operation!");
+    // Unused
+    (void)loc;
+    (void)name;
+
+    throw DataTypeIException("PredType::commit",
+                             "Error: Attempted to commit a predefined datatype.  Invalid operation!");
 }
 
-void PredType::commit(H5Location& loc, const H5std_string& name)
+void
+PredType::commit(H5Location &loc, const H5std_string &name)
 {
     commit(loc, name.c_str());
 }
 
-bool PredType::committed()
+bool
+PredType::committed()
 {
-    throw DataTypeIException("PredType::committed", "Error: Attempting to check for commit status on a predefined datatype.");
+    throw DataTypeIException("PredType::committed",
+                             "Error: Attempting to check for commit status on a predefined datatype.");
 }
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
@@ -105,7 +119,9 @@ bool PredType::committed()
 ///\brief       Noop destructor.
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-PredType::~PredType() {}
+PredType::~PredType()
+{
+}
 
 /*****************************************************************************
         The following section is regarding the global constants PredType,
@@ -115,181 +131,150 @@ PredType::~PredType() {}
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 // Definition pointers for the constants
-PredType* PredType::PREDTYPE_CONST_ = 0; //dummy
-PredType* PredType::STD_I8BE_;
-PredType* PredType::STD_I8LE_;
-PredType* PredType::STD_I16BE_;
-PredType* PredType::STD_I16LE_;
-PredType* PredType::STD_I32BE_;
-PredType* PredType::STD_I32LE_;
-PredType* PredType::STD_I64BE_;
-PredType* PredType::STD_I64LE_;
-PredType* PredType::STD_U8BE_;
-PredType* PredType::STD_U8LE_;
-PredType* PredType::STD_U16BE_;
-PredType* PredType::STD_U16LE_;
-PredType* PredType::STD_U32BE_;
-PredType* PredType::STD_U32LE_;
-PredType* PredType::STD_U64BE_;
-PredType* PredType::STD_U64LE_;
-PredType* PredType::STD_B8BE_;
-PredType* PredType::STD_B8LE_;
-PredType* PredType::STD_B16BE_;
-PredType* PredType::STD_B16LE_;
-PredType* PredType::STD_B32BE_;
-PredType* PredType::STD_B32LE_;
-PredType* PredType::STD_B64BE_;
-PredType* PredType::STD_B64LE_;
-PredType* PredType::STD_REF_OBJ_;
-PredType* PredType::STD_REF_DSETREG_;
-
-PredType* PredType::C_S1_;
-PredType* PredType::FORTRAN_S1_;
-
-PredType* PredType::IEEE_F32BE_;
-PredType* PredType::IEEE_F32LE_;
-PredType* PredType::IEEE_F64BE_;
-PredType* PredType::IEEE_F64LE_;
-
-PredType* PredType::UNIX_D32BE_;
-PredType* PredType::UNIX_D32LE_;
-PredType* PredType::UNIX_D64BE_;
-PredType* PredType::UNIX_D64LE_;
-
-PredType* PredType::INTEL_I8_;
-PredType* PredType::INTEL_I16_;
-PredType* PredType::INTEL_I32_;
-PredType* PredType::INTEL_I64_;
-PredType* PredType::INTEL_U8_;
-PredType* PredType::INTEL_U16_;
-PredType* PredType::INTEL_U32_;
-PredType* PredType::INTEL_U64_;
-PredType* PredType::INTEL_B8_;
-PredType* PredType::INTEL_B16_;
-PredType* PredType::INTEL_B32_;
-PredType* PredType::INTEL_B64_;
-PredType* PredType::INTEL_F32_;
-PredType* PredType::INTEL_F64_;
-
-PredType* PredType::ALPHA_I8_;
-PredType* PredType::ALPHA_I16_;
-PredType* PredType::ALPHA_I32_;
-PredType* PredType::ALPHA_I64_;
-PredType* PredType::ALPHA_U8_;
-PredType* PredType::ALPHA_U16_;
-PredType* PredType::ALPHA_U32_;
-PredType* PredType::ALPHA_U64_;
-PredType* PredType::ALPHA_B8_;
-PredType* PredType::ALPHA_B16_;
-PredType* PredType::ALPHA_B32_;
-PredType* PredType::ALPHA_B64_;
-PredType* PredType::ALPHA_F32_;
-PredType* PredType::ALPHA_F64_;
-
-PredType* PredType::MIPS_I8_;
-PredType* PredType::MIPS_I16_;
-PredType* PredType::MIPS_I32_;
-PredType* PredType::MIPS_I64_;
-PredType* PredType::MIPS_U8_;
-PredType* PredType::MIPS_U16_;
-PredType* PredType::MIPS_U32_;
-PredType* PredType::MIPS_U64_;
-PredType* PredType::MIPS_B8_;
-PredType* PredType::MIPS_B16_;
-PredType* PredType::MIPS_B32_;
-PredType* PredType::MIPS_B64_;
-PredType* PredType::MIPS_F32_;
-PredType* PredType::MIPS_F64_;
-
-PredType* PredType::NATIVE_CHAR_;
-PredType* PredType::NATIVE_SCHAR_;
-PredType* PredType::NATIVE_UCHAR_;
-PredType* PredType::NATIVE_SHORT_;
-PredType* PredType::NATIVE_USHORT_;
-PredType* PredType::NATIVE_INT_;
-PredType* PredType::NATIVE_UINT_;
-PredType* PredType::NATIVE_LONG_;
-PredType* PredType::NATIVE_ULONG_;
-PredType* PredType::NATIVE_LLONG_;
-PredType* PredType::NATIVE_ULLONG_;
-PredType* PredType::NATIVE_FLOAT_;
-PredType* PredType::NATIVE_DOUBLE_;
-PredType* PredType::NATIVE_LDOUBLE_;
-PredType* PredType::NATIVE_B8_;
-PredType* PredType::NATIVE_B16_;
-PredType* PredType::NATIVE_B32_;
-PredType* PredType::NATIVE_B64_;
-PredType* PredType::NATIVE_OPAQUE_;
-PredType* PredType::NATIVE_HSIZE_;
-PredType* PredType::NATIVE_HSSIZE_;
-PredType* PredType::NATIVE_HERR_;
-PredType* PredType::NATIVE_HBOOL_;
-
-PredType* PredType::NATIVE_INT8_;
-PredType* PredType::NATIVE_UINT8_;
-PredType* PredType::NATIVE_INT16_;
-PredType* PredType::NATIVE_UINT16_;
-PredType* PredType::NATIVE_INT32_;
-PredType* PredType::NATIVE_UINT32_;
-PredType* PredType::NATIVE_INT64_;
-PredType* PredType::NATIVE_UINT64_;
+PredType *PredType::PREDTYPE_CONST_ = 0; // dummy
+PredType *PredType::STD_I8BE_;
+PredType *PredType::STD_I8LE_;
+PredType *PredType::STD_I16BE_;
+PredType *PredType::STD_I16LE_;
+PredType *PredType::STD_I32BE_;
+PredType *PredType::STD_I32LE_;
+PredType *PredType::STD_I64BE_;
+PredType *PredType::STD_I64LE_;
+PredType *PredType::STD_U8BE_;
+PredType *PredType::STD_U8LE_;
+PredType *PredType::STD_U16BE_;
+PredType *PredType::STD_U16LE_;
+PredType *PredType::STD_U32BE_;
+PredType *PredType::STD_U32LE_;
+PredType *PredType::STD_U64BE_;
+PredType *PredType::STD_U64LE_;
+PredType *PredType::STD_B8BE_;
+PredType *PredType::STD_B8LE_;
+PredType *PredType::STD_B16BE_;
+PredType *PredType::STD_B16LE_;
+PredType *PredType::STD_B32BE_;
+PredType *PredType::STD_B32LE_;
+PredType *PredType::STD_B64BE_;
+PredType *PredType::STD_B64LE_;
+PredType *PredType::STD_REF_OBJ_;
+PredType *PredType::STD_REF_DSETREG_;
+
+PredType *PredType::C_S1_;
+PredType *PredType::FORTRAN_S1_;
+
+PredType *PredType::IEEE_F32BE_;
+PredType *PredType::IEEE_F32LE_;
+PredType *PredType::IEEE_F64BE_;
+PredType *PredType::IEEE_F64LE_;
+
+PredType *PredType::UNIX_D32BE_;
+PredType *PredType::UNIX_D32LE_;
+PredType *PredType::UNIX_D64BE_;
+PredType *PredType::UNIX_D64LE_;
+
+PredType *PredType::INTEL_I8_;
+PredType *PredType::INTEL_I16_;
+PredType *PredType::INTEL_I32_;
+PredType *PredType::INTEL_I64_;
+PredType *PredType::INTEL_U8_;
+PredType *PredType::INTEL_U16_;
+PredType *PredType::INTEL_U32_;
+PredType *PredType::INTEL_U64_;
+PredType *PredType::INTEL_B8_;
+PredType *PredType::INTEL_B16_;
+PredType *PredType::INTEL_B32_;
+PredType *PredType::INTEL_B64_;
+PredType *PredType::INTEL_F32_;
+PredType *PredType::INTEL_F64_;
+
+PredType *PredType::ALPHA_I8_;
+PredType *PredType::ALPHA_I16_;
+PredType *PredType::ALPHA_I32_;
+PredType *PredType::ALPHA_I64_;
+PredType *PredType::ALPHA_U8_;
+PredType *PredType::ALPHA_U16_;
+PredType *PredType::ALPHA_U32_;
+PredType *PredType::ALPHA_U64_;
+PredType *PredType::ALPHA_B8_;
+PredType *PredType::ALPHA_B16_;
+PredType *PredType::ALPHA_B32_;
+PredType *PredType::ALPHA_B64_;
+PredType *PredType::ALPHA_F32_;
+PredType *PredType::ALPHA_F64_;
+
+PredType *PredType::MIPS_I8_;
+PredType *PredType::MIPS_I16_;
+PredType *PredType::MIPS_I32_;
+PredType *PredType::MIPS_I64_;
+PredType *PredType::MIPS_U8_;
+PredType *PredType::MIPS_U16_;
+PredType *PredType::MIPS_U32_;
+PredType *PredType::MIPS_U64_;
+PredType *PredType::MIPS_B8_;
+PredType *PredType::MIPS_B16_;
+PredType *PredType::MIPS_B32_;
+PredType *PredType::MIPS_B64_;
+PredType *PredType::MIPS_F32_;
+PredType *PredType::MIPS_F64_;
+
+PredType *PredType::NATIVE_CHAR_;
+PredType *PredType::NATIVE_SCHAR_;
+PredType *PredType::NATIVE_UCHAR_;
+PredType *PredType::NATIVE_SHORT_;
+PredType *PredType::NATIVE_USHORT_;
+PredType *PredType::NATIVE_INT_;
+PredType *PredType::NATIVE_UINT_;
+PredType *PredType::NATIVE_LONG_;
+PredType *PredType::NATIVE_ULONG_;
+PredType *PredType::NATIVE_LLONG_;
+PredType *PredType::NATIVE_ULLONG_;
+PredType *PredType::NATIVE_FLOAT_;
+PredType *PredType::NATIVE_DOUBLE_;
+PredType *PredType::NATIVE_LDOUBLE_;
+PredType *PredType::NATIVE_B8_;
+PredType *PredType::NATIVE_B16_;
+PredType *PredType::NATIVE_B32_;
+PredType *PredType::NATIVE_B64_;
+PredType *PredType::NATIVE_OPAQUE_;
+PredType *PredType::NATIVE_HSIZE_;
+PredType *PredType::NATIVE_HSSIZE_;
+PredType *PredType::NATIVE_HERR_;
+PredType *PredType::NATIVE_HBOOL_;
+
+PredType *PredType::NATIVE_INT8_;
+PredType *PredType::NATIVE_UINT8_;
+PredType *PredType::NATIVE_INT16_;
+PredType *PredType::NATIVE_UINT16_;
+PredType *PredType::NATIVE_INT32_;
+PredType *PredType::NATIVE_UINT32_;
+PredType *PredType::NATIVE_INT64_;
+PredType *PredType::NATIVE_UINT64_;
+
 // LEAST types
-#if H5_SIZEOF_INT_LEAST8_T != 0
-PredType* PredType::NATIVE_INT_LEAST8_;
-#endif /* H5_SIZEOF_INT_LEAST8_T */
-#if H5_SIZEOF_UINT_LEAST8_T != 0
-PredType* PredType::NATIVE_UINT_LEAST8_;
-#endif /* H5_SIZEOF_UINT_LEAST8_T */
-
-#if H5_SIZEOF_INT_LEAST16_T != 0
-PredType* PredType::NATIVE_INT_LEAST16_;
-#endif /* H5_SIZEOF_INT_LEAST16_T */
-#if H5_SIZEOF_UINT_LEAST16_T != 0
-PredType* PredType::NATIVE_UINT_LEAST16_;
-#endif /* H5_SIZEOF_UINT_LEAST16_T */
-
-#if H5_SIZEOF_INT_LEAST32_T != 0
-PredType* PredType::NATIVE_INT_LEAST32_;
-#endif /* H5_SIZEOF_INT_LEAST32_T */
-#if H5_SIZEOF_UINT_LEAST32_T != 0
-PredType* PredType::NATIVE_UINT_LEAST32_;
-#endif /* H5_SIZEOF_UINT_LEAST32_T */
-
-#if H5_SIZEOF_INT_LEAST64_T != 0
-PredType* PredType::NATIVE_INT_LEAST64_;
-#endif /* H5_SIZEOF_INT_LEAST64_T */
-#if H5_SIZEOF_UINT_LEAST64_T != 0
-PredType* PredType::NATIVE_UINT_LEAST64_;
-#endif /* H5_SIZEOF_UINT_LEAST64_T */
+PredType *PredType::NATIVE_INT_LEAST8_;
+PredType *PredType::NATIVE_UINT_LEAST8_;
+
+PredType *PredType::NATIVE_INT_LEAST16_;
+PredType *PredType::NATIVE_UINT_LEAST16_;
+
+PredType *PredType::NATIVE_INT_LEAST32_;
+PredType *PredType::NATIVE_UINT_LEAST32_;
+
+PredType *PredType::NATIVE_INT_LEAST64_;
+PredType *PredType::NATIVE_UINT_LEAST64_;
 
 // FAST types
-#if H5_SIZEOF_INT_FAST8_T != 0
-PredType* PredType::NATIVE_INT_FAST8_;
-#endif /* H5_SIZEOF_INT_FAST8_T */
-#if H5_SIZEOF_UINT_FAST8_T != 0
-PredType* PredType::NATIVE_UINT_FAST8_;
-#endif /* H5_SIZEOF_UINT_FAST8_T */
-
-#if H5_SIZEOF_INT_FAST16_T != 0
-PredType* PredType::NATIVE_INT_FAST16_;
-#endif /* H5_SIZEOF_INT_FAST16_T */
-#if H5_SIZEOF_UINT_FAST16_T != 0
-PredType* PredType::NATIVE_UINT_FAST16_;
-#endif /* H5_SIZEOF_UINT_FAST16_T */
-
-#if H5_SIZEOF_INT_FAST32_T != 0
-PredType* PredType::NATIVE_INT_FAST32_;
-#endif /* H5_SIZEOF_INT_FAST32_T */
-#if H5_SIZEOF_UINT_FAST32_T != 0
-PredType* PredType::NATIVE_UINT_FAST32_;
-#endif /* H5_SIZEOF_UINT_FAST32_T */
-
-#if H5_SIZEOF_INT_FAST64_T != 0
-PredType* PredType::NATIVE_INT_FAST64_;
-#endif /* H5_SIZEOF_INT_FAST64_T */
-#if H5_SIZEOF_UINT_FAST64_T != 0
-PredType* PredType::NATIVE_UINT_FAST64_;
-#endif /* H5_SIZEOF_UINT_FAST64_T */
+PredType *PredType::NATIVE_INT_FAST8_;
+PredType *PredType::NATIVE_UINT_FAST8_;
+
+PredType *PredType::NATIVE_INT_FAST16_;
+PredType *PredType::NATIVE_UINT_FAST16_;
+
+PredType *PredType::NATIVE_INT_FAST32_;
+PredType *PredType::NATIVE_UINT_FAST32_;
+
+PredType *PredType::NATIVE_INT_FAST64_;
+PredType *PredType::NATIVE_UINT_FAST64_;
 
 //--------------------------------------------------------------------------
 // Function:    PredType::getPredTypes
@@ -305,13 +290,13 @@ PredType* PredType::NATIVE_UINT_FAST64_;
 //
 // Programmer   Binh-Minh Ribler - September 2015
 //--------------------------------------------------------------------------
-PredType* PredType::getPredTypes()
+PredType *
+PredType::getPredTypes()
 {
     // Tell the C library not to clean up, H5Library::termH5cpp will call
     // H5close - more dependency if use H5Library::dontAtExit()
-    if (!IdComponent::H5dontAtexit_called)
-    {
-        (void) H5dont_atexit();
+    if (!IdComponent::H5dontAtexit_called) {
+        (void)H5dont_atexit();
         IdComponent::H5dontAtexit_called = true;
     }
 
@@ -320,7 +305,9 @@ PredType* PredType::getPredTypes()
     if (PREDTYPE_CONST_ == 0)
         makePredTypes();
     else
-        throw H5::DataTypeIException("PredType::getPredTypes", "PredType::getPredTypes is being invoked on an allocated PREDTYPE_CONST_");
+        throw H5::DataTypeIException(
+            "PredType::getPredTypes",
+            "PredType::getPredTypes is being invoked on an allocated PREDTYPE_CONST_");
     return PREDTYPE_CONST_;
 }
 
@@ -329,38 +316,39 @@ PredType* PredType::getPredTypes()
 // Purpose      Allocate all PredType constants.
 // Programmer   Binh-Minh Ribler - September 2015
 //--------------------------------------------------------------------------
-void PredType::makePredTypes()
+void
+PredType::makePredTypes()
 {
     PREDTYPE_CONST_ = new PredType;
-    C_S1_ = new PredType(H5T_C_S1);
-    FORTRAN_S1_ = new PredType(H5T_FORTRAN_S1);
+    C_S1_           = new PredType(H5T_C_S1);
+    FORTRAN_S1_     = new PredType(H5T_FORTRAN_S1);
 
-    STD_I8BE_ = new PredType(H5T_STD_I8BE);
-    STD_I8LE_ = new PredType(H5T_STD_I8LE);
+    STD_I8BE_  = new PredType(H5T_STD_I8BE);
+    STD_I8LE_  = new PredType(H5T_STD_I8LE);
     STD_I16BE_ = new PredType(H5T_STD_I16BE);
     STD_I16LE_ = new PredType(H5T_STD_I16LE);
     STD_I32BE_ = new PredType(H5T_STD_I32BE);
     STD_I32LE_ = new PredType(H5T_STD_I32LE);
     STD_I64BE_ = new PredType(H5T_STD_I64BE);
     STD_I64LE_ = new PredType(H5T_STD_I64LE);
-    STD_U8BE_ = new PredType(H5T_STD_U8BE);
-    STD_U8LE_ = new PredType(H5T_STD_U8LE);
+    STD_U8BE_  = new PredType(H5T_STD_U8BE);
+    STD_U8LE_  = new PredType(H5T_STD_U8LE);
     STD_U16BE_ = new PredType(H5T_STD_U16BE);
     STD_U16LE_ = new PredType(H5T_STD_U16LE);
     STD_U32BE_ = new PredType(H5T_STD_U32BE);
     STD_U32LE_ = new PredType(H5T_STD_U32LE);
     STD_U64BE_ = new PredType(H5T_STD_U64BE);
     STD_U64LE_ = new PredType(H5T_STD_U64LE);
-    STD_B8BE_ = new PredType(H5T_STD_B8BE);
-    STD_B8LE_ = new PredType(H5T_STD_B8LE);
-
-    STD_B16BE_ = new PredType(H5T_STD_B16BE);
-    STD_B16LE_ = new PredType(H5T_STD_B16LE);
-    STD_B32BE_ = new PredType(H5T_STD_B32BE);
-    STD_B32LE_ = new PredType(H5T_STD_B32LE);
-    STD_B64BE_ = new PredType(H5T_STD_B64BE);
-    STD_B64LE_ = new PredType(H5T_STD_B64LE);
-    STD_REF_OBJ_ = new PredType(H5T_STD_REF_OBJ);
+    STD_B8BE_  = new PredType(H5T_STD_B8BE);
+    STD_B8LE_  = new PredType(H5T_STD_B8LE);
+
+    STD_B16BE_       = new PredType(H5T_STD_B16BE);
+    STD_B16LE_       = new PredType(H5T_STD_B16LE);
+    STD_B32BE_       = new PredType(H5T_STD_B32BE);
+    STD_B32LE_       = new PredType(H5T_STD_B32LE);
+    STD_B64BE_       = new PredType(H5T_STD_B64BE);
+    STD_B64LE_       = new PredType(H5T_STD_B64LE);
+    STD_REF_OBJ_     = new PredType(H5T_STD_REF_OBJ);
     STD_REF_DSETREG_ = new PredType(H5T_STD_REF_DSETREG);
 
     IEEE_F32BE_ = new PredType(H5T_IEEE_F32BE);
@@ -373,153 +361,119 @@ void PredType::makePredTypes()
     UNIX_D64BE_ = new PredType(H5T_UNIX_D64BE);
     UNIX_D64LE_ = new PredType(H5T_UNIX_D64LE);
 
-    INTEL_I8_ = new PredType(H5T_INTEL_I8);
+    INTEL_I8_  = new PredType(H5T_INTEL_I8);
     INTEL_I16_ = new PredType(H5T_INTEL_I16);
     INTEL_I32_ = new PredType(H5T_INTEL_I32);
     INTEL_I64_ = new PredType(H5T_INTEL_I64);
-    INTEL_U8_ = new PredType(H5T_INTEL_U8);
+    INTEL_U8_  = new PredType(H5T_INTEL_U8);
     INTEL_U16_ = new PredType(H5T_INTEL_U16);
     INTEL_U32_ = new PredType(H5T_INTEL_U32);
     INTEL_U64_ = new PredType(H5T_INTEL_U64);
-    INTEL_B8_ = new PredType(H5T_INTEL_B8);
+    INTEL_B8_  = new PredType(H5T_INTEL_B8);
     INTEL_B16_ = new PredType(H5T_INTEL_B16);
     INTEL_B32_ = new PredType(H5T_INTEL_B32);
     INTEL_B64_ = new PredType(H5T_INTEL_B64);
     INTEL_F32_ = new PredType(H5T_INTEL_F32);
     INTEL_F64_ = new PredType(H5T_INTEL_F64);
 
-    ALPHA_I8_ = new PredType(H5T_ALPHA_I8);
+    ALPHA_I8_  = new PredType(H5T_ALPHA_I8);
     ALPHA_I16_ = new PredType(H5T_ALPHA_I16);
     ALPHA_I32_ = new PredType(H5T_ALPHA_I32);
     ALPHA_I64_ = new PredType(H5T_ALPHA_I64);
-    ALPHA_U8_ = new PredType(H5T_ALPHA_U8);
+    ALPHA_U8_  = new PredType(H5T_ALPHA_U8);
     ALPHA_U16_ = new PredType(H5T_ALPHA_U16);
     ALPHA_U32_ = new PredType(H5T_ALPHA_U32);
     ALPHA_U64_ = new PredType(H5T_ALPHA_U64);
-    ALPHA_B8_ = new PredType(H5T_ALPHA_B8);
+    ALPHA_B8_  = new PredType(H5T_ALPHA_B8);
     ALPHA_B16_ = new PredType(H5T_ALPHA_B16);
     ALPHA_B32_ = new PredType(H5T_ALPHA_B32);
     ALPHA_B64_ = new PredType(H5T_ALPHA_B64);
     ALPHA_F32_ = new PredType(H5T_ALPHA_F32);
     ALPHA_F64_ = new PredType(H5T_ALPHA_F64);
 
-    MIPS_I8_ = new PredType(H5T_MIPS_I8);
+    MIPS_I8_  = new PredType(H5T_MIPS_I8);
     MIPS_I16_ = new PredType(H5T_MIPS_I16);
     MIPS_I32_ = new PredType(H5T_MIPS_I32);
     MIPS_I64_ = new PredType(H5T_MIPS_I64);
-    MIPS_U8_ = new PredType(H5T_MIPS_U8);
+    MIPS_U8_  = new PredType(H5T_MIPS_U8);
     MIPS_U16_ = new PredType(H5T_MIPS_U16);
     MIPS_U32_ = new PredType(H5T_MIPS_U32);
     MIPS_U64_ = new PredType(H5T_MIPS_U64);
-    MIPS_B8_ = new PredType(H5T_MIPS_B8);
+    MIPS_B8_  = new PredType(H5T_MIPS_B8);
     MIPS_B16_ = new PredType(H5T_MIPS_B16);
     MIPS_B32_ = new PredType(H5T_MIPS_B32);
     MIPS_B64_ = new PredType(H5T_MIPS_B64);
     MIPS_F32_ = new PredType(H5T_MIPS_F32);
     MIPS_F64_ = new PredType(H5T_MIPS_F64);
 
-    NATIVE_CHAR_ = new PredType(H5T_NATIVE_CHAR);
-    NATIVE_INT_ = new PredType(H5T_NATIVE_INT);
-    NATIVE_FLOAT_ = new PredType(H5T_NATIVE_FLOAT);
-    NATIVE_SCHAR_ = new PredType(H5T_NATIVE_SCHAR);
-    NATIVE_UCHAR_ = new PredType(H5T_NATIVE_UCHAR);
-    NATIVE_SHORT_ = new PredType(H5T_NATIVE_SHORT);
-    NATIVE_USHORT_ = new PredType(H5T_NATIVE_USHORT);
-    NATIVE_UINT_ = new PredType(H5T_NATIVE_UINT);
-    NATIVE_LONG_ = new PredType(H5T_NATIVE_LONG);
-    NATIVE_ULONG_ = new PredType(H5T_NATIVE_ULONG);
-    NATIVE_LLONG_ = new PredType(H5T_NATIVE_LLONG);
-    NATIVE_ULLONG_ = new PredType(H5T_NATIVE_ULLONG);
-    NATIVE_DOUBLE_ = new PredType(H5T_NATIVE_DOUBLE);
-#if H5_SIZEOF_LONG_DOUBLE !=0
+    NATIVE_CHAR_    = new PredType(H5T_NATIVE_CHAR);
+    NATIVE_INT_     = new PredType(H5T_NATIVE_INT);
+    NATIVE_FLOAT_   = new PredType(H5T_NATIVE_FLOAT);
+    NATIVE_SCHAR_   = new PredType(H5T_NATIVE_SCHAR);
+    NATIVE_UCHAR_   = new PredType(H5T_NATIVE_UCHAR);
+    NATIVE_SHORT_   = new PredType(H5T_NATIVE_SHORT);
+    NATIVE_USHORT_  = new PredType(H5T_NATIVE_USHORT);
+    NATIVE_UINT_    = new PredType(H5T_NATIVE_UINT);
+    NATIVE_LONG_    = new PredType(H5T_NATIVE_LONG);
+    NATIVE_ULONG_   = new PredType(H5T_NATIVE_ULONG);
+    NATIVE_LLONG_   = new PredType(H5T_NATIVE_LLONG);
+    NATIVE_ULLONG_  = new PredType(H5T_NATIVE_ULLONG);
+    NATIVE_DOUBLE_  = new PredType(H5T_NATIVE_DOUBLE);
     NATIVE_LDOUBLE_ = new PredType(H5T_NATIVE_LDOUBLE);
-#endif
-    NATIVE_B8_ = new PredType(H5T_NATIVE_B8);
-    NATIVE_B16_ = new PredType(H5T_NATIVE_B16);
-    NATIVE_B32_ = new PredType(H5T_NATIVE_B32);
-    NATIVE_B64_ = new PredType(H5T_NATIVE_B64);
-    NATIVE_OPAQUE_ = new PredType(H5T_NATIVE_OPAQUE);
-    NATIVE_HSIZE_ = new PredType(H5T_NATIVE_HSIZE);
-    NATIVE_HSSIZE_ = new PredType(H5T_NATIVE_HSSIZE);
-    NATIVE_HERR_ = new PredType(H5T_NATIVE_HERR);
-    NATIVE_HBOOL_ = new PredType(H5T_NATIVE_HBOOL);
-
-    NATIVE_INT8_ = new PredType(H5T_NATIVE_INT8);
-    NATIVE_UINT8_ = new PredType(H5T_NATIVE_UINT8);
-    NATIVE_INT16_ = new PredType(H5T_NATIVE_INT16);
+    NATIVE_B8_      = new PredType(H5T_NATIVE_B8);
+    NATIVE_B16_     = new PredType(H5T_NATIVE_B16);
+    NATIVE_B32_     = new PredType(H5T_NATIVE_B32);
+    NATIVE_B64_     = new PredType(H5T_NATIVE_B64);
+    NATIVE_OPAQUE_  = new PredType(H5T_NATIVE_OPAQUE);
+    NATIVE_HSIZE_   = new PredType(H5T_NATIVE_HSIZE);
+    NATIVE_HSSIZE_  = new PredType(H5T_NATIVE_HSSIZE);
+    NATIVE_HERR_    = new PredType(H5T_NATIVE_HERR);
+    NATIVE_HBOOL_   = new PredType(H5T_NATIVE_HBOOL);
+
+    NATIVE_INT8_   = new PredType(H5T_NATIVE_INT8);
+    NATIVE_UINT8_  = new PredType(H5T_NATIVE_UINT8);
+    NATIVE_INT16_  = new PredType(H5T_NATIVE_INT16);
     NATIVE_UINT16_ = new PredType(H5T_NATIVE_UINT16);
-    NATIVE_INT32_ = new PredType(H5T_NATIVE_INT32);
+    NATIVE_INT32_  = new PredType(H5T_NATIVE_INT32);
     NATIVE_UINT32_ = new PredType(H5T_NATIVE_UINT32);
-    NATIVE_INT64_ = new PredType(H5T_NATIVE_INT64);
+    NATIVE_INT64_  = new PredType(H5T_NATIVE_INT64);
     NATIVE_UINT64_ = new PredType(H5T_NATIVE_UINT64);
 
-// LEAST types
-#if H5_SIZEOF_INT_LEAST8_T != 0
-    NATIVE_INT_LEAST8_ = new PredType(H5T_NATIVE_INT_LEAST8);
-#endif /* H5_SIZEOF_INT_LEAST8_T */
-#if H5_SIZEOF_UINT_LEAST8_T != 0
+    // LEAST types
+    NATIVE_INT_LEAST8_  = new PredType(H5T_NATIVE_INT_LEAST8);
     NATIVE_UINT_LEAST8_ = new PredType(H5T_NATIVE_UINT_LEAST8);
-#endif /* H5_SIZEOF_UINT_LEAST8_T */
 
-#if H5_SIZEOF_INT_LEAST16_T != 0
-    NATIVE_INT_LEAST16_ = new PredType(H5T_NATIVE_INT_LEAST16);
-#endif /* H5_SIZEOF_INT_LEAST16_T */
-#if H5_SIZEOF_UINT_LEAST16_T != 0
+    NATIVE_INT_LEAST16_  = new PredType(H5T_NATIVE_INT_LEAST16);
     NATIVE_UINT_LEAST16_ = new PredType(H5T_NATIVE_UINT_LEAST16);
-#endif /* H5_SIZEOF_UINT_LEAST16_T */
 
-#if H5_SIZEOF_INT_LEAST32_T != 0
-    NATIVE_INT_LEAST32_ = new PredType(H5T_NATIVE_INT_LEAST32);
-#endif /* H5_SIZEOF_INT_LEAST32_T */
-#if H5_SIZEOF_UINT_LEAST32_T != 0
+    NATIVE_INT_LEAST32_  = new PredType(H5T_NATIVE_INT_LEAST32);
     NATIVE_UINT_LEAST32_ = new PredType(H5T_NATIVE_UINT_LEAST32);
-#endif /* H5_SIZEOF_UINT_LEAST32_T */
 
-#if H5_SIZEOF_INT_LEAST64_T != 0
-    NATIVE_INT_LEAST64_ = new PredType(H5T_NATIVE_INT_LEAST64);
-#endif /* H5_SIZEOF_INT_LEAST64_T */
-#if H5_SIZEOF_UINT_LEAST64_T != 0
+    NATIVE_INT_LEAST64_  = new PredType(H5T_NATIVE_INT_LEAST64);
     NATIVE_UINT_LEAST64_ = new PredType(H5T_NATIVE_UINT_LEAST64);
-#endif /* H5_SIZEOF_UINT_LEAST64_T */
 
-// FAST types
-#if H5_SIZEOF_INT_FAST8_T != 0
-    NATIVE_INT_FAST8_ = new PredType(H5T_NATIVE_INT_FAST8);
-#endif /* H5_SIZEOF_INT_FAST8_T */
-#if H5_SIZEOF_UINT_FAST8_T != 0
+    // FAST types
+    NATIVE_INT_FAST8_  = new PredType(H5T_NATIVE_INT_FAST8);
     NATIVE_UINT_FAST8_ = new PredType(H5T_NATIVE_UINT_FAST8);
-#endif /* H5_SIZEOF_UINT_FAST8_T */
 
-#if H5_SIZEOF_INT_FAST16_T != 0
-    NATIVE_INT_FAST16_ = new PredType(H5T_NATIVE_INT_FAST16);
-#endif /* H5_SIZEOF_INT_FAST16_T */
-#if H5_SIZEOF_UINT_FAST16_T != 0
+    NATIVE_INT_FAST16_  = new PredType(H5T_NATIVE_INT_FAST16);
     NATIVE_UINT_FAST16_ = new PredType(H5T_NATIVE_UINT_FAST16);
-#endif /* H5_SIZEOF_UINT_FAST16_T */
 
-#if H5_SIZEOF_INT_FAST32_T != 0
-    NATIVE_INT_FAST32_ = new PredType(H5T_NATIVE_INT_FAST32);
-#endif /* H5_SIZEOF_INT_FAST32_T */
-#if H5_SIZEOF_UINT_FAST32_T != 0
+    NATIVE_INT_FAST32_  = new PredType(H5T_NATIVE_INT_FAST32);
     NATIVE_UINT_FAST32_ = new PredType(H5T_NATIVE_UINT_FAST32);
-#endif /* H5_SIZEOF_UINT_FAST32_T */
 
-#if H5_SIZEOF_INT_FAST64_T != 0
-    NATIVE_INT_FAST64_ = new PredType(H5T_NATIVE_INT_FAST64);
-#endif /* H5_SIZEOF_INT_FAST64_T */
-#if H5_SIZEOF_UINT_FAST64_T != 0
+    NATIVE_INT_FAST64_  = new PredType(H5T_NATIVE_INT_FAST64);
     NATIVE_UINT_FAST64_ = new PredType(H5T_NATIVE_UINT_FAST64);
-#endif /* H5_SIZEOF_UINT_FAST64_T */
 
 } // makePredTypes
 
-
 //--------------------------------------------------------------------------
 // Function:    PredType::deleteConstants
 // Purpose      Deletes all PredType constant pointers.
 // Programmer   Binh-Minh Ribler - September 2015
 //--------------------------------------------------------------------------
-void PredType::deleteConstants()
+void
+PredType::deleteConstants()
 {
     delete STD_I8BE_;
     delete STD_I8LE_;
@@ -639,63 +593,31 @@ void PredType::deleteConstants()
     delete NATIVE_INT64_;
     delete NATIVE_UINT64_;
 
-// LEAST types
-#if H5_SIZEOF_INT_LEAST8_T != 0
+    // LEAST types
     delete NATIVE_INT_LEAST8_;
-#endif /* H5_SIZEOF_INT_LEAST8_T */
-#if H5_SIZEOF_UINT_LEAST8_T != 0
     delete NATIVE_UINT_LEAST8_;
-#endif /* H5_SIZEOF_UINT_LEAST8_T */
 
-#if H5_SIZEOF_INT_LEAST16_T != 0
     delete NATIVE_INT_LEAST16_;
-#endif /* H5_SIZEOF_INT_LEAST16_T */
-#if H5_SIZEOF_UINT_LEAST16_T != 0
     delete NATIVE_UINT_LEAST16_;
-#endif /* H5_SIZEOF_UINT_LEAST16_T */
 
-#if H5_SIZEOF_INT_LEAST32_T != 0
     delete NATIVE_INT_LEAST32_;
-#endif /* H5_SIZEOF_INT_LEAST32_T */
-#if H5_SIZEOF_UINT_LEAST32_T != 0
     delete NATIVE_UINT_LEAST32_;
-#endif /* H5_SIZEOF_UINT_LEAST32_T */
 
-#if H5_SIZEOF_INT_LEAST64_T != 0
     delete NATIVE_INT_LEAST64_;
-#endif /* H5_SIZEOF_INT_LEAST64_T */
-#if H5_SIZEOF_UINT_LEAST64_T != 0
     delete NATIVE_UINT_LEAST64_;
-#endif /* H5_SIZEOF_UINT_LEAST64_T */
 
-// FAST types
-#if H5_SIZEOF_INT_FAST8_T != 0
+    // FAST types
     delete NATIVE_INT_FAST8_;
-#endif /* H5_SIZEOF_INT_FAST8_T */
-#if H5_SIZEOF_UINT_FAST8_T != 0
     delete NATIVE_UINT_FAST8_;
-#endif /* H5_SIZEOF_UINT_FAST8_T */
 
-#if H5_SIZEOF_INT_FAST16_T != 0
     delete NATIVE_INT_FAST16_;
-#endif /* H5_SIZEOF_INT_FAST16_T */
-#if H5_SIZEOF_UINT_FAST16_T != 0
     delete NATIVE_UINT_FAST16_;
-#endif /* H5_SIZEOF_UINT_FAST16_T */
 
-#if H5_SIZEOF_INT_FAST32_T != 0
     delete NATIVE_INT_FAST32_;
-#endif /* H5_SIZEOF_INT_FAST32_T */
-#if H5_SIZEOF_UINT_FAST32_T != 0
     delete NATIVE_UINT_FAST32_;
-#endif /* H5_SIZEOF_UINT_FAST32_T */
 
-#if H5_SIZEOF_INT_FAST64_T != 0
     delete NATIVE_INT_FAST64_;
-#endif /* H5_SIZEOF_INT_FAST64_T */
-#if H5_SIZEOF_UINT_FAST64_T != 0
     delete NATIVE_UINT_FAST64_;
-#endif /* H5_SIZEOF_UINT_FAST64_T */
 
     delete PREDTYPE_CONST_;
     PREDTYPE_CONST_ = 0;
@@ -709,186 +631,154 @@ void PredType::deleteConstants()
 //  PredType constants.  Note that, there is a similar function to getPredTypes()
 //  in other classes, that have global constants, is called getConstant().
 
-const PredType& PredType::PREDTYPE_CONST = *PredType::getPredTypes();
-const PredType& PredType::STD_I8BE = *STD_I8BE_;
-const PredType& PredType::STD_I8LE = *STD_I8LE_;
-const PredType& PredType::STD_I16BE = *STD_I16BE_;
-const PredType& PredType::STD_I16LE = *STD_I16LE_;
-const PredType& PredType::STD_I32BE = *STD_I32BE_;
-const PredType& PredType::STD_I32LE = *STD_I32LE_;
-const PredType& PredType::STD_I64BE = *STD_I64BE_;
-const PredType& PredType::STD_I64LE = *STD_I64LE_;
-const PredType& PredType::STD_U8BE = *STD_U8BE_;
-const PredType& PredType::STD_U8LE = *STD_U8LE_;
-const PredType& PredType::STD_U16BE = *STD_U16BE_;
-const PredType& PredType::STD_U16LE = *STD_U16LE_;
-const PredType& PredType::STD_U32BE = *STD_U32BE_;
-const PredType& PredType::STD_U32LE = *STD_U32LE_;
-const PredType& PredType::STD_U64BE = *STD_U64BE_;
-const PredType& PredType::STD_U64LE = *STD_U64LE_;
-const PredType& PredType::STD_B8BE = *STD_B8BE_;
-const PredType& PredType::STD_B8LE = *STD_B8LE_;
-const PredType& PredType::STD_B16BE = *STD_B16BE_;
-const PredType& PredType::STD_B16LE = *STD_B16LE_;
-const PredType& PredType::STD_B32BE = *STD_B32BE_;
-const PredType& PredType::STD_B32LE = *STD_B32LE_;
-const PredType& PredType::STD_B64BE = *STD_B64BE_;
-const PredType& PredType::STD_B64LE = *STD_B64LE_;
-const PredType& PredType::STD_REF_OBJ = *STD_REF_OBJ_;
-const PredType& PredType::STD_REF_DSETREG = *STD_REF_DSETREG_;
-
-const PredType& PredType::C_S1 = *C_S1_;
-const PredType& PredType::FORTRAN_S1 = *FORTRAN_S1_;
-
-const PredType& PredType::IEEE_F32BE = *IEEE_F32BE_;
-const PredType& PredType::IEEE_F32LE = *IEEE_F32LE_;
-const PredType& PredType::IEEE_F64BE = *IEEE_F64BE_;
-const PredType& PredType::IEEE_F64LE = *IEEE_F64LE_;
-
-const PredType& PredType::UNIX_D32BE = *UNIX_D32BE_;
-const PredType& PredType::UNIX_D32LE = *UNIX_D32LE_;
-const PredType& PredType::UNIX_D64BE = *UNIX_D64BE_;
-const PredType& PredType::UNIX_D64LE = *UNIX_D64LE_;
-
-const PredType& PredType::INTEL_I8 = *INTEL_I8_;
-const PredType& PredType::INTEL_I16 = *INTEL_I16_;
-const PredType& PredType::INTEL_I32 = *INTEL_I32_;
-const PredType& PredType::INTEL_I64 = *INTEL_I64_;
-const PredType& PredType::INTEL_U8 = *INTEL_U8_;
-const PredType& PredType::INTEL_U16 = *INTEL_U16_;
-const PredType& PredType::INTEL_U32 = *INTEL_U32_;
-const PredType& PredType::INTEL_U64 = *INTEL_U64_;
-const PredType& PredType::INTEL_B8 = *INTEL_B8_;
-const PredType& PredType::INTEL_B16 = *INTEL_B16_;
-const PredType& PredType::INTEL_B32 = *INTEL_B32_;
-const PredType& PredType::INTEL_B64 = *INTEL_B64_;
-const PredType& PredType::INTEL_F32 = *INTEL_F32_;
-const PredType& PredType::INTEL_F64 = *INTEL_F64_;
-
-const PredType& PredType::ALPHA_I8 = *ALPHA_I8_;
-const PredType& PredType::ALPHA_I16 = *ALPHA_I16_;
-const PredType& PredType::ALPHA_I32 = *ALPHA_I32_;
-const PredType& PredType::ALPHA_I64 = *ALPHA_I64_;
-const PredType& PredType::ALPHA_U8 = *ALPHA_U8_;
-const PredType& PredType::ALPHA_U16 = *ALPHA_U16_;
-const PredType& PredType::ALPHA_U32 = *ALPHA_U32_;
-const PredType& PredType::ALPHA_U64 = *ALPHA_U64_;
-const PredType& PredType::ALPHA_B8 = *ALPHA_B8_;
-const PredType& PredType::ALPHA_B16 = *ALPHA_B16_;
-const PredType& PredType::ALPHA_B32 = *ALPHA_B32_;
-const PredType& PredType::ALPHA_B64 = *ALPHA_B64_;
-const PredType& PredType::ALPHA_F32 = *ALPHA_F32_;
-const PredType& PredType::ALPHA_F64 = *ALPHA_F64_;
-
-const PredType& PredType::MIPS_I8 = *MIPS_I8_;
-const PredType& PredType::MIPS_I16 = *MIPS_I16_;
-const PredType& PredType::MIPS_I32 = *MIPS_I32_;
-const PredType& PredType::MIPS_I64 = *MIPS_I64_;
-const PredType& PredType::MIPS_U8 = *MIPS_U8_;
-const PredType& PredType::MIPS_U16 = *MIPS_U16_;
-const PredType& PredType::MIPS_U32 = *MIPS_U32_;
-const PredType& PredType::MIPS_U64 = *MIPS_U64_;
-const PredType& PredType::MIPS_B8 = *MIPS_B8_;
-const PredType& PredType::MIPS_B16 = *MIPS_B16_;
-const PredType& PredType::MIPS_B32 = *MIPS_B32_;
-const PredType& PredType::MIPS_B64 = *MIPS_B64_;
-const PredType& PredType::MIPS_F32 = *MIPS_F32_;
-const PredType& PredType::MIPS_F64 = *MIPS_F64_;
-
-const PredType& PredType::NATIVE_CHAR = *NATIVE_CHAR_;
-const PredType& PredType::NATIVE_SCHAR = *NATIVE_SCHAR_;
-const PredType& PredType::NATIVE_UCHAR = *NATIVE_UCHAR_;
-const PredType& PredType::NATIVE_SHORT = *NATIVE_SHORT_;
-const PredType& PredType::NATIVE_USHORT = *NATIVE_USHORT_;
-const PredType& PredType::NATIVE_INT = *NATIVE_INT_;
-const PredType& PredType::NATIVE_UINT = *NATIVE_UINT_;
-const PredType& PredType::NATIVE_LONG = *NATIVE_LONG_;
-const PredType& PredType::NATIVE_ULONG = *NATIVE_ULONG_;
-const PredType& PredType::NATIVE_LLONG = *NATIVE_LLONG_;
-const PredType& PredType::NATIVE_ULLONG = *NATIVE_ULLONG_;
-const PredType& PredType::NATIVE_FLOAT = *NATIVE_FLOAT_;
-const PredType& PredType::NATIVE_DOUBLE = *NATIVE_DOUBLE_;
-const PredType& PredType::NATIVE_LDOUBLE = *NATIVE_LDOUBLE_;
-const PredType& PredType::NATIVE_B8 = *NATIVE_B8_;
-const PredType& PredType::NATIVE_B16 = *NATIVE_B16_;
-const PredType& PredType::NATIVE_B32 = *NATIVE_B32_;
-const PredType& PredType::NATIVE_B64 = *NATIVE_B64_;
-const PredType& PredType::NATIVE_OPAQUE = *NATIVE_OPAQUE_;
-const PredType& PredType::NATIVE_HSIZE = *NATIVE_HSIZE_;
-const PredType& PredType::NATIVE_HSSIZE = *NATIVE_HSSIZE_;
-const PredType& PredType::NATIVE_HERR = *NATIVE_HERR_;
-const PredType& PredType::NATIVE_HBOOL = *NATIVE_HBOOL_;
-
-const PredType& PredType::NATIVE_INT8 = *NATIVE_INT8_;
-const PredType& PredType::NATIVE_UINT8 = *NATIVE_UINT8_;
-const PredType& PredType::NATIVE_INT16 = *NATIVE_INT16_;
-const PredType& PredType::NATIVE_UINT16 = *NATIVE_UINT16_;
-const PredType& PredType::NATIVE_INT32 = *NATIVE_INT32_;
-const PredType& PredType::NATIVE_UINT32 = *NATIVE_UINT32_;
-const PredType& PredType::NATIVE_INT64 = *NATIVE_INT64_;
-const PredType& PredType::NATIVE_UINT64 = *NATIVE_UINT64_;
+const PredType &PredType::PREDTYPE_CONST  = *PredType::getPredTypes();
+const PredType &PredType::STD_I8BE        = *STD_I8BE_;
+const PredType &PredType::STD_I8LE        = *STD_I8LE_;
+const PredType &PredType::STD_I16BE       = *STD_I16BE_;
+const PredType &PredType::STD_I16LE       = *STD_I16LE_;
+const PredType &PredType::STD_I32BE       = *STD_I32BE_;
+const PredType &PredType::STD_I32LE       = *STD_I32LE_;
+const PredType &PredType::STD_I64BE       = *STD_I64BE_;
+const PredType &PredType::STD_I64LE       = *STD_I64LE_;
+const PredType &PredType::STD_U8BE        = *STD_U8BE_;
+const PredType &PredType::STD_U8LE        = *STD_U8LE_;
+const PredType &PredType::STD_U16BE       = *STD_U16BE_;
+const PredType &PredType::STD_U16LE       = *STD_U16LE_;
+const PredType &PredType::STD_U32BE       = *STD_U32BE_;
+const PredType &PredType::STD_U32LE       = *STD_U32LE_;
+const PredType &PredType::STD_U64BE       = *STD_U64BE_;
+const PredType &PredType::STD_U64LE       = *STD_U64LE_;
+const PredType &PredType::STD_B8BE        = *STD_B8BE_;
+const PredType &PredType::STD_B8LE        = *STD_B8LE_;
+const PredType &PredType::STD_B16BE       = *STD_B16BE_;
+const PredType &PredType::STD_B16LE       = *STD_B16LE_;
+const PredType &PredType::STD_B32BE       = *STD_B32BE_;
+const PredType &PredType::STD_B32LE       = *STD_B32LE_;
+const PredType &PredType::STD_B64BE       = *STD_B64BE_;
+const PredType &PredType::STD_B64LE       = *STD_B64LE_;
+const PredType &PredType::STD_REF_OBJ     = *STD_REF_OBJ_;
+const PredType &PredType::STD_REF_DSETREG = *STD_REF_DSETREG_;
+
+const PredType &PredType::C_S1       = *C_S1_;
+const PredType &PredType::FORTRAN_S1 = *FORTRAN_S1_;
+
+const PredType &PredType::IEEE_F32BE = *IEEE_F32BE_;
+const PredType &PredType::IEEE_F32LE = *IEEE_F32LE_;
+const PredType &PredType::IEEE_F64BE = *IEEE_F64BE_;
+const PredType &PredType::IEEE_F64LE = *IEEE_F64LE_;
+
+const PredType &PredType::UNIX_D32BE = *UNIX_D32BE_;
+const PredType &PredType::UNIX_D32LE = *UNIX_D32LE_;
+const PredType &PredType::UNIX_D64BE = *UNIX_D64BE_;
+const PredType &PredType::UNIX_D64LE = *UNIX_D64LE_;
+
+const PredType &PredType::INTEL_I8  = *INTEL_I8_;
+const PredType &PredType::INTEL_I16 = *INTEL_I16_;
+const PredType &PredType::INTEL_I32 = *INTEL_I32_;
+const PredType &PredType::INTEL_I64 = *INTEL_I64_;
+const PredType &PredType::INTEL_U8  = *INTEL_U8_;
+const PredType &PredType::INTEL_U16 = *INTEL_U16_;
+const PredType &PredType::INTEL_U32 = *INTEL_U32_;
+const PredType &PredType::INTEL_U64 = *INTEL_U64_;
+const PredType &PredType::INTEL_B8  = *INTEL_B8_;
+const PredType &PredType::INTEL_B16 = *INTEL_B16_;
+const PredType &PredType::INTEL_B32 = *INTEL_B32_;
+const PredType &PredType::INTEL_B64 = *INTEL_B64_;
+const PredType &PredType::INTEL_F32 = *INTEL_F32_;
+const PredType &PredType::INTEL_F64 = *INTEL_F64_;
+
+const PredType &PredType::ALPHA_I8  = *ALPHA_I8_;
+const PredType &PredType::ALPHA_I16 = *ALPHA_I16_;
+const PredType &PredType::ALPHA_I32 = *ALPHA_I32_;
+const PredType &PredType::ALPHA_I64 = *ALPHA_I64_;
+const PredType &PredType::ALPHA_U8  = *ALPHA_U8_;
+const PredType &PredType::ALPHA_U16 = *ALPHA_U16_;
+const PredType &PredType::ALPHA_U32 = *ALPHA_U32_;
+const PredType &PredType::ALPHA_U64 = *ALPHA_U64_;
+const PredType &PredType::ALPHA_B8  = *ALPHA_B8_;
+const PredType &PredType::ALPHA_B16 = *ALPHA_B16_;
+const PredType &PredType::ALPHA_B32 = *ALPHA_B32_;
+const PredType &PredType::ALPHA_B64 = *ALPHA_B64_;
+const PredType &PredType::ALPHA_F32 = *ALPHA_F32_;
+const PredType &PredType::ALPHA_F64 = *ALPHA_F64_;
+
+const PredType &PredType::MIPS_I8  = *MIPS_I8_;
+const PredType &PredType::MIPS_I16 = *MIPS_I16_;
+const PredType &PredType::MIPS_I32 = *MIPS_I32_;
+const PredType &PredType::MIPS_I64 = *MIPS_I64_;
+const PredType &PredType::MIPS_U8  = *MIPS_U8_;
+const PredType &PredType::MIPS_U16 = *MIPS_U16_;
+const PredType &PredType::MIPS_U32 = *MIPS_U32_;
+const PredType &PredType::MIPS_U64 = *MIPS_U64_;
+const PredType &PredType::MIPS_B8  = *MIPS_B8_;
+const PredType &PredType::MIPS_B16 = *MIPS_B16_;
+const PredType &PredType::MIPS_B32 = *MIPS_B32_;
+const PredType &PredType::MIPS_B64 = *MIPS_B64_;
+const PredType &PredType::MIPS_F32 = *MIPS_F32_;
+const PredType &PredType::MIPS_F64 = *MIPS_F64_;
+
+const PredType &PredType::NATIVE_CHAR    = *NATIVE_CHAR_;
+const PredType &PredType::NATIVE_SCHAR   = *NATIVE_SCHAR_;
+const PredType &PredType::NATIVE_UCHAR   = *NATIVE_UCHAR_;
+const PredType &PredType::NATIVE_SHORT   = *NATIVE_SHORT_;
+const PredType &PredType::NATIVE_USHORT  = *NATIVE_USHORT_;
+const PredType &PredType::NATIVE_INT     = *NATIVE_INT_;
+const PredType &PredType::NATIVE_UINT    = *NATIVE_UINT_;
+const PredType &PredType::NATIVE_LONG    = *NATIVE_LONG_;
+const PredType &PredType::NATIVE_ULONG   = *NATIVE_ULONG_;
+const PredType &PredType::NATIVE_LLONG   = *NATIVE_LLONG_;
+const PredType &PredType::NATIVE_ULLONG  = *NATIVE_ULLONG_;
+const PredType &PredType::NATIVE_FLOAT   = *NATIVE_FLOAT_;
+const PredType &PredType::NATIVE_DOUBLE  = *NATIVE_DOUBLE_;
+const PredType &PredType::NATIVE_LDOUBLE = *NATIVE_LDOUBLE_;
+const PredType &PredType::NATIVE_B8      = *NATIVE_B8_;
+const PredType &PredType::NATIVE_B16     = *NATIVE_B16_;
+const PredType &PredType::NATIVE_B32     = *NATIVE_B32_;
+const PredType &PredType::NATIVE_B64     = *NATIVE_B64_;
+const PredType &PredType::NATIVE_OPAQUE  = *NATIVE_OPAQUE_;
+const PredType &PredType::NATIVE_HSIZE   = *NATIVE_HSIZE_;
+const PredType &PredType::NATIVE_HSSIZE  = *NATIVE_HSSIZE_;
+const PredType &PredType::NATIVE_HERR    = *NATIVE_HERR_;
+const PredType &PredType::NATIVE_HBOOL   = *NATIVE_HBOOL_;
+
+const PredType &PredType::NATIVE_INT8   = *NATIVE_INT8_;
+const PredType &PredType::NATIVE_UINT8  = *NATIVE_UINT8_;
+const PredType &PredType::NATIVE_INT16  = *NATIVE_INT16_;
+const PredType &PredType::NATIVE_UINT16 = *NATIVE_UINT16_;
+const PredType &PredType::NATIVE_INT32  = *NATIVE_INT32_;
+const PredType &PredType::NATIVE_UINT32 = *NATIVE_UINT32_;
+const PredType &PredType::NATIVE_INT64  = *NATIVE_INT64_;
+const PredType &PredType::NATIVE_UINT64 = *NATIVE_UINT64_;
 
 // LEAST types
-#if H5_SIZEOF_INT_LEAST8_T != 0
-const PredType& PredType::NATIVE_INT_LEAST8 = *NATIVE_INT_LEAST8_;
-#endif /* H5_SIZEOF_INT_LEAST8_T */
-#if H5_SIZEOF_UINT_LEAST8_T != 0
-const PredType& PredType::NATIVE_UINT_LEAST8 = *NATIVE_UINT_LEAST8_;
-#endif /* H5_SIZEOF_UINT_LEAST8_T */
-
-#if H5_SIZEOF_INT_LEAST16_T != 0
-const PredType& PredType::NATIVE_INT_LEAST16 = *NATIVE_INT_LEAST16_;
-#endif /* H5_SIZEOF_INT_LEAST16_T */
-#if H5_SIZEOF_UINT_LEAST16_T != 0
-const PredType& PredType::NATIVE_UINT_LEAST16 = *NATIVE_UINT_LEAST16_;
-#endif /* H5_SIZEOF_UINT_LEAST16_T */
-
-#if H5_SIZEOF_INT_LEAST32_T != 0
-const PredType& PredType::NATIVE_INT_LEAST32 = *NATIVE_INT_LEAST32_;
-#endif /* H5_SIZEOF_INT_LEAST32_T */
-#if H5_SIZEOF_UINT_LEAST32_T != 0
-const PredType& PredType::NATIVE_UINT_LEAST32 = *NATIVE_UINT_LEAST32_;
-#endif /* H5_SIZEOF_UINT_LEAST32_T */
-
-#if H5_SIZEOF_INT_LEAST64_T != 0
-const PredType& PredType::NATIVE_INT_LEAST64 = *NATIVE_INT_LEAST64_;
-#endif /* H5_SIZEOF_INT_LEAST64_T */
-#if H5_SIZEOF_UINT_LEAST64_T != 0
-const PredType& PredType::NATIVE_UINT_LEAST64 = *NATIVE_UINT_LEAST64_;
-#endif /* H5_SIZEOF_UINT_LEAST64_T */
+const PredType &PredType::NATIVE_INT_LEAST8  = *NATIVE_INT_LEAST8_;
+const PredType &PredType::NATIVE_UINT_LEAST8 = *NATIVE_UINT_LEAST8_;
+
+const PredType &PredType::NATIVE_INT_LEAST16  = *NATIVE_INT_LEAST16_;
+const PredType &PredType::NATIVE_UINT_LEAST16 = *NATIVE_UINT_LEAST16_;
+
+const PredType &PredType::NATIVE_INT_LEAST32  = *NATIVE_INT_LEAST32_;
+const PredType &PredType::NATIVE_UINT_LEAST32 = *NATIVE_UINT_LEAST32_;
+
+const PredType &PredType::NATIVE_INT_LEAST64  = *NATIVE_INT_LEAST64_;
+const PredType &PredType::NATIVE_UINT_LEAST64 = *NATIVE_UINT_LEAST64_;
 
 // FAST types
-#if H5_SIZEOF_INT_FAST8_T != 0
-const PredType& PredType::NATIVE_INT_FAST8 = *NATIVE_INT_FAST8_;
-#endif /* H5_SIZEOF_INT_FAST8_T */
-#if H5_SIZEOF_UINT_FAST8_T != 0
-const PredType& PredType::NATIVE_UINT_FAST8 = *NATIVE_UINT_FAST8_;
-#endif /* H5_SIZEOF_UINT_FAST8_T */
-
-#if H5_SIZEOF_INT_FAST16_T != 0
-const PredType& PredType::NATIVE_INT_FAST16 = *NATIVE_INT_FAST16_;
-#endif /* H5_SIZEOF_INT_FAST16_T */
-#if H5_SIZEOF_UINT_FAST16_T != 0
-const PredType& PredType::NATIVE_UINT_FAST16 = *NATIVE_UINT_FAST16_;
-#endif /* H5_SIZEOF_UINT_FAST16_T */
-
-#if H5_SIZEOF_INT_FAST32_T != 0
-const PredType& PredType::NATIVE_INT_FAST32 = *NATIVE_INT_FAST32_;
-#endif /* H5_SIZEOF_INT_FAST32_T */
-#if H5_SIZEOF_UINT_FAST32_T != 0
-const PredType& PredType::NATIVE_UINT_FAST32 = *NATIVE_UINT_FAST32_;
-#endif /* H5_SIZEOF_UINT_FAST32_T */
-
-#if H5_SIZEOF_INT_FAST64_T != 0
-const PredType& PredType::NATIVE_INT_FAST64 = *NATIVE_INT_FAST64_;
-#endif /* H5_SIZEOF_INT_FAST64_T */
-#if H5_SIZEOF_UINT_FAST64_T != 0
-const PredType& PredType::NATIVE_UINT_FAST64 = *NATIVE_UINT_FAST64_;
-#endif /* H5_SIZEOF_UINT_FAST64_T */
+const PredType &PredType::NATIVE_INT_FAST8  = *NATIVE_INT_FAST8_;
+const PredType &PredType::NATIVE_UINT_FAST8 = *NATIVE_UINT_FAST8_;
+
+const PredType &PredType::NATIVE_INT_FAST16  = *NATIVE_INT_FAST16_;
+const PredType &PredType::NATIVE_UINT_FAST16 = *NATIVE_UINT_FAST16_;
+
+const PredType &PredType::NATIVE_INT_FAST32  = *NATIVE_INT_FAST32_;
+const PredType &PredType::NATIVE_UINT_FAST32 = *NATIVE_UINT_FAST32_;
+
+const PredType &PredType::NATIVE_INT_FAST64  = *NATIVE_INT_FAST64_;
+const PredType &PredType::NATIVE_UINT_FAST64 = *NATIVE_UINT_FAST64_;
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-} // end namespace
+} // namespace H5
 
 /***************************************************************************
                                 Design Note
@@ -900,7 +790,7 @@ September 2015:
         classes, such as PropList, PredType, DataSpace, etc...  Previously,
         these global constants were declared statically and the C++ library used
         a constant, called PredType::AtExit, to detect when all the global
-        contants are destroyed then close the C library (H5close).  This method
+        constants are destroyed then close the C library (H5close).  This method
         relied on the order of the constants being created and destroyed and
         that PredType constants be the last to be destroyed.  In September
         2015, it was recognized that the order in which the global constants were
@@ -1102,4 +992,3 @@ September 2015:
             using PropList's because of the class types and in favor of clarity.
 
 ****************************************************************************/
-