VFD SWMR: Normalization with develop (#765)

* Brings CMake updates from develop

* Brings reduction in pedantic casts from develop

* Purges UFAIL from the library (#637)

* Committing clang-format changes

* Purges UFAIL from the library

* H5HL_insert change requested in PR

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Removes gratuitous (double)x.yF casts (#632)

* Committing clang-format changes

* Removes gratuitous (double)x.yF casts

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Committing clang-format changes

* Cleans up a const warning left over from previous constification (#633)

* Committing clang-format changes

* Adds consts to a few global variables

* Cleans up a const warning left over from previous constification

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Formatted source

* Bring over some VOL registration changes

* VOL cleanup

* H5VL_request_status_t substitutions

* H5F.c cleanup

* Minor API tweaks from develop

* Moves H5G package init/teardown to H5Gint.c

* H5G cleanup

* H5M cleanup

* H5SM cleanup

* H5T cleanup

* H5R cleanup

* H5Lpublic.h cleanup

* H5L cleanup

* H5O cleanup

* H5A, H5CS, and H5AC cleanup

* Moved H5A init/teardown code to H5Aint.c

* Moves H5D I/O functions to H5D.c

* H5D cleanup

* Misc minor cleanup

* H5P close cleanup

* H5Tpublic.h cleanup

* Fixes err_compat test

* H5PLpublic.h cleanup

* Updates H5Ppublic.h

* H5Fpublic.h updates

* H5A.c cleanup

* Brings over H5Aexists and related changes

* Brings CMake shell testing changes from develop

* Close callback changes

* H5R and H5Tcommit normalization

* err_compat test works now

* H5O tweaks

* Updates VOL registration code

* Brings over H5VL_create_object

* H5Tconv.c reformatting

* H5T.c tweaks

* Brings datatype and reference updates from develop

* Brings VOL plugin loading changes from develop

* Brings event sets from develop

* Brings async functions over

* Tools changes

* Brings over many tools changes from develop

* Brings VOL flags from develop

* Fixes h5dump double/float tests

* Updates h5repack tests

* Brings h5diff test changes from develop

* Last h5dump changes

* Brings test changes from develop

* Committing clang-format changes

* Tidied h5_testing()

* Brings chunk iteration code + misc from develop

* Updates vds test

* Enables external link parallel test

* Brings updated property lists from develop

* H5G changes from develop

* H5MF cleanup

* Brings vfd_swmr test back into CMake

* Updates threadsafe test

* Updates plist test

* Brings recent changes from develop

* Require a C++11 compiler to build the C++ wrappers (#693)

* Committing clang-format changes

* Requires a C++11 compiler to build the C++ wrappers

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Fix H5FD_mpio_Debug="rw" can report MPI_count instead of bytes (#699)

* Removes pre-C99 build and header cruft (#700)

* Assumes ANSI C headers exist
* Assumes stdbool.h, stdint.h, and inttypes.h are present
* Assumes the C++ compiler can handle stdint.h
* Removes all work-arounds for missing functionality, especially stdbool.h

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Updates release documents

* Brings parallel changes from develop

* Adds a VFD/parallel check program for the VFD SWMR shell test

* Updates MANIFEST

* Disable building VFD SWMR acceptance tests on CMake

* Removes err.h from genall5.c

* Partial cleanup of H5Cpkg.h

* Fixes printf specifiers in H5Cdbg.c

* Java and fortran cmake changes (#694)

* OESS-98 convert plugin option to FetchContent, add tests

* Fixes for pkcfg files because of plugin option

* OESS-98 fix tools test for plugins

* Keep doxygen comments under 100 chars long - format hint

* Whitespace

* HDFFV-11144 - Reclassify CMake messages

* HDFFV-11099/11100 added help text

* Reworked switch statement to compare string instead

* Fix typo

* Update CDash mode

* Correct name of threadsafe

* Correct option name

* Undo accidental commit

* Note LLVM 10 to 11 format default changes

* Update format plugin

* Undo clang-format version 11 changes

* One more correction

* Update supported platforms

* Revert whitespace changes

* Correct whitespace

* Changes from PR#3

* HDFFV-11213 added option to control gcc10 warnings diagnostics

* HDFFV-11212 Use the new references correctly in JNI utility and tests

* format source

* Fix typo

* Add new test file

* HDFFV-11212 - update test and remove unused arg

* Minor non-space formatting changes

* Use H5I_INVALID_ID instead of "-1"

* source formatting

* add missing testfile, update jni function

* Undo commit of debug code

* remove mislocated file

* Fix h5repack test for handling of fapls and id close

* Update h5diff test files usage text

* HDFFV-11212 add new ref tests for JNI export dataset

* src format update

* Remove blank line typo

* src format typo

* long double requires %Lg

* Another long double foramt specifer S.B. %Lg

* issue with t128bit test

* Windows issue with h5dump and type.

* Fix review issues

* refactor function nesting and fix error checks

* format fixes

* Remove untested functions and javadoc quiet comments

* Restore TRY block.

* Change string append errors to memory exception

* revert to H5_JNI_FATAL_ERROR - support functions need work

* Add assertion error for h5util functions

* remove duplicate function

* format fix

* Revert HD function error handling

* Update copyright comments

* GH #386 java folder copyright corrections

* Whitespace

* GH #359 implement and fix tools 1.6 API usage

* remove excessive comments

* Flip inits to correct ifdef section

* rework ifdef to be simpler

* format issue

* Reformat ifdef inits

* remove static attribute

* format compliance

* Update names

* Revert because logic relies on float not being int

* Changes noticed from creating merge of #412

* Double underscore change

* Correct compiler version variable used

* Remove header guard underscores

* Whitespace cleanup

* Split format source and commit changes on repo push

* remove pre-split setting

* Change windows TS to use older VS.

* correct window os name

* HDFFV-11212 JNI export util and Javadoc

* Suggested review changes

* Another change found

* Committing clang-format changes

* HDFFV-11113 long double in tools

* HDFFV-11113 add note

* Disable long double tests for now

* HDFFV-11228 remove arbitrary CMake warning groups.

* Make each flag a string

* Some Javadoc warning fixes

* Updated javadoc fixes

* # WARNING: head commit changed in the meantime

HDFFV-11229 Fix long double usage in tools and java

Changed h5dump and h5ls to just print 128-bit for long double type.
Added test and file for dataset and attributes with all three float
types.

* Committing clang-format changes

* HDFFV-11229 Add release note

* HDFFV-11229 windows testfile needed

* fix typo

* Remove non supported message text

* HDFFV-11229 - change ldouble test to check both native and general

* HDFFV-11229 add second file compare

* HDFFV-11229 fix reference file

* HDFFV-11229 autotools check two refs

* HDFFV-11229 revert back to removal of NATIVE_LDOUBLE in tools output

* Committing clang-format changes

* Update release note

* Update attribute type of ref file

* Change source of ninja for macs

* try port instead of brew

* Recommended is to use brew.

* Undo non long double changes

* remove unneeded file

* Fix perl and doxygen CMake code

* Add "option" command for clang options

* Rework CMake add_custom to use the BYPRODUCTS argument

* Add stamp files to BYPRODUCTS

* Only one copy of file exists

* Fix custom cmmand depends targets

* Fix fortran custom command DEPENDS

* Add LD_LIBRARY_PATH to tests

* Add custom target for DEPENDS

* Add h5detect conditionaly to generated target DEPENDS

* Correct DEPENDS targets

* Parallel builds need the mpi compiler for pkgconfig scripts.

* install only if MPI build

* Fortran target depends

* Remove incorrect source attribute

* doxygen adjustments

* doxygen build updates

* Correct version

* Correct function version - function has been merged to 1.12

* Correct version string for map functions

* Cleanup warnings for tools debug builds

* TRILAB-227 - fix indexing for h5diff selections

* Correct location of pos to index function call

* TRILAB-227 Enable test

* Quote subset args

* Use MATCHES because of AppleClang

* if blocks needed for build modes

* Update list of DT platforms

* VS2019 correctly displays float values

* revert VS2019 change

* Issue #669 remove version from pkgcfg filename

* remove version from h5cc script

* Java reference functions updated

enabled fortran in cmake gcc action yaml file
java reference test changed to correctly test refs
jni reference functions that create ids changed to use jni id logging

* Correct BYPRODUCTS argument

* Correct more genereated files BYPRODUCTS

* BYPRODUCTS must have unique locations

* Fix typo

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Removes alternative function enter/leave macro scheme (#678)

* Committing clang-format changes

* Converted BEGIN_FUNC, etc. macros to FUNC_ENTER

* Rips out the BEGIN_FUNC, etc. macros

* Removes 'end if', etc. comments from H5HL package

* Committing clang-format changes

* Fixes an H5EA iterate issue

* Fixes an issue in the H5FA iterator code

* Further cleanup in bin/trace after macro removal

* Iterator changes in H5EA and H5FA

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Split H5L.c internal code to H5Lint.c (#691)

* Committing clang-format changes

* Splits internal parts of H5L.c to H5Lint.c

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Clean up type size checks in configure.ac (#702)

* Committing clang-format changes

* C++ warning and build fixes (#707)

* Committing clang-format changes

* C++ build and warning updates

* Fixes all warnings on C++ (with gcc 9.3)
* Updates CMake and Autotools C++ builds

* Undo warning clobber

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Removes some DEC Alpha cruft from H5detect and H5private.h (#708)

* Cleans up hsize_t and haddr_t size guessing (#709)

* Cleans up definitions of haddr_t and hsize_t + cruft removal

* Formatted source

* Updates PGI C/C++ configurations (#715)

* Updates PGI C/C++ configurations

Tweaks some settings and configures pgc++ to use C++11

* Updated copyright information

* Adds an Intel C++ configuration file (#716)

* Adds an Intel C++ configuration file

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Updates bin/trace script to correctly wrap H5TRACE macros near clang-format column limit (#719)

* Removes clang-format comments from H5O.c call

* Fixes bin/trace to correctly wrap lines near the clang-format limit

* Removed unused variable from bin/trace

* Fixes issue with ccmake that prevents building Fortran (#723)

ccmake runs iteratively, and the check_fortran_source_runs
macros were clobbering a single output file that did not
get updated on further configure iterations

* Updates CMake size_t and ssize_t checks for MacOS

* Moved a little boilerplate over from develop

* Fixes some warnings

* Committing clang-format changes

* Moves gcc warning macros from H5public.h to H5private.h (#724)

* Moves gcc warning suppression macros out of H5public.h

* Update RELEASE.txt

* Formatted source

* Adds __STDC_FORMAT_MACROS before including inttypes.h w/ C++ (#726)

* Adds __STDC_FORMAT_MACROS before including inttypes.h w/ C++

Allows C++ library to be built on older versions of gcc.

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Moves H5PacketTable default ctor inside source file (#731)

* Brings (most) H5Xdevelop.h headers from develop

* Trivial H5F and H5O changes during normalization

* Renames buf_ptr back to page_buf to better align with develop

* Removed H5HGtrap.c

* Brings changes from develop

* Normalization (mainly cache) with develop

* Fix Direct VFD Testing in CMake (#742)

* Fixes C++ warnings when passing hsize_t values to printf in test code (#745)

* Organize and align compiler flags (#741)

* OESS-98 convert plugin option to FetchContent, add tests

* Fixes for pkcfg files because of plugin option

* OESS-98 fix tools test for plugins

* Keep doxygen comments under 100 chars long - format hint

* Whitespace

* HDFFV-11144 - Reclassify CMake messages

* HDFFV-11099/11100 added help text

* Reworked switch statement to compare string instead

* Fix typo

* Update CDash mode

* Correct name of threadsafe

* Correct option name

* Undo accidental commit

* Note LLVM 10 to 11 format default changes

* Update format plugin

* Undo clang-format version 11 changes

* One more correction

* Update supported platforms

* Revert whitespace changes

* Correct whitespace

* Changes from PR#3

* HDFFV-11213 added option to control gcc10 warnings diagnostics

* HDFFV-11212 Use the new references correctly in JNI utility and tests

* format source

* Fix typo

* Add new test file

* HDFFV-11212 - update test and remove unused arg

* Minor non-space formatting changes

* Use H5I_INVALID_ID instead of "-1"

* source formatting

* add missing testfile, update jni function

* Undo commit of debug code

* remove mislocated file

* Fix h5repack test for handling of fapls and id close

* Update h5diff test files usage text

* HDFFV-11212 add new ref tests for JNI export dataset

* src format update

* Remove blank line typo

* src format typo

* long double requires %Lg

* Another long double foramt specifer S.B. %Lg

* issue with t128bit test

* Windows issue with h5dump and type.

* Fix review issues

* refactor function nesting and fix error checks

* format fixes

* Remove untested functions and javadoc quiet comments

* Restore TRY block.

* Change string append errors to memory exception

* revert to H5_JNI_FATAL_ERROR - support functions need work

* Add assertion error for h5util functions

* remove duplicate function

* format fix

* Revert HD function error handling

* Update copyright comments

* GH #386 java folder copyright corrections

* Whitespace

* GH #359 implement and fix tools 1.6 API usage

* remove excessive comments

* Flip inits to correct ifdef section

* rework ifdef to be simpler

* format issue

* Reformat ifdef inits

* remove static attribute

* format compliance

* Update names

* Revert because logic relies on float not being int

* Changes noticed from creating merge of #412

* Double underscore change

* Correct compiler version variable used

* Remove header guard underscores

* Whitespace cleanup

* Split format source and commit changes on repo push

* remove pre-split setting

* Change windows TS to use older VS.

* correct window os name

* HDFFV-11212 JNI export util and Javadoc

* Suggested review changes

* Another change found

* Committing clang-format changes

* HDFFV-11113 long double in tools

* HDFFV-11113 add note

* Disable long double tests for now

* HDFFV-11228 remove arbitrary CMake warning groups.

* Make each flag a string

* Some Javadoc warning fixes

* Updated javadoc fixes

* # WARNING: head commit changed in the meantime

HDFFV-11229 Fix long double usage in tools and java

Changed h5dump and h5ls to just print 128-bit for long double type.
Added test and file for dataset and attributes with all three float
types.

* Committing clang-format changes

* HDFFV-11229 Add release note

* HDFFV-11229 windows testfile needed

* fix typo

* Remove non supported message text

* HDFFV-11229 - change ldouble test to check both native and general

* HDFFV-11229 add second file compare

* HDFFV-11229 fix reference file

* HDFFV-11229 autotools check two refs

* HDFFV-11229 revert back to removal of NATIVE_LDOUBLE in tools output

* Committing clang-format changes

* Update release note

* Update attribute type of ref file

* Change source of ninja for macs

* try port instead of brew

* Recommended is to use brew.

* Undo non long double changes

* remove unneeded file

* Fix perl and doxygen CMake code

* Add "option" command for clang options

* Rework CMake add_custom to use the BYPRODUCTS argument

* Add stamp files to BYPRODUCTS

* Only one copy of file exists

* Fix custom cmmand depends targets

* Fix fortran custom command DEPENDS

* Add LD_LIBRARY_PATH to tests

* Add custom target for DEPENDS

* Add h5detect conditionaly to generated target DEPENDS

* Correct DEPENDS targets

* Parallel builds need the mpi compiler for pkgconfig scripts.

* install only if MPI build

* Fortran target depends

* Remove incorrect source attribute

* doxygen adjustments

* doxygen build updates

* Correct version

* Correct function version - function has been merged to 1.12

* Correct version string for map functions

* Cleanup warnings for tools debug builds

* TRILAB-227 - fix indexing for h5diff selections

* Correct location of pos to index function call

* TRILAB-227 Enable test

* Quote subset args

* Use MATCHES because of AppleClang

* if blocks needed for build modes

* Update list of DT platforms

* VS2019 correctly displays float values

* revert VS2019 change

* Issue #669 remove version from pkgcfg filename

* remove version from h5cc script

* Java reference functions updated

enabled fortran in cmake gcc action yaml file
java reference test changed to correctly test refs
jni reference functions that create ids changed to use jni id logging

* Correct BYPRODUCTS argument

* Correct more genereated files BYPRODUCTS

* BYPRODUCTS must have unique locations

* Fix typo

* Fix fortran configure checks

* Rework H5_PAC_C_MAX_REAL_PRECISION setting logic

* Add note about fortran configure change

* Adds a quick for for some egregious chunk_info badness (#722)

* Fixes issue with ccmake that prevents building Fortran (#723)

ccmake runs iteratively, and the check_fortran_source_runs
macros were clobbering a single output file that did not
get updated on further configure iterations

* Fix conflicts with merge

* Move MAX_PRECISION back to HDF5UseFortran.cmake

* Use STREQUAL to test macro argument

* Move C language test to ConfigureChecks from HDF5UseFortran

* MAX_PRECISION defines must be defined

* Organize flags and align autotools and cmake

* Fix comment in no-error-general warnings files.

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>

* Committing clang-format changes

* Cache code tidying

* Constification of cache code

* Renaming of static calls in cache

* Fixes H5C mess made by git during merge

* Committing clang-format changes

* Fixes a printf format issue w/ parallel

* Revert "Committing clang-format changes"

This reverts commit 1265fe87fec6589f029cf3b1de6d586c90168654.

* Turns off clang formatter in H5C while syncing with develop

* Adds a lot of HD prefixes and cleans up err.h usage

* Committing clang-format changes

* Brings cache skip list optimization from develop

* Brings recent changes from develop

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

1 files changed, 2 insertions, 371 deletions

diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index 90277cf..5d04c9a 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -207,11 +207,6 @@ typedef enum H5Z_SO_scale_type_t {
 } H5Z_SO_scale_type_t;
 
 /**
- * Current version of the H5Z_class_t struct
- */
-#define H5Z_CLASS_T_VERS (1)
-
-/**
  * \ingroup FLETCHER32
  * Values to decide if EDC is enabled for reading data
  */
@@ -243,354 +238,11 @@ typedef enum H5Z_cb_return_t {
 typedef H5Z_cb_return_t (*H5Z_filter_func_t)(H5Z_filter_t filter, void *buf, size_t buf_size, void *op_data);
 //! <!-- [H5Z_filter_func_t_snip] -->
 
-/**
- * Structure for filter callback property
- */
-typedef struct H5Z_cb_t {
-    H5Z_filter_func_t func;
-    void *            op_data;
-} H5Z_cb_t;
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /**
- * \brief This callback determines if a filter can be applied to the dataset
- *        with the characteristics provided
- *
- * \dcpl_id
- * \type_id
- * \space_id
- *
- * \return \htri_t
- *
- * \details Before a dataset gets created, the \ref H5Z_can_apply_func_t
- *          callbacks for any filters used in the dataset creation property list
- *          are called with the dataset's dataset creation property list, the
- *          dataset's datatype and a dataspace describing a chunk (for chunked
- *          dataset storage).
- *
- *          The \ref H5Z_can_apply_func_t callback must determine if the
- *          combination of the dataset creation property list setting, the
- *          datatype and the dataspace represent a valid combination to apply
- *          this filter to.  For example, some cases of invalid combinations may
- *          involve the filter not operating correctly on certain datatypes (or
- *          certain datatype sizes), or certain sizes of the chunk dataspace.
- *
- *          The \ref H5Z_can_apply_func_t callback can be the NULL pointer, in
- *          which case, the library will assume that it can apply to any
- *          combination of dataset creation property list values, datatypes and
- *          dataspaces.
- *
- *          The \ref H5Z_can_apply_func_t callback returns positive a valid
- *          combination, zero for an invalid combination and negative for an
- *          error.
- */
-//! <!-- [H5Z_can_apply_func_t_snip] -->
-typedef htri_t (*H5Z_can_apply_func_t)(hid_t dcpl_id, hid_t type_id, hid_t space_id);
-//! <!-- [H5Z_can_apply_func_t_snip] -->
-/**
- * \brief The filter operation callback function, defining a filter's operation
- *        on data
- *
- * \dcpl_id
- * \type_id
- * \space_id
- *
- * \return \herr_t
- *
- * \details After the \ref H5Z_can_apply_func_t callbacks are checked for new
- *          datasets, the \ref H5Z_set_local_func_t callbacks for any filters
- *          used in the dataset creation property list are called. These
- *          callbacks receive the dataset's private copy of the dataset creation
- *          property list passed in to H5Dcreate() (i.e. not the actual property
- *          list passed in to H5Dcreate()) and the datatype ID passed in to
- *          H5Dcreate() (which is not copied and should not be modified) and a
- *          dataspace describing the chunk (for chunked dataset storage) (which
- *          should also not be modified).
- *
- *          The \ref H5Z_set_local_func_t callback must set any parameters that
- *          are specific to this dataset, based on the combination of the
- *          dataset creation property list values, the datatype and the
- *          dataspace. For example, some filters perform different actions based
- *          on different datatypes (or datatype sizes) or different number of
- *          dimensions or dataspace sizes.
- *
- *          The \ref H5Z_set_local_func_t callback can be the NULL pointer, in
- *          which case, the library will assume that there are no
- *          dataset-specific settings for this filter.
- *
- *          The \ref H5Z_set_local_func_t callback must return non-negative on
- *          success and negative for an error.
- */
-//! <!-- [H5Z_set_local_func_t_snip] -->
-typedef herr_t (*H5Z_set_local_func_t)(hid_t dcpl_id, hid_t type_id, hid_t space_id);
-//! <!-- [H5Z_set_local_func_t_snip] -->
-
-/**
- * \brief The filter operation callback function, defining a filter's operation
- *        on data
- *
- * \param[in] flags Bit vector specifying certain general properties of the filter
- * \param[in] cd_nelmts Number of elements in \p cd_values
- * \param[in] cd_values Auxiliary data for the filter
- * \param[in] nbytes The number of valid bytes in \p buf to be filtered
- * \param[in,out] buf_size The size of \p buf
- * \param[in,out] buf The filter buffer
- *
- * \return Returns the number of valid bytes of data contained in \p buf. In the
- *         case of failure, the return value is 0 (zero) and all pointer
- *         arguments are left unchanged.
- *
- * \details A filter gets definition flags and invocation flags (defined
- *          above), the client data array and size defined when the filter was
- *          added to the pipeline, the size in bytes of the data on which to
- *          operate, and pointers to a buffer and its allocated size.
- *
- *          The filter should store the result in the supplied buffer if
- *          possible, otherwise it can allocate a new buffer, freeing the
- *          original. The allocated size of the new buffer should be returned
- *          through the \p buf_size pointer and the new buffer through the \p
- *          buf pointer.
- *
- *          The return value from the filter is the number of bytes in the
- *          output buffer. If an error occurs then the function should return
- *          zero and leave all pointer arguments unchanged.
- */
-//! <!-- [H5Z_func_t_snip] -->
-typedef size_t (*H5Z_func_t)(unsigned int flags, size_t cd_nelmts, const unsigned int cd_values[],
-                             size_t nbytes, size_t *buf_size, void **buf);
-//! <!-- [H5Z_func_t_snip] -->
-/**
- * The filter table maps filter identification numbers to structs that
- * contain a pointers to the filter function and timing statistics.
- */
-//! <!-- [H5Z_class2_t_snip] -->
-typedef struct H5Z_class2_t {
-    int                  version;         /**< Version number of the H5Z_class_t struct     */
-    H5Z_filter_t         id;              /**< Filter ID number                             */
-    unsigned             encoder_present; /**< Does this filter have an encoder?            */
-    unsigned             decoder_present; /**< Does this filter have a decoder?             */
-    const char *         name;            /**< Comment for debugging                        */
-    H5Z_can_apply_func_t can_apply;       /**< The "can apply" callback for a filter        */
-    H5Z_set_local_func_t set_local;       /**< The "set local" callback for a filter        */
-    H5Z_func_t           filter;          /**< The actual filter function                   */
-} H5Z_class2_t;
-//! <!-- [H5Z_class2_t_snip] -->
-
-/**
- * \ingroup H5Z
- *
- * \brief Registers a new filter with the HDF5 library
- *
- * \param[in] cls A pointer to a buffer for the struct containing the
- *                filter-definition
- *
- * \return \herr_t
- *
- * \details H5Zregister() registers a new filter with the HDF5 library.
- *
- * \details Making a new filter available to an application is a two-step
- *          process. The first step is to write the three filter callback
- *          functions described below: \c can_apply, \c set_local, and \c
- *          filter. This call to H5Zregister(), registering the filter with the
- *          library, is the second step. The can_apply and set_local fields can
- *          be set to NULL if they are not required for the filter being
- *          registered.
- *
- *          H5Zregister() accepts a single parameter, a pointer to a buffer for
- *          the \p cls data structure. That data structure must conform to one
- *          of the following definitions:
- *          \snippet this H5Z_class1_t_snip
- *          or
- *          \snippet this H5Z_class2_t_snip
- *
- *          \c version is a library-defined value reporting the version number
- *          of the #H5Z_class_t struct. This currently must be set to
- *          #H5Z_CLASS_T_VERS.
- *
- *          \c id is the identifier for the new filter. This is a user-defined
- *          value between #H5Z_FILTER_RESERVED and #H5Z_FILTER_MAX. These
- *          values are defined in the HDF5 source file H5Zpublic.h, but the
- *          symbols #H5Z_FILTER_RESERVED and #H5Z_FILTER_MAX should always be
- *          used instead of the literal values.
- *
- *          \c encoder_present is a library-defined value indicating whether
- *          the filter’s encoding capability is available to the application.
- *
- *          \c decoder_present is a library-defined value indicating whether
- *          the filter’s encoding capability is available to the application.
- *
- *          \c name is a descriptive comment used for debugging, may contain a
- *          descriptive name for the filter, and may be the null pointer.
- *
- *          \c can_apply, described in detail below, is a user-defined callback
- *          function which determines whether the combination of the dataset
- *          creation property list values, the datatype, and the dataspace
- *          represent a valid combination to apply this filter to.
- *
- *          \c set_local, described in detail below, is a user-defined callback
- *          function which sets any parameters that are specific to this
- *          dataset, based on the combination of the dataset creation property
- *          list values, the datatype, and the dataspace.
- *
- *          \c filter, described in detail below, is a user-defined callback
- *          function which performs the action of the filter.
- *
- *          The statistics associated with a filter are not reset by this
- *          function; they accumulate over the life of the library.
- *
- *          #H5Z_class_t is a macro which maps to either H5Z_class1_t or
- *          H5Z_class2_t, depending on the needs of the application. To affect
- *          only this macro, H5Z_class_t_vers may be defined to either 1 or 2.
- *          Otherwise, it will behave in the same manner as other API
- *          compatibility macros. See API Compatibility Macros in HDF5 for more
- *          information. H5Z_class1_t matches the #H5Z_class_t structure that is
- *          used in the 1.6.x versions of the HDF5 library.
- *
- *          H5Zregister() will automatically detect which structure type has
- *          been passed in, regardless of the mapping of the #H5Z_class_t macro.
- *          However, the application must make sure that the fields are filled
- *          in according to the correct structure definition if the macro is
- *          used to declare the structure.
- *
- *          \Bold{The callback functions:}\n Before H5Zregister() can link a
- *          filter into an application, three callback functions must be
- *          defined as described in the HDF5 library header file H5Zpublic.h.
- *
- *          When a filter is applied to the fractal heap for a group (e.g.,
- *          when compressing group metadata) and if the can apply and set local
- *          callback functions have been defined for that filter, HDF5 passes
- *          the value -1 for all parameters for those callback functions. This
- *          is done to ensure that the filter will not be applied to groups if
- *          it relies on these parameters, as they are not applicable to group
- *          fractal heaps; to operate on group fractal heaps, a filter must be
- *          capable of operating on an opaque block of binary data.
- *
- *          The \Emph{can apply} callback function must return a positive value
- *          for a valid combination, zero for an invalid combination, and a
- *          negative value for an error.
- *          \snippet this H5Z_can_apply_func_t_snip
- *
- *          Before a dataset is created, the \Emph{can apply} callbacks for any
- *          filters used in the dataset creation property list are called with
- *          the dataset's dataset creation property list, \c dcpl_id, the
- *          dataset's datatype, \p type_id, and a dataspace describing a chunk,
- *          \p space_id, (for chunked dataset storage).
- *
- *          This callback must determine whether the combination of the dataset
- *          creation property list settings, the datatype, and the dataspace
- *          represent a valid combination to which to apply this filter. For
- *          example, an invalid combination may involve the filter not
- *          operating correctly on certain datatypes, on certain datatype
- *          sizes, or on certain sizes of the chunk dataspace. If this filter
- *          is enabled through H5Pset_filter() as optional and the can apply
- *          function returns 0, the library will skip the filter in the filter
- *          pipeline.
- *
- *          This callback can be the NULL pointer, in which case the library
- *          will assume that the filter can be applied to a dataset with any
- *          combination of dataset creation property list values, datatypes,
- *          and dataspaces.
- *
- *          The \Emph{set local} callback function is defined as follows:
- *          \snippet this H5Z_set_local_func_t_snip
- *
- *          After the can apply callbacks are checked for a new dataset, the
- *          \Emph{set local} callback functions for any filters used in the
- *          dataset creation property list are called. These callbacks receive
- *          \c dcpl_id, the dataset's private copy of the dataset creation
- *          property list passed in to H5Dcreate() (i.e. not the actual
- *          property list passed in to H5Dcreate()); \c type_id, the datatype
- *          identifier passed in to H5Dcreate(), which is not copied and should
- *          not be modified; and \c space_id, a dataspace describing the chunk
- *          (for chunked dataset storage), which should also not be modified.
- *
- *          The set local callback must set any filter parameters that are
- *          specific to this dataset, based on the combination of the dataset
- *          creation property list values, the datatype, and the dataspace. For
- *          example, some filters perform different actions based on different
- *          datatypes, datatype sizes, numbers of dimensions, or dataspace
- *          sizes.
- *
- *          The \Emph{set local} callback may be the NULL pointer, in which
- *          case, the library will assume that there are no dataset-specific
- *          settings for this filter.
- *
- *          The \Emph{set local} callback function must return a non-negative
- *          value on success and a negative value for an error.
- *
- *          The \Emph{filter operation} callback function, defining the
- *          filter's operation on the data, is defined as follows:
- *          \snippet this H5Z_func_t_snip
- *
- *          The parameters \c flags, \c cd_nelmts, and \c cd_values are the
- *          same as for the function H5Pset_filter(). The one exception is that
- *          an additional flag, #H5Z_FLAG_REVERSE, is set when the filter is
- *          called as part of the input pipeline.
- *
- *          The parameter \c buf points to the input buffer which has a size of
- *          \c buf_size bytes, \c nbytes of which are valid data.
- *
- *          The filter should perform the transformation in place if possible.
- *          If the transformation cannot be done in place, then the filter
- *          should allocate a new buffer with malloc() and assign it to \c buf,
- *          assigning the allocated size of that buffer to \c buf_size. The old
- *          buffer should be freed by calling free().
- *
- *          If successful, the \Emph{filter operation} callback function
- *          returns the number of valid bytes of data contained in \c buf. In
- *          the case of failure, the return value is 0 (zero) and all pointer
- *          arguments are left unchanged.
- *
- * \version 1.8.6 Return type for the \Emph{can apply} callback function,
- *                \ref H5Z_can_apply_func_t, changed to \ref htri_t.
- * \version 1.8.5 Semantics of the \Emph{can apply} and \Emph{set local}
- *                callback functions changed to accommodate the use of filters
- *                with group fractal heaps.
- * \version 1.8.3 #H5Z_class_t renamed to H5Z_class2_t, H5Z_class1_t structure
- *                introduced for backwards compatibility with release 1.6.x,
- *                and #H5Z_class_t macro introduced in this release. Function
- *                modified to accept either structure type.
- * \version 1.8.0 The fields \c version, \c encoder_present, and
- *                \c decoder_present were added to the #H5Z_class_t \c struct
- *                in this release.
- * \version 1.6.0 This function was substantially revised in Release 1.6.0 with
- *                a new #H5Z_class_t struct and new set local and can apply
- *                callback functions.
- *
- */
-H5_DLL herr_t H5Zregister(const void *cls);
-/**
- * \ingroup H5Z
- *
- * \brief Unregisters a filter.
- *
- * \param[in] id Identifier of the filter to be unregistered.
- * \return \herr_t
- *
- * \details H5Zunregister() unregisters the filter specified in \p id.
- *
- * \details This function first iterates through all opened datasets and
- *          groups. If an open object that uses this filter is found, the
- *          function will fail with a message indicating that an object using
- *          the filter is still open. All open files are then flushed to make
- *          sure that all cached data that may use this filter are written out.
- *
- *          If the application is a parallel program, all processes that
- *          participate in collective data write should call this function to
- *          ensure that all data is flushed.
- *
- *          After a call to H5Zunregister(), the filter specified in filter
- *          will no longer be available to the application.
- *
- * \version 1.8.12 Function modified to check for open objects using the
- *                 filter.
- * \since 1.6.0
- */
-H5_DLL herr_t H5Zunregister(H5Z_filter_t id);
-/**
  * \ingroup H5Z
  *
  * \brief Determines whether a filter is available
@@ -662,29 +314,8 @@ H5_DLL htri_t H5Zfilter_avail(H5Z_filter_t id);
  */
 H5_DLL herr_t H5Zget_filter_info(H5Z_filter_t filter, unsigned int *filter_config_flags);
 
-/* Symbols defined for compatibility with previous versions of the HDF5 API.
- *
- * Use of these symbols is deprecated.
- */
-#ifndef H5_NO_DEPRECATED_SYMBOLS
-
-/**
- * The filter table maps filter identification numbers to structs that
- * contain a pointers to the filter function and timing statistics.
- */
-//! <!-- [H5Z_class1_t_snip] -->
-typedef struct H5Z_class1_t {
-    H5Z_filter_t         id;        /**< Filter ID number			     */
-    const char *         name;      /**< Comment for debugging		     */
-    H5Z_can_apply_func_t can_apply; /**< The "can apply" callback for a filter */
-    H5Z_set_local_func_t set_local; /**< The "set local" callback for a filter */
-    H5Z_func_t           filter;    /**< The actual filter function		     */
-} H5Z_class1_t;
-//! <!-- [H5Z_class1_t_snip] -->
-
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* _H5Zpublic_H */