Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extend the dispatch table for H5FD back to version 1.13.2 #2635

Merged
merged 4 commits into from
Mar 14, 2023
Merged

Extend the dispatch table for H5FD back to version 1.13.2 #2635

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8556a9d
Extend the dispatch table for H5FD back to version 1.13.2
DennisHeimbigner Feb 22, 2023
21b920c
update RELEASENOTES
DennisHeimbigner Feb 22, 2023
6a4ab61
Missed one occurrence of 1,14,0
DennisHeimbigner Feb 22, 2023
9c388df
Merge branch 'main' into vfd13.dmh
WardF Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This file contains a high-level description of this package's evolution. Release

* Fix 'make distcheck' error in run_interop.sh. See [Github #????](https://github.com/Unidata/netcdf-c/pull/????).
* Update `nc-config` to remove inclusion from automatically-detected `nf-config` and `ncxx-config` files, as the wrong files could be included in the output. This is in support of [GitHub #2274](https://github.com/Unidata/netcdf-c/issues/2274).
* Update H5FDhttp.[ch] to work with HDF5 version 1.14.0. See [Github #2615](https://github.com/Unidata/netcdf-c/pull/2615).
* Update H5FDhttp.[ch] to work with HDF5 version 1.13.2 and later. See [Github #2635](https://github.com/Unidata/netcdf-c/pull/2635).

## 4.9.1 - February 2, 2023

Expand Down
6 changes: 3 additions & 3 deletions libhdf5/H5FDhttp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ static herr_t H5FD_http_unlock(H5FD_t *_file);

/* Beware, not same as H5FD_HTTP_g */
static const H5FD_class_t H5FD_http_g = {
#if H5_VERSION_GE(1,14,0)
#if H5_VERSION_GE(1,13,2)
H5FD_CLASS_VERSION, /* struct version */
H5_VFD_HTTP, /* value */
#endif
Expand Down Expand Up @@ -195,7 +195,7 @@ static const H5FD_class_t H5FD_http_g = {
H5FD_http_get_handle, /* get_handle */
H5FD_http_read, /* read */
H5FD_http_write, /* write */
#if H5_VERSION_GE(1,14,0)
#if H5_VERSION_GE(1,13,2)
NULL, /* read_vector */
NULL, /* write_vector */
NULL, /* read_selection */
Expand All @@ -205,7 +205,7 @@ static const H5FD_class_t H5FD_http_g = {
NULL, /* truncate */
H5FD_http_lock, /* lock */
H5FD_http_unlock, /* unlock */
#if H5_VERSION_GE(1,14,0)
#if H5_VERSION_GE(1,13,2)
NULL, /* del */
NULL, /* ctl */
#endif
Expand Down
2 changes: 1 addition & 1 deletion libhdf5/H5FDhttp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#include "H5Ipublic.h"

#if H5_VERSION_GE(1,14,0)
#if H5_VERSION_GE(1,13,2)
#define H5_VFD_HTTP ((H5FD_class_value_t)(514))
#define H5FD_HTTP (H5FDperform_init(H5FD_http_init))
#else
Expand Down