Merge remote-tracking branch 'origin/hdf5_1_12_1' into 1.12/master forhdf5-1_12_1

HDF5 1.12.1 release.

1 files changed, 10 insertions, 10 deletions

diff --git a/c++/src/H5File.h b/c++/src/H5File.h
index 9231d5f..6126eec 100644
--- a/c++/src/H5File.h
+++ b/c++/src/H5File.h
@@ -7,13 +7,13 @@
  * 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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5File_H
-#define __H5File_H
+#ifndef H5File_H
+#define H5File_H
 
 namespace H5 {
 
@@ -39,7 +39,7 @@ class H5_DLLCPP H5File : public Group {
                   const FileAccPropList &access_plist = FileAccPropList::DEFAULT);
 
     // Close this file.
-    virtual void close();
+    virtual void close() H5_OVERRIDE;
 
     // Gets a copy of the access property list of this file.
     FileAccPropList getAccessPlist() const;
@@ -96,16 +96,16 @@ class H5_DLLCPP H5File : public Group {
 
     ///\brief Returns this class name.
     virtual H5std_string
-    fromClass() const
+    fromClass() const H5_OVERRIDE
     {
         return ("H5File");
     }
 
     // Throw file exception.
-    virtual void throwException(const H5std_string &func_name, const H5std_string &msg) const;
+    virtual void throwException(const H5std_string &func_name, const H5std_string &msg) const H5_OVERRIDE;
 
     // For CommonFG to get the file id.
-    virtual hid_t getLocId() const;
+    virtual hid_t getLocId() const H5_OVERRIDE;
 
     // Default constructor
     H5File();
@@ -114,7 +114,7 @@ class H5_DLLCPP H5File : public Group {
     H5File(const H5File &original);
 
     // Gets the HDF5 file id.
-    virtual hid_t getId() const;
+    virtual hid_t getId() const H5_OVERRIDE;
 
     // H5File destructor.
     virtual ~H5File();
@@ -122,7 +122,7 @@ class H5_DLLCPP H5File : public Group {
   protected:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
     // Sets the HDF5 file id.
-    virtual void p_setId(const hid_t new_id);
+    virtual void p_setId(const hid_t new_id) H5_OVERRIDE;
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
   private:
@@ -136,4 +136,4 @@ class H5_DLLCPP H5File : public Group {
 }; // end of H5File
 } // namespace H5
 
-#endif // __H5File_H
+#endif // H5File_H