OESS-29 Fix shared MPI builds, more HD prefix

1 files changed, 206 insertions, 206 deletions

diff --git a/src/H5Epubgen.h b/src/H5Epubgen.h
index 17659b1..d7694a0 100644
--- a/src/H5Epubgen.h
+++ b/src/H5Epubgen.h
@@ -26,73 +26,133 @@ extern "C" {
 /* Major error codes */
 /*********************/
 
+#define H5E_IO               (H5OPEN H5E_IO_g)
+#define H5E_SOHM             (H5OPEN H5E_SOHM_g)
 #define H5E_ATTR             (H5OPEN H5E_ATTR_g)
-#define H5E_NONE_MAJOR       (H5OPEN H5E_NONE_MAJOR_g)
-#define H5E_PLINE            (H5OPEN H5E_PLINE_g)
-#define H5E_FSPACE           (H5OPEN H5E_FSPACE_g)
-#define H5E_RS               (H5OPEN H5E_RS_g)
-#define H5E_DATATYPE         (H5OPEN H5E_DATATYPE_g)
-#define H5E_FILE             (H5OPEN H5E_FILE_g)
+#define H5E_PLIST            (H5OPEN H5E_PLIST_g)
+#define H5E_FUNC             (H5OPEN H5E_FUNC_g)
+#define H5E_ERROR            (H5OPEN H5E_ERROR_g)
+#define H5E_STORAGE          (H5OPEN H5E_STORAGE_g)
+#define H5E_OHDR             (H5OPEN H5E_OHDR_g)
 #define H5E_PLUGIN           (H5OPEN H5E_PLUGIN_g)
+#define H5E_TST              (H5OPEN H5E_TST_g)
 #define H5E_DATASET          (H5OPEN H5E_DATASET_g)
-#define H5E_OHDR             (H5OPEN H5E_OHDR_g)
+#define H5E_BTREE            (H5OPEN H5E_BTREE_g)
 #define H5E_SLIST            (H5OPEN H5E_SLIST_g)
-#define H5E_LINK             (H5OPEN H5E_LINK_g)
-#define H5E_RESOURCE         (H5OPEN H5E_RESOURCE_g)
-#define H5E_ERROR            (H5OPEN H5E_ERROR_g)
-#define H5E_INTERNAL         (H5OPEN H5E_INTERNAL_g)
-#define H5E_TST              (H5OPEN H5E_TST_g)
+#define H5E_VFL              (H5OPEN H5E_VFL_g)
+#define H5E_DATASPACE        (H5OPEN H5E_DATASPACE_g)
+#define H5E_DATATYPE         (H5OPEN H5E_DATATYPE_g)
+#define H5E_RS               (H5OPEN H5E_RS_g)
+#define H5E_ATOM             (H5OPEN H5E_ATOM_g)
 #define H5E_CACHE            (H5OPEN H5E_CACHE_g)
-#define H5E_EFL              (H5OPEN H5E_EFL_g)
+#define H5E_INTERNAL         (H5OPEN H5E_INTERNAL_g)
 #define H5E_SYM              (H5OPEN H5E_SYM_g)
+#define H5E_LINK             (H5OPEN H5E_LINK_g)
 #define H5E_HEAP             (H5OPEN H5E_HEAP_g)
+#define H5E_PLINE            (H5OPEN H5E_PLINE_g)
+#define H5E_EFL              (H5OPEN H5E_EFL_g)
 #define H5E_REFERENCE        (H5OPEN H5E_REFERENCE_g)
-#define H5E_FUNC             (H5OPEN H5E_FUNC_g)
-#define H5E_STORAGE          (H5OPEN H5E_STORAGE_g)
-#define H5E_VFL              (H5OPEN H5E_VFL_g)
-#define H5E_SOHM             (H5OPEN H5E_SOHM_g)
-#define H5E_ATOM             (H5OPEN H5E_ATOM_g)
+#define H5E_FILE             (H5OPEN H5E_FILE_g)
+#define H5E_RESOURCE         (H5OPEN H5E_RESOURCE_g)
+#define H5E_NONE_MAJOR       (H5OPEN H5E_NONE_MAJOR_g)
 #define H5E_ARGS             (H5OPEN H5E_ARGS_g)
-#define H5E_BTREE            (H5OPEN H5E_BTREE_g)
-#define H5E_IO               (H5OPEN H5E_IO_g)
-#define H5E_PLIST            (H5OPEN H5E_PLIST_g)
-#define H5E_DATASPACE        (H5OPEN H5E_DATASPACE_g)
+#define H5E_FSPACE           (H5OPEN H5E_FSPACE_g)
+H5_DLLVAR hid_t H5E_IO_g;            /* Low-level I/O */
+H5_DLLVAR hid_t H5E_SOHM_g;          /* Shared Object Header Messages */
 H5_DLLVAR hid_t H5E_ATTR_g;          /* Attribute */
-H5_DLLVAR hid_t H5E_NONE_MAJOR_g;    /* No error */
-H5_DLLVAR hid_t H5E_PLINE_g;         /* Data filters */
-H5_DLLVAR hid_t H5E_FSPACE_g;        /* Free Space Manager */
-H5_DLLVAR hid_t H5E_RS_g;            /* Reference Counted Strings */
-H5_DLLVAR hid_t H5E_DATATYPE_g;      /* Datatype */
-H5_DLLVAR hid_t H5E_FILE_g;          /* File accessibilty */
+H5_DLLVAR hid_t H5E_PLIST_g;         /* Property lists */
+H5_DLLVAR hid_t H5E_FUNC_g;          /* Function entry/exit */
+H5_DLLVAR hid_t H5E_ERROR_g;         /* Error API */
+H5_DLLVAR hid_t H5E_STORAGE_g;       /* Data storage */
+H5_DLLVAR hid_t H5E_OHDR_g;          /* Object header */
 H5_DLLVAR hid_t H5E_PLUGIN_g;        /* Plugin for dynamically loaded library */
+H5_DLLVAR hid_t H5E_TST_g;           /* Ternary Search Trees */
 H5_DLLVAR hid_t H5E_DATASET_g;       /* Dataset */
-H5_DLLVAR hid_t H5E_OHDR_g;          /* Object header */
+H5_DLLVAR hid_t H5E_BTREE_g;         /* B-Tree node */
 H5_DLLVAR hid_t H5E_SLIST_g;         /* Skip Lists */
-H5_DLLVAR hid_t H5E_LINK_g;          /* Links */
-H5_DLLVAR hid_t H5E_RESOURCE_g;      /* Resource unavailable */
-H5_DLLVAR hid_t H5E_ERROR_g;         /* Error API */
-H5_DLLVAR hid_t H5E_INTERNAL_g;      /* Internal error (too specific to document in detail) */
-H5_DLLVAR hid_t H5E_TST_g;           /* Ternary Search Trees */
+H5_DLLVAR hid_t H5E_VFL_g;           /* Virtual File Layer */
+H5_DLLVAR hid_t H5E_DATASPACE_g;     /* Dataspace */
+H5_DLLVAR hid_t H5E_DATATYPE_g;      /* Datatype */
+H5_DLLVAR hid_t H5E_RS_g;            /* Reference Counted Strings */
+H5_DLLVAR hid_t H5E_ATOM_g;          /* Object atom */
 H5_DLLVAR hid_t H5E_CACHE_g;         /* Object cache */
-H5_DLLVAR hid_t H5E_EFL_g;           /* External file list */
+H5_DLLVAR hid_t H5E_INTERNAL_g;      /* Internal error (too specific to document in detail) */
 H5_DLLVAR hid_t H5E_SYM_g;           /* Symbol table */
+H5_DLLVAR hid_t H5E_LINK_g;          /* Links */
 H5_DLLVAR hid_t H5E_HEAP_g;          /* Heap */
+H5_DLLVAR hid_t H5E_PLINE_g;         /* Data filters */
+H5_DLLVAR hid_t H5E_EFL_g;           /* External file list */
 H5_DLLVAR hid_t H5E_REFERENCE_g;     /* References */
-H5_DLLVAR hid_t H5E_FUNC_g;          /* Function entry/exit */
-H5_DLLVAR hid_t H5E_STORAGE_g;       /* Data storage */
-H5_DLLVAR hid_t H5E_VFL_g;           /* Virtual File Layer */
-H5_DLLVAR hid_t H5E_SOHM_g;          /* Shared Object Header Messages */
-H5_DLLVAR hid_t H5E_ATOM_g;          /* Object atom */
+H5_DLLVAR hid_t H5E_FILE_g;          /* File accessibilty */
+H5_DLLVAR hid_t H5E_RESOURCE_g;      /* Resource unavailable */
+H5_DLLVAR hid_t H5E_NONE_MAJOR_g;    /* No error */
 H5_DLLVAR hid_t H5E_ARGS_g;          /* Invalid arguments to routine */
-H5_DLLVAR hid_t H5E_BTREE_g;         /* B-Tree node */
-H5_DLLVAR hid_t H5E_IO_g;            /* Low-level I/O */
-H5_DLLVAR hid_t H5E_PLIST_g;         /* Property lists */
-H5_DLLVAR hid_t H5E_DATASPACE_g;     /* Dataspace */
+H5_DLLVAR hid_t H5E_FSPACE_g;        /* Free Space Manager */
 
 /*********************/
 /* Minor error codes */
 /*********************/
 
+/* Function entry/exit interface errors */
+#define H5E_CANTINIT         (H5OPEN H5E_CANTINIT_g)
+#define H5E_ALREADYINIT      (H5OPEN H5E_ALREADYINIT_g)
+#define H5E_CANTRELEASE      (H5OPEN H5E_CANTRELEASE_g)
+H5_DLLVAR hid_t H5E_CANTINIT_g;      /* Unable to initialize object */
+H5_DLLVAR hid_t H5E_ALREADYINIT_g;   /* Object already initialized */
+H5_DLLVAR hid_t H5E_CANTRELEASE_g;   /* Unable to release object */
+
+/* Link related errors */
+#define H5E_TRAVERSE         (H5OPEN H5E_TRAVERSE_g)
+#define H5E_NLINKS           (H5OPEN H5E_NLINKS_g)
+#define H5E_NOTREGISTERED    (H5OPEN H5E_NOTREGISTERED_g)
+#define H5E_CANTMOVE         (H5OPEN H5E_CANTMOVE_g)
+#define H5E_CANTSORT         (H5OPEN H5E_CANTSORT_g)
+H5_DLLVAR hid_t H5E_TRAVERSE_g;      /* Link traversal failure */
+H5_DLLVAR hid_t H5E_NLINKS_g;        /* Too many soft links in path */
+H5_DLLVAR hid_t H5E_NOTREGISTERED_g; /* Link class not registered */
+H5_DLLVAR hid_t H5E_CANTMOVE_g;      /* Can't move object */
+H5_DLLVAR hid_t H5E_CANTSORT_g;      /* Can't sort objects */
+
+/* Parallel MPI errors */
+#define H5E_MPI              (H5OPEN H5E_MPI_g)
+#define H5E_MPIERRSTR        (H5OPEN H5E_MPIERRSTR_g)
+#define H5E_CANTRECV         (H5OPEN H5E_CANTRECV_g)
+H5_DLLVAR hid_t H5E_MPI_g;           /* Some MPI function failed */
+H5_DLLVAR hid_t H5E_MPIERRSTR_g;     /* MPI Error String */
+H5_DLLVAR hid_t H5E_CANTRECV_g;      /* Can't receive data */
+
+/* Cache related errors */
+#define H5E_CANTFLUSH        (H5OPEN H5E_CANTFLUSH_g)
+#define H5E_CANTSERIALIZE    (H5OPEN H5E_CANTSERIALIZE_g)
+#define H5E_CANTLOAD         (H5OPEN H5E_CANTLOAD_g)
+#define H5E_PROTECT          (H5OPEN H5E_PROTECT_g)
+#define H5E_NOTCACHED        (H5OPEN H5E_NOTCACHED_g)
+#define H5E_SYSTEM           (H5OPEN H5E_SYSTEM_g)
+#define H5E_CANTINS          (H5OPEN H5E_CANTINS_g)
+#define H5E_CANTPROTECT      (H5OPEN H5E_CANTPROTECT_g)
+#define H5E_CANTUNPROTECT    (H5OPEN H5E_CANTUNPROTECT_g)
+#define H5E_CANTPIN          (H5OPEN H5E_CANTPIN_g)
+#define H5E_CANTUNPIN        (H5OPEN H5E_CANTUNPIN_g)
+#define H5E_CANTMARKDIRTY    (H5OPEN H5E_CANTMARKDIRTY_g)
+#define H5E_CANTDIRTY        (H5OPEN H5E_CANTDIRTY_g)
+#define H5E_CANTEXPUNGE      (H5OPEN H5E_CANTEXPUNGE_g)
+#define H5E_CANTRESIZE       (H5OPEN H5E_CANTRESIZE_g)
+H5_DLLVAR hid_t H5E_CANTFLUSH_g;     /* Unable to flush data from cache */
+H5_DLLVAR hid_t H5E_CANTSERIALIZE_g; /* Unable to serialize data from cache */
+H5_DLLVAR hid_t H5E_CANTLOAD_g;      /* Unable to load metadata into cache */
+H5_DLLVAR hid_t H5E_PROTECT_g;       /* Protected metadata error */
+H5_DLLVAR hid_t H5E_NOTCACHED_g;     /* Metadata not currently cached */
+H5_DLLVAR hid_t H5E_SYSTEM_g;        /* Internal error detected */
+H5_DLLVAR hid_t H5E_CANTINS_g;       /* Unable to insert metadata into cache */
+H5_DLLVAR hid_t H5E_CANTPROTECT_g;   /* Unable to protect metadata */
+H5_DLLVAR hid_t H5E_CANTUNPROTECT_g; /* Unable to unprotect metadata */
+H5_DLLVAR hid_t H5E_CANTPIN_g;       /* Unable to pin cache entry */
+H5_DLLVAR hid_t H5E_CANTUNPIN_g;     /* Unable to un-pin cache entry */
+H5_DLLVAR hid_t H5E_CANTMARKDIRTY_g; /* Unable to mark a pinned entry as dirty */
+H5_DLLVAR hid_t H5E_CANTDIRTY_g;     /* Unable to mark metadata as dirty */
+H5_DLLVAR hid_t H5E_CANTEXPUNGE_g;   /* Unable to expunge a metadata cache entry */
+H5_DLLVAR hid_t H5E_CANTRESIZE_g;    /* Unable to resize a metadata cache entry */
+
 /* Argument errors */
 #define H5E_UNINITIALIZED    (H5OPEN H5E_UNINITIALIZED_g)
 #define H5E_UNSUPPORTED      (H5OPEN H5E_UNSUPPORTED_g)
@@ -105,37 +165,9 @@ H5_DLLVAR hid_t H5E_BADTYPE_g;       /* Inappropriate type */
 H5_DLLVAR hid_t H5E_BADRANGE_g;      /* Out of range */
 H5_DLLVAR hid_t H5E_BADVALUE_g;      /* Bad value */
 
-/* Object atom related errors */
-#define H5E_BADATOM          (H5OPEN H5E_BADATOM_g)
-#define H5E_BADGROUP         (H5OPEN H5E_BADGROUP_g)
-#define H5E_CANTREGISTER     (H5OPEN H5E_CANTREGISTER_g)
-#define H5E_CANTINC          (H5OPEN H5E_CANTINC_g)
-#define H5E_CANTDEC          (H5OPEN H5E_CANTDEC_g)
-#define H5E_NOIDS            (H5OPEN H5E_NOIDS_g)
-H5_DLLVAR hid_t H5E_BADATOM_g;       /* Unable to find atom information (already closed?) */
-H5_DLLVAR hid_t H5E_BADGROUP_g;      /* Unable to find ID group information */
-H5_DLLVAR hid_t H5E_CANTREGISTER_g;  /* Unable to register new atom */
-H5_DLLVAR hid_t H5E_CANTINC_g;       /* Unable to increment reference count */
-H5_DLLVAR hid_t H5E_CANTDEC_g;       /* Unable to decrement reference count */
-H5_DLLVAR hid_t H5E_NOIDS_g;         /* Out of IDs for group */
-
-/* Function entry/exit interface errors */
-#define H5E_CANTINIT         (H5OPEN H5E_CANTINIT_g)
-#define H5E_ALREADYINIT      (H5OPEN H5E_ALREADYINIT_g)
-#define H5E_CANTRELEASE      (H5OPEN H5E_CANTRELEASE_g)
-H5_DLLVAR hid_t H5E_CANTINIT_g;      /* Unable to initialize object */
-H5_DLLVAR hid_t H5E_ALREADYINIT_g;   /* Object already initialized */
-H5_DLLVAR hid_t H5E_CANTRELEASE_g;   /* Unable to release object */
-
-/* Property list errors */
-#define H5E_CANTGET          (H5OPEN H5E_CANTGET_g)
-#define H5E_CANTSET          (H5OPEN H5E_CANTSET_g)
-#define H5E_DUPCLASS         (H5OPEN H5E_DUPCLASS_g)
-#define H5E_SETDISALLOWED    (H5OPEN H5E_SETDISALLOWED_g)
-H5_DLLVAR hid_t H5E_CANTGET_g;       /* Can't get value */
-H5_DLLVAR hid_t H5E_CANTSET_g;       /* Can't set value */
-H5_DLLVAR hid_t H5E_DUPCLASS_g;      /* Duplicate class name in parent class */
-H5_DLLVAR hid_t H5E_SETDISALLOWED_g; /* Disallowed operation */
+/* Plugin errors */
+#define H5E_OPENERROR        (H5OPEN H5E_OPENERROR_g)
+H5_DLLVAR hid_t H5E_OPENERROR_g;     /* Can't open directory or file */
 
 /* Generic low-level file I/O errors */
 #define H5E_SEEKERROR        (H5OPEN H5E_SEEKERROR_g)
@@ -151,6 +183,20 @@ H5_DLLVAR hid_t H5E_CLOSEERROR_g;    /* Close failed */
 H5_DLLVAR hid_t H5E_OVERFLOW_g;      /* Address overflowed */
 H5_DLLVAR hid_t H5E_FCNTL_g;         /* File control (fcntl) failed */
 
+/* Heap errors */
+#define H5E_CANTRESTORE      (H5OPEN H5E_CANTRESTORE_g)
+#define H5E_CANTCOMPUTE      (H5OPEN H5E_CANTCOMPUTE_g)
+#define H5E_CANTEXTEND       (H5OPEN H5E_CANTEXTEND_g)
+#define H5E_CANTATTACH       (H5OPEN H5E_CANTATTACH_g)
+#define H5E_CANTUPDATE       (H5OPEN H5E_CANTUPDATE_g)
+#define H5E_CANTOPERATE      (H5OPEN H5E_CANTOPERATE_g)
+H5_DLLVAR hid_t H5E_CANTRESTORE_g;   /* Can't restore condition */
+H5_DLLVAR hid_t H5E_CANTCOMPUTE_g;   /* Can't compute value */
+H5_DLLVAR hid_t H5E_CANTEXTEND_g;    /* Can't extend heap's space */
+H5_DLLVAR hid_t H5E_CANTATTACH_g;    /* Can't attach object */
+H5_DLLVAR hid_t H5E_CANTUPDATE_g;    /* Can't update object */
+H5_DLLVAR hid_t H5E_CANTOPERATE_g;   /* Can't operate on object */
+
 /* Resource errors */
 #define H5E_NOSPACE          (H5OPEN H5E_NOSPACE_g)
 #define H5E_CANTALLOC        (H5OPEN H5E_CANTALLOC_g)
@@ -173,33 +219,95 @@ H5_DLLVAR hid_t H5E_CANTGC_g;        /* Unable to garbage collect */
 H5_DLLVAR hid_t H5E_CANTGETSIZE_g;   /* Unable to compute size */
 H5_DLLVAR hid_t H5E_OBJOPEN_g;       /* Object is already open */
 
+/* I/O pipeline errors */
+#define H5E_NOFILTER         (H5OPEN H5E_NOFILTER_g)
+#define H5E_CALLBACK         (H5OPEN H5E_CALLBACK_g)
+#define H5E_CANAPPLY         (H5OPEN H5E_CANAPPLY_g)
+#define H5E_SETLOCAL         (H5OPEN H5E_SETLOCAL_g)
+#define H5E_NOENCODER        (H5OPEN H5E_NOENCODER_g)
+#define H5E_CANTFILTER       (H5OPEN H5E_CANTFILTER_g)
+H5_DLLVAR hid_t H5E_NOFILTER_g;      /* Requested filter is not available */
+H5_DLLVAR hid_t H5E_CALLBACK_g;      /* Callback failed */
+H5_DLLVAR hid_t H5E_CANAPPLY_g;      /* Error from filter 'can apply' callback */
+H5_DLLVAR hid_t H5E_SETLOCAL_g;      /* Error from filter 'set local' callback */
+H5_DLLVAR hid_t H5E_NOENCODER_g;     /* Filter present but encoding disabled */
+H5_DLLVAR hid_t H5E_CANTFILTER_g;    /* Filter operation failed */
+
+/* Dataspace errors */
+#define H5E_CANTCLIP         (H5OPEN H5E_CANTCLIP_g)
+#define H5E_CANTCOUNT        (H5OPEN H5E_CANTCOUNT_g)
+#define H5E_CANTSELECT       (H5OPEN H5E_CANTSELECT_g)
+#define H5E_CANTNEXT         (H5OPEN H5E_CANTNEXT_g)
+#define H5E_BADSELECT        (H5OPEN H5E_BADSELECT_g)
+#define H5E_CANTCOMPARE      (H5OPEN H5E_CANTCOMPARE_g)
+H5_DLLVAR hid_t H5E_CANTCLIP_g;      /* Can't clip hyperslab region */
+H5_DLLVAR hid_t H5E_CANTCOUNT_g;     /* Can't count elements */
+H5_DLLVAR hid_t H5E_CANTSELECT_g;    /* Can't select hyperslab */
+H5_DLLVAR hid_t H5E_CANTNEXT_g;      /* Can't move to next iterator location */
+H5_DLLVAR hid_t H5E_BADSELECT_g;     /* Invalid selection */
+H5_DLLVAR hid_t H5E_CANTCOMPARE_g;   /* Can't compare objects */
+
+/* Free space errors */
+#define H5E_CANTMERGE        (H5OPEN H5E_CANTMERGE_g)
+#define H5E_CANTREVIVE       (H5OPEN H5E_CANTREVIVE_g)
+#define H5E_CANTSHRINK       (H5OPEN H5E_CANTSHRINK_g)
+H5_DLLVAR hid_t H5E_CANTMERGE_g;     /* Can't merge objects */
+H5_DLLVAR hid_t H5E_CANTREVIVE_g;    /* Can't revive object */
+H5_DLLVAR hid_t H5E_CANTSHRINK_g;    /* Can't shrink container */
+
+/* Object header related errors */
+#define H5E_LINKCOUNT        (H5OPEN H5E_LINKCOUNT_g)
+#define H5E_VERSION          (H5OPEN H5E_VERSION_g)
+#define H5E_ALIGNMENT        (H5OPEN H5E_ALIGNMENT_g)
+#define H5E_BADMESG          (H5OPEN H5E_BADMESG_g)
+#define H5E_CANTDELETE       (H5OPEN H5E_CANTDELETE_g)
+#define H5E_BADITER          (H5OPEN H5E_BADITER_g)
+#define H5E_CANTPACK         (H5OPEN H5E_CANTPACK_g)
+#define H5E_CANTRESET        (H5OPEN H5E_CANTRESET_g)
+#define H5E_CANTRENAME       (H5OPEN H5E_CANTRENAME_g)
+H5_DLLVAR hid_t H5E_LINKCOUNT_g;     /* Bad object header link count */
+H5_DLLVAR hid_t H5E_VERSION_g;       /* Wrong version number */
+H5_DLLVAR hid_t H5E_ALIGNMENT_g;     /* Alignment error */
+H5_DLLVAR hid_t H5E_BADMESG_g;       /* Unrecognized message */
+H5_DLLVAR hid_t H5E_CANTDELETE_g;    /* Can't delete message */
+H5_DLLVAR hid_t H5E_BADITER_g;       /* Iteration failed */
+H5_DLLVAR hid_t H5E_CANTPACK_g;      /* Can't pack messages */
+H5_DLLVAR hid_t H5E_CANTRESET_g;     /* Can't reset object */
+H5_DLLVAR hid_t H5E_CANTRENAME_g;    /* Unable to rename object */
+
+/* System level errors */
+#define H5E_SYSERRSTR        (H5OPEN H5E_SYSERRSTR_g)
+H5_DLLVAR hid_t H5E_SYSERRSTR_g;     /* System error message */
+
 /* Datatype conversion errors */
 #define H5E_CANTCONVERT      (H5OPEN H5E_CANTCONVERT_g)
 #define H5E_BADSIZE          (H5OPEN H5E_BADSIZE_g)
 H5_DLLVAR hid_t H5E_CANTCONVERT_g;   /* Can't convert datatypes */
 H5_DLLVAR hid_t H5E_BADSIZE_g;       /* Bad size for object */
 
-/* Heap errors */
-#define H5E_CANTRESTORE      (H5OPEN H5E_CANTRESTORE_g)
-#define H5E_CANTCOMPUTE      (H5OPEN H5E_CANTCOMPUTE_g)
-#define H5E_CANTEXTEND       (H5OPEN H5E_CANTEXTEND_g)
-#define H5E_CANTATTACH       (H5OPEN H5E_CANTATTACH_g)
-#define H5E_CANTUPDATE       (H5OPEN H5E_CANTUPDATE_g)
-#define H5E_CANTOPERATE      (H5OPEN H5E_CANTOPERATE_g)
-H5_DLLVAR hid_t H5E_CANTRESTORE_g;   /* Can't restore condition */
-H5_DLLVAR hid_t H5E_CANTCOMPUTE_g;   /* Can't compute value */
-H5_DLLVAR hid_t H5E_CANTEXTEND_g;    /* Can't extend heap's space */
-H5_DLLVAR hid_t H5E_CANTATTACH_g;    /* Can't attach object */
-H5_DLLVAR hid_t H5E_CANTUPDATE_g;    /* Can't update object */
-H5_DLLVAR hid_t H5E_CANTOPERATE_g;   /* Can't operate on object */
+/* Object atom related errors */
+#define H5E_BADATOM          (H5OPEN H5E_BADATOM_g)
+#define H5E_BADGROUP         (H5OPEN H5E_BADGROUP_g)
+#define H5E_CANTREGISTER     (H5OPEN H5E_CANTREGISTER_g)
+#define H5E_CANTINC          (H5OPEN H5E_CANTINC_g)
+#define H5E_CANTDEC          (H5OPEN H5E_CANTDEC_g)
+#define H5E_NOIDS            (H5OPEN H5E_NOIDS_g)
+H5_DLLVAR hid_t H5E_BADATOM_g;       /* Unable to find atom information (already closed?) */
+H5_DLLVAR hid_t H5E_BADGROUP_g;      /* Unable to find ID group information */
+H5_DLLVAR hid_t H5E_CANTREGISTER_g;  /* Unable to register new atom */
+H5_DLLVAR hid_t H5E_CANTINC_g;       /* Unable to increment reference count */
+H5_DLLVAR hid_t H5E_CANTDEC_g;       /* Unable to decrement reference count */
+H5_DLLVAR hid_t H5E_NOIDS_g;         /* Out of IDs for group */
 
-/* Parallel MPI errors */
-#define H5E_MPI              (H5OPEN H5E_MPI_g)
-#define H5E_MPIERRSTR        (H5OPEN H5E_MPIERRSTR_g)
-#define H5E_CANTRECV         (H5OPEN H5E_CANTRECV_g)
-H5_DLLVAR hid_t H5E_MPI_g;           /* Some MPI function failed */
-H5_DLLVAR hid_t H5E_MPIERRSTR_g;     /* MPI Error String */
-H5_DLLVAR hid_t H5E_CANTRECV_g;      /* Can't receive data */
+/* Property list errors */
+#define H5E_CANTGET          (H5OPEN H5E_CANTGET_g)
+#define H5E_CANTSET          (H5OPEN H5E_CANTSET_g)
+#define H5E_DUPCLASS         (H5OPEN H5E_DUPCLASS_g)
+#define H5E_SETDISALLOWED    (H5OPEN H5E_SETDISALLOWED_g)
+H5_DLLVAR hid_t H5E_CANTGET_g;       /* Can't get value */
+H5_DLLVAR hid_t H5E_CANTSET_g;       /* Can't set value */
+H5_DLLVAR hid_t H5E_DUPCLASS_g;      /* Duplicate class name in parent class */
+H5_DLLVAR hid_t H5E_SETDISALLOWED_g; /* Disallowed operation */
 
 /* B-tree related errors */
 #define H5E_NOTFOUND         (H5OPEN H5E_NOTFOUND_g)
@@ -235,39 +343,9 @@ H5_DLLVAR hid_t H5E_CANTCLOSEOBJ_g;  /* Can't close object */
 H5_DLLVAR hid_t H5E_COMPLEN_g;       /* Name component is too long */
 H5_DLLVAR hid_t H5E_PATH_g;          /* Problem with path to object */
 
-/* Free space errors */
-#define H5E_CANTMERGE        (H5OPEN H5E_CANTMERGE_g)
-#define H5E_CANTREVIVE       (H5OPEN H5E_CANTREVIVE_g)
-#define H5E_CANTSHRINK       (H5OPEN H5E_CANTSHRINK_g)
-H5_DLLVAR hid_t H5E_CANTMERGE_g;     /* Can't merge objects */
-H5_DLLVAR hid_t H5E_CANTREVIVE_g;    /* Can't revive object */
-H5_DLLVAR hid_t H5E_CANTSHRINK_g;    /* Can't shrink container */
-
-/* I/O pipeline errors */
-#define H5E_NOFILTER         (H5OPEN H5E_NOFILTER_g)
-#define H5E_CALLBACK         (H5OPEN H5E_CALLBACK_g)
-#define H5E_CANAPPLY         (H5OPEN H5E_CANAPPLY_g)
-#define H5E_SETLOCAL         (H5OPEN H5E_SETLOCAL_g)
-#define H5E_NOENCODER        (H5OPEN H5E_NOENCODER_g)
-#define H5E_CANTFILTER       (H5OPEN H5E_CANTFILTER_g)
-H5_DLLVAR hid_t H5E_NOFILTER_g;      /* Requested filter is not available */
-H5_DLLVAR hid_t H5E_CALLBACK_g;      /* Callback failed */
-H5_DLLVAR hid_t H5E_CANAPPLY_g;      /* Error from filter 'can apply' callback */
-H5_DLLVAR hid_t H5E_SETLOCAL_g;      /* Error from filter 'set local' callback */
-H5_DLLVAR hid_t H5E_NOENCODER_g;     /* Filter present but encoding disabled */
-H5_DLLVAR hid_t H5E_CANTFILTER_g;    /* Filter operation failed */
-
-/* Link related errors */
-#define H5E_TRAVERSE         (H5OPEN H5E_TRAVERSE_g)
-#define H5E_NLINKS           (H5OPEN H5E_NLINKS_g)
-#define H5E_NOTREGISTERED    (H5OPEN H5E_NOTREGISTERED_g)
-#define H5E_CANTMOVE         (H5OPEN H5E_CANTMOVE_g)
-#define H5E_CANTSORT         (H5OPEN H5E_CANTSORT_g)
-H5_DLLVAR hid_t H5E_TRAVERSE_g;      /* Link traversal failure */
-H5_DLLVAR hid_t H5E_NLINKS_g;        /* Too many soft links in path */
-H5_DLLVAR hid_t H5E_NOTREGISTERED_g; /* Link class not registered */
-H5_DLLVAR hid_t H5E_CANTMOVE_g;      /* Can't move object */
-H5_DLLVAR hid_t H5E_CANTSORT_g;      /* Can't sort objects */
+/* No error */
+#define H5E_NONE_MINOR       (H5OPEN H5E_NONE_MINOR_g)
+H5_DLLVAR hid_t H5E_NONE_MINOR_g;    /* No error */
 
 /* File accessibilty errors */
 #define H5E_FILEEXISTS       (H5OPEN H5E_FILEEXISTS_g)
@@ -289,84 +367,6 @@ H5_DLLVAR hid_t H5E_BADFILE_g;       /* Bad file ID accessed */
 H5_DLLVAR hid_t H5E_TRUNCATED_g;     /* File has been truncated */
 H5_DLLVAR hid_t H5E_MOUNT_g;         /* File mount error */
 
-/* Cache related errors */
-#define H5E_CANTFLUSH        (H5OPEN H5E_CANTFLUSH_g)
-#define H5E_CANTSERIALIZE    (H5OPEN H5E_CANTSERIALIZE_g)
-#define H5E_CANTLOAD         (H5OPEN H5E_CANTLOAD_g)
-#define H5E_PROTECT          (H5OPEN H5E_PROTECT_g)
-#define H5E_NOTCACHED        (H5OPEN H5E_NOTCACHED_g)
-#define H5E_SYSTEM           (H5OPEN H5E_SYSTEM_g)
-#define H5E_CANTINS          (H5OPEN H5E_CANTINS_g)
-#define H5E_CANTPROTECT      (H5OPEN H5E_CANTPROTECT_g)
-#define H5E_CANTUNPROTECT    (H5OPEN H5E_CANTUNPROTECT_g)
-#define H5E_CANTPIN          (H5OPEN H5E_CANTPIN_g)
-#define H5E_CANTUNPIN        (H5OPEN H5E_CANTUNPIN_g)
-#define H5E_CANTMARKDIRTY    (H5OPEN H5E_CANTMARKDIRTY_g)
-#define H5E_CANTDIRTY        (H5OPEN H5E_CANTDIRTY_g)
-#define H5E_CANTEXPUNGE      (H5OPEN H5E_CANTEXPUNGE_g)
-#define H5E_CANTRESIZE       (H5OPEN H5E_CANTRESIZE_g)
-H5_DLLVAR hid_t H5E_CANTFLUSH_g;     /* Unable to flush data from cache */
-H5_DLLVAR hid_t H5E_CANTSERIALIZE_g; /* Unable to serialize data from cache */
-H5_DLLVAR hid_t H5E_CANTLOAD_g;      /* Unable to load metadata into cache */
-H5_DLLVAR hid_t H5E_PROTECT_g;       /* Protected metadata error */
-H5_DLLVAR hid_t H5E_NOTCACHED_g;     /* Metadata not currently cached */
-H5_DLLVAR hid_t H5E_SYSTEM_g;        /* Internal error detected */
-H5_DLLVAR hid_t H5E_CANTINS_g;       /* Unable to insert metadata into cache */
-H5_DLLVAR hid_t H5E_CANTPROTECT_g;   /* Unable to protect metadata */
-H5_DLLVAR hid_t H5E_CANTUNPROTECT_g; /* Unable to unprotect metadata */
-H5_DLLVAR hid_t H5E_CANTPIN_g;       /* Unable to pin cache entry */
-H5_DLLVAR hid_t H5E_CANTUNPIN_g;     /* Unable to un-pin cache entry */
-H5_DLLVAR hid_t H5E_CANTMARKDIRTY_g; /* Unable to mark a pinned entry as dirty */
-H5_DLLVAR hid_t H5E_CANTDIRTY_g;     /* Unable to mark metadata as dirty */
-H5_DLLVAR hid_t H5E_CANTEXPUNGE_g;   /* Unable to expunge a metadata cache entry */
-H5_DLLVAR hid_t H5E_CANTRESIZE_g;    /* Unable to resize a metadata cache entry */
-
-/* System level errors */
-#define H5E_SYSERRSTR        (H5OPEN H5E_SYSERRSTR_g)
-H5_DLLVAR hid_t H5E_SYSERRSTR_g;     /* System error message */
-
-/* No error */
-#define H5E_NONE_MINOR       (H5OPEN H5E_NONE_MINOR_g)
-H5_DLLVAR hid_t H5E_NONE_MINOR_g;    /* No error */
-
-/* Dataspace errors */
-#define H5E_CANTCLIP         (H5OPEN H5E_CANTCLIP_g)
-#define H5E_CANTCOUNT        (H5OPEN H5E_CANTCOUNT_g)
-#define H5E_CANTSELECT       (H5OPEN H5E_CANTSELECT_g)
-#define H5E_CANTNEXT         (H5OPEN H5E_CANTNEXT_g)
-#define H5E_BADSELECT        (H5OPEN H5E_BADSELECT_g)
-#define H5E_CANTCOMPARE      (H5OPEN H5E_CANTCOMPARE_g)
-H5_DLLVAR hid_t H5E_CANTCLIP_g;      /* Can't clip hyperslab region */
-H5_DLLVAR hid_t H5E_CANTCOUNT_g;     /* Can't count elements */
-H5_DLLVAR hid_t H5E_CANTSELECT_g;    /* Can't select hyperslab */
-H5_DLLVAR hid_t H5E_CANTNEXT_g;      /* Can't move to next iterator location */
-H5_DLLVAR hid_t H5E_BADSELECT_g;     /* Invalid selection */
-H5_DLLVAR hid_t H5E_CANTCOMPARE_g;   /* Can't compare objects */
-
-/* Object header related errors */
-#define H5E_LINKCOUNT        (H5OPEN H5E_LINKCOUNT_g)
-#define H5E_VERSION          (H5OPEN H5E_VERSION_g)
-#define H5E_ALIGNMENT        (H5OPEN H5E_ALIGNMENT_g)
-#define H5E_BADMESG          (H5OPEN H5E_BADMESG_g)
-#define H5E_CANTDELETE       (H5OPEN H5E_CANTDELETE_g)
-#define H5E_BADITER          (H5OPEN H5E_BADITER_g)
-#define H5E_CANTPACK         (H5OPEN H5E_CANTPACK_g)
-#define H5E_CANTRESET        (H5OPEN H5E_CANTRESET_g)
-#define H5E_CANTRENAME       (H5OPEN H5E_CANTRENAME_g)
-H5_DLLVAR hid_t H5E_LINKCOUNT_g;     /* Bad object header link count */
-H5_DLLVAR hid_t H5E_VERSION_g;       /* Wrong version number */
-H5_DLLVAR hid_t H5E_ALIGNMENT_g;     /* Alignment error */
-H5_DLLVAR hid_t H5E_BADMESG_g;       /* Unrecognized message */
-H5_DLLVAR hid_t H5E_CANTDELETE_g;    /* Can't delete message */
-H5_DLLVAR hid_t H5E_BADITER_g;       /* Iteration failed */
-H5_DLLVAR hid_t H5E_CANTPACK_g;      /* Can't pack messages */
-H5_DLLVAR hid_t H5E_CANTRESET_g;     /* Can't reset object */
-H5_DLLVAR hid_t H5E_CANTRENAME_g;    /* Unable to rename object */
-
-/* Plugin errors */
-#define H5E_OPENERROR        (H5OPEN H5E_OPENERROR_g)
-H5_DLLVAR hid_t H5E_OPENERROR_g;     /* Can't open directory or file */
-
 #ifdef __cplusplus
 }
 #endif