Merge pull request #593 in HDFFV/hdf5 from hdf5_1_8_19 to 1.8/masterhdf5-1_8_19

* commit 'c15238a38fdb3692466bc1218de4c5aeb420fdcc': (153 commits)
  Commit changes to release version strings in README.txt and RELEASE.txt from release.
  Put back link targets for dynamically loaded libraries in Makefile.ams that avoid linking with libhdf5 dependencies.  Some configurations failed unnecessarily to find and link with lz and lsz when these targets were removed.
  Update URL for obtaining source inINSTALL file.
  Disable building of libdynlib* dynamically loaded plugin test libraries on CYGWIN. Added known problem entry to RELEASE.txt. Set version for 1.8.19 release. Barbara updated contents of README.txt file.
  Moved libdynlib* plugin test libraries to noist_LT_LIBRARIES with added flag '-rpath /nowhere' to stop them being installed while keeping them from linking with libhdf5, etc. Incremented version to 1.8.19-pre1 and ran bin/release to create tar and zip files for testing.
  HDF5 1.8.19-pre1 released.
  Add RELEASE.txt entry for H5Dget_chunk_size.
  Remove test entries
  Ran bin/reconfigure after so number change.
  Update hl lib .so numbers:  new function was added. Update RELEASE.txt:  move H5DOread_chunks entry to new features, clarify entry for HDFFV-10051.
  Updated notes for test fixes and added bug fix for h5diff help text.
  Update h5vers and release scripts for 1.8.19 branch, set version to 1.8.19-pre1.
  Make script name consistent across product versions
  Update version to 1.8.19-pre1.
  Propagate .so number changes to Makefile.ins with bin/reconfigure.
  Add toolset option
  Update so version numbers according to the interface compatibility report.
  Update supported Platforms section. Remove empty sub-sections of New Features and Bugs Fixed sections.
  Add entries for HDFFV-10051 and HDFFV-9934 to RELEASE.txt.
  Correct spelling
  ...

1 files changed, 160 insertions, 163 deletions

diff --git a/c++/src/H5EnumType.cpp b/c++/src/H5EnumType.cpp
index 8677b47..0c26728 100644
--- a/c++/src/H5EnumType.cpp
+++ b/c++/src/H5EnumType.cpp
@@ -5,225 +5,222 @@
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * 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.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
 
+#include "H5private.h"                  // for HDmemset
 #include "H5Include.h"
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
+#include "H5LaccProp.h"
+#include "H5Location.h"
 #include "H5Object.h"
 #include "H5AbstractDs.h"
 #include "H5DxferProp.h"
 #include "H5DataSpace.h"
-#include "H5OcreatProp.h"
-#include "H5DcreatProp.h"
-#include "H5CommonFG.h"
 #include "H5DataType.h"
 #include "H5DataSet.h"
 #include "H5AtomType.h"
 #include "H5IntType.h"
 #include "H5EnumType.h"
-#include "H5private.h"			// for HDmemset
 
 namespace H5 {
 
 //--------------------------------------------------------------------------
-// Function:	EnumType default constructor
-///\brief	Default constructor: Creates a stub datatype
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType default constructor
+///\brief       Default constructor: Creates a stub datatype
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 EnumType::EnumType() : DataType() {}
 
 //--------------------------------------------------------------------------
-// Function:	EnumType overloaded constructor
-///\brief	Creates an EnumType object using the id of an existing datatype.
-///\param	existing_id - IN: Id of an existing datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType overloaded constructor
+///\brief       Creates an EnumType object using the id of an existing datatype.
+///\param       existing_id - IN: Id of an existing datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType::EnumType( const hid_t existing_id ) : DataType( existing_id ) {}
+EnumType::EnumType(const hid_t existing_id) : DataType(existing_id) {}
 
 //--------------------------------------------------------------------------
-// Function:	EnumType copy constructor
-///\brief	Copy constructor: makes a copy of the original EnumType object.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType copy constructor
+///\brief       Copy constructor: makes a copy of the original EnumType object.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType::EnumType( const EnumType& original ) : DataType( original ) {}
+EnumType::EnumType(const EnumType& original) : DataType(original) {}
 
 //--------------------------------------------------------------------------
-// Function:	EnumType overloaded constructor
-///\brief	Creates an empty enumeration datatype given a size, in bytes.
-///\param	size - IN: Number of bytes in the datatype to create
-///\exception	H5::DataTypeIException
+// Function:    EnumType overloaded constructor
+///\brief       Creates an empty enumeration datatype given a size, in bytes.
+///\param       size - IN: Number of bytes in the datatype to create
+///\exception   H5::DataTypeIException
 // Description
-// 		The DataType constructor calls the C API H5Tcreate to create
-// 		the enum datatype.
-// Programmer	Binh-Minh Ribler - 2000
+//              The DataType constructor calls the C API H5Tcreate to create
+//              the enum datatype.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType::EnumType( size_t size ) : DataType( H5T_ENUM, size ) {}
+EnumType::EnumType(size_t size) : DataType(H5T_ENUM, size) {}
 
 //--------------------------------------------------------------------------
-// Function:	EnumType overloaded constructor
-///\brief	Gets the enum datatype of the specified dataset.
-///\param	dataset - IN: Dataset that this enum datatype associates with
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType overloaded constructor
+///\brief       Gets the enum datatype of the specified dataset.
+///\param       dataset - IN: Dataset that this enum datatype associates with
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType::EnumType( const DataSet& dataset ) : DataType()
+EnumType::EnumType(const DataSet& dataset) : DataType()
 {
-   // Calls C function H5Dget_type to get the id of the datatype
-   id = H5Dget_type( dataset.getId() );
+    // Calls C function H5Dget_type to get the id of the datatype
+    id = H5Dget_type(dataset.getId());
 
-   // If the datatype id is not valid, throw an exception
-   if( id < 0 )
-   {
-      throw DataSetIException("EnumType constructor", "H5Dget_type failed");
-   }
+    // If the datatype id is not valid, throw an exception
+    if(id < 0)
+    {
+        throw DataSetIException("EnumType constructor", "H5Dget_type failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType overloaded constructor
-///\brief	Creates a new enum datatype based on an integer datatype.
-///\param	data_type - IN: Base datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType overloaded constructor
+///\brief       Creates a new enum datatype based on an integer datatype.
+///\param       data_type - IN: Base datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType::EnumType( const IntType& data_type ) : DataType()
+EnumType::EnumType(const IntType& data_type) : DataType()
 {
-   // Calls C function H5Tenum_create to get the id of the datatype
-   id = H5Tenum_create( data_type.getId() );
+    // Calls C function H5Tenum_create to get the id of the datatype
+    id = H5Tenum_create(data_type.getId());
 
-   // If the datatype id is not valid, throw an exception
-   if( id < 0 )
-   {
-      throw DataSetIException("EnumType constructor", "H5Tenum_create failed");
-   }
+    // If the datatype id is not valid, throw an exception
+    if(id < 0)
+    {
+        throw DataSetIException("EnumType constructor", "H5Tenum_create failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::insert
-///\brief	Inserts a new member to this enumeration datatype.
-///\param	name  - IN: Name of the new member
-///\param	value - IN: Pointer to the value of the new member
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType::insert
+///\brief       Inserts a new member to this enumeration datatype.
+///\param       name  - IN: Name of the new member
+///\param       value - IN: Pointer to the value of the new member
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void EnumType::insert( const char* name, void *value ) const
+void EnumType::insert(const char* name, void *value) const
 {
-   // Calls C routine H5Tenum_insert to insert the new enum datatype member.
-   herr_t ret_value = H5Tenum_insert( id, name, value );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("EnumType::insert", "H5Tenum_insert failed");
-   }
+    // Calls C routine H5Tenum_insert to insert the new enum datatype member.
+    herr_t ret_value = H5Tenum_insert(id, name, value);
+    if(ret_value < 0)
+    {
+        throw DataTypeIException("EnumType::insert", "H5Tenum_insert failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::insert
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function only in the type of
-///		argument \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType::insert
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in the type of
+///             argument \a name.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void EnumType::insert( const H5std_string& name, void *value ) const
+void EnumType::insert(const H5std_string& name, void *value) const
 {
-    insert( name.c_str(), value );
+    insert(name.c_str(), value);
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::nameOf
-///\brief	Returns the symbol name corresponding to a specified member
-///		of this enumeration datatype.
-///\param	value - IN: Pointer to the value of the enum datatype
-///\param	size  - IN: Size for the name
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType::nameOf
+///\brief       Returns the symbol name corresponding to a specified member
+///             of this enumeration datatype.
+///\param       value - IN: Pointer to the value of the enum datatype
+///\param       size  - IN: Size for the name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5std_string EnumType::nameOf( void *value, size_t size ) const
+H5std_string EnumType::nameOf(void *value, size_t size) const
 {
-   char* name_C = new char[size+1];  // temporary C-string for C API
-   HDmemset(name_C, 0, size+1); // clear buffer
+    char* name_C = new char[size+1];  // temporary C-string for C API
+    HDmemset(name_C, 0, size+1); // clear buffer
 
-   // Calls C routine H5Tenum_nameof to get the name of the specified enum type
-   herr_t ret_value = H5Tenum_nameof( id, value, name_C, size );
+    // Calls C routine H5Tenum_nameof to get the name of the specified enum type
+    herr_t ret_value = H5Tenum_nameof(id, value, name_C, size);
 
-   // If H5Tenum_nameof returns a negative value, raise an exception,
-   if( ret_value < 0 )
-   {
+    // If H5Tenum_nameof returns a negative value, raise an exception,
+    if(ret_value < 0)
+    {
       delete []name_C;
-      throw DataTypeIException("EnumType::nameOf", "H5Tenum_nameof failed");
-   }
-   // otherwise, create the string to hold the datatype name and return it
-   H5std_string name(name_C);
-   delete []name_C;
-   return( name );
+        throw DataTypeIException("EnumType::nameOf", "H5Tenum_nameof failed");
+    }
+    // otherwise, create the string to hold the datatype name and return it
+    H5std_string name(name_C);
+    delete []name_C;
+    return(name);
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::valueOf
-///\brief	Retrieves the value corresponding to a member of this
-///		enumeration datatype, given the member's name.
-///\param	name  -  IN: Name of the queried member
-///\param	value - OUT: Pointer to the retrieved value
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType::valueOf
+///\brief       Retrieves the value corresponding to a member of this
+///             enumeration datatype, given the member's name.
+///\param       name  -  IN: Name of the queried member
+///\param       value - OUT: Pointer to the retrieved value
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void EnumType::valueOf( const char* name, void *value ) const
+void EnumType::valueOf(const char* name, void *value) const
 {
    // Calls C routine H5Tenum_valueof to get the enum datatype value
-   herr_t ret_value = H5Tenum_valueof( id, name, value );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("EnumType::valueOf", "H5Tenum_valueof failed");
-   }
+    herr_t ret_value = H5Tenum_valueof(id, name, value);
+    if(ret_value < 0)
+    {
+        throw DataTypeIException("EnumType::valueOf", "H5Tenum_valueof failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::valueOf
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function only in the type of
-///		argument \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType::valueOf
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in the type of
+///             argument \a name.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void EnumType::valueOf( const H5std_string& name, void *value ) const
+void EnumType::valueOf(const H5std_string& name, void *value) const
 {
-    valueOf( name.c_str(), value );
+    valueOf(name.c_str(), value);
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::getMemberIndex
-///\brief	Returns the index of a member in this enumeration datatype.
-///\param	name - IN: Name of the queried member
-///\return	Index of the member if it exists.  Index will have the value
-///		between 0 and \c N-1, where \c N is the value returned by the
-///		member function \c EnumType::getNmembers.
-///\exception	H5::DataTypeIException
+// Function:    EnumType::getMemberIndex
+///\brief       Returns the index of a member in this enumeration datatype.
+///\param       name - IN: Name of the queried member
+///\return      Index of the member if it exists.  Index will have the value
+///             between 0 and \c N-1, where \c N is the value returned by the
+///             member function \c EnumType::getNmembers.
+///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - May 16, 2002
 //--------------------------------------------------------------------------
 int EnumType::getMemberIndex(const char *name) const
 {
-   int member_index = H5Tget_member_index(id, name);
-   if( member_index < 0 )
-   {
-      throw DataTypeIException("EnumType::getMemberIndex",
+    int member_index = H5Tget_member_index(id, name);
+    if(member_index < 0)
+    {
+        throw DataTypeIException("EnumType::getMemberIndex",
                 "H5Tget_member_index returns negative value");
-   }
-   return( member_index );
+    }
+    return(member_index);
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::getMemberIndex
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function only in the type of
-///		argument \a name.
+// Function:    EnumType::getMemberIndex
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in the type of
+///             argument \a name.
 // Programmer   Binh-Minh Ribler - May 16, 2002
 //--------------------------------------------------------------------------
 int EnumType::getMemberIndex(const H5std_string& name) const
@@ -232,46 +229,46 @@ int EnumType::getMemberIndex(const H5std_string& name) const
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::getNmembers
-///\brief	Returns the number of members in this enumeration datatype.
-///\return	Number of members
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - May, 2004
+// Function:    EnumType::getNmembers
+///\brief       Returns the number of members in this enumeration datatype.
+///\return      Number of members
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - May, 2004
 //--------------------------------------------------------------------------
 int EnumType::getNmembers() const
 {
-   int num_members = H5Tget_nmembers( id );
-   if( num_members < 0 )
-   {
-      throw DataTypeIException("EnumType::getNmembers",
+    int num_members = H5Tget_nmembers(id);
+    if(num_members < 0)
+    {
+        throw DataTypeIException("EnumType::getNmembers",
                 "H5Tget_nmembers returns negative number of members");
-   }
-   return( num_members );
+    }
+    return(num_members);
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::getMemberValue
-///\brief	Retrieves the value of a member in this enumeration datatype,
-///		given the member's index.
-///\param	memb_no - IN: Index of the queried member
-///\param	value   - OUT: Pointer to the retrieved value
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType::getMemberValue
+///\brief       Retrieves the value of a member in this enumeration datatype,
+///             given the member's index.
+///\param       memb_no - IN: Index of the queried member
+///\param       value   - OUT: Pointer to the retrieved value
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void EnumType::getMemberValue( unsigned memb_no, void *value ) const
+void EnumType::getMemberValue(unsigned memb_no, void *value) const
 {
-   // Call C routine H5Tget_member_value to get the datatype member's value
-   hid_t ret_value = H5Tget_member_value( id, memb_no, value );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("EnumType::getMemberValue", "H5Tget_member_value failed");
-   }
+    // Call C routine H5Tget_member_value to get the datatype member's value
+    hid_t ret_value = H5Tget_member_value(id, memb_no, value);
+    if(ret_value < 0)
+    {
+        throw DataTypeIException("EnumType::getMemberValue", "H5Tget_member_value failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType destructor
-///\brief	Properly terminates access to this enum datatype.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType destructor
+///\brief       Properly terminates access to this enum datatype.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 EnumType::~EnumType() {}