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.

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

Add support for hdf5 1.14.5 #28

Merged
merged 3 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
# Changelog

## hdf5 unreleased
## hdf5-sys unreleased
## hdf5-src unreleased
## hdf5-derive unreleased
## hdf5-types unreleased

## hdf5-sys unreleased
- Fixed linking to libz
- Added support for hdf5 1.14.5
- Removed implicit `libz-sys` feature (breaking change)

## hdf5-src unreleased
- Fixed linking to libz
- Bumped bundled hdf5 to 1.14.5


## hdf5-derive v0.9.1
Release date: Sep 18, 2024.
Expand Down
2 changes: 1 addition & 1 deletion hdf5-src/ext/hdf5
Submodule hdf5 updated 1091 files
4 changes: 2 additions & 2 deletions hdf5-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ impl Debug for Version {
}

fn known_hdf5_versions() -> Vec<Version> {
// Keep up to date with known_versions in hdf5
// Keep up to date with known_hdf5_versions in hdf5
let mut vs = Vec::new();
vs.extend((5..=21).map(|v| Version::new(1, 8, v))); // 1.8.[5-23]
vs.extend((0..=8).map(|v| Version::new(1, 10, v))); // 1.10.[0-10]
vs.extend((0..=2).map(|v| Version::new(1, 12, v))); // 1.12.[0-2]
vs.extend((0..=4).map(|v| Version::new(1, 14, v))); // 1.14.[0-4]
vs.extend((0..=5).map(|v| Version::new(1, 14, v))); // 1.14.[0-5]
vs
}

Expand Down
15 changes: 10 additions & 5 deletions hdf5-sys/src/h5e.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,16 @@ extern "C" {
pub fn H5Ecreate_msg(cls: hid_t, msg_type: H5E_type_t, msg: *const c_char) -> hid_t;
pub fn H5Ecreate_stack() -> hid_t;
pub fn H5Eget_current_stack() -> hid_t;
#[cfg(feature = "1.14.0")]
pub fn H5Eappend_stack(
dst_stack_id: hid_t, src_stack_id: hid_t, close_source_stack: hbool_t,
) -> herr_t;
#[cfg(feature = "1.14.5")]
pub fn H5Eis_paused(stack_id: hid_t, is_paused: *mut hbool_t) -> herr_t;
#[cfg(feature = "1.14.5")]
pub fn H5Epause_stack(stack_id: hid_t) -> herr_t;
#[cfg(feature = "1.14.5")]
pub fn H5Eresume_stack(stack_id: hid_t) -> herr_t;
pub fn H5Eclose_stack(stack_id: hid_t) -> herr_t;
pub fn H5Eget_class_name(class_id: hid_t, name: *mut c_char, size: size_t) -> ssize_t;
pub fn H5Eset_current_stack(err_stack_id: hid_t) -> herr_t;
Expand Down Expand Up @@ -130,11 +140,6 @@ extern "C" {
pub fn H5Eget_major(maj: H5E_major_t) -> *mut c_char;
#[deprecated(note = "deprecated in HDF5 1.8.0")]
pub fn H5Eget_minor(min: H5E_minor_t) -> *mut c_char;

#[cfg(feature = "1.14.0")]
pub fn H5Eappend_stack(
dst_stack_id: hid_t, src_stack_id: hid_t, close_source_stack: hbool_t,
) -> herr_t;
}

pub use self::globals::*;
Expand Down
2 changes: 1 addition & 1 deletion hdf5/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fn known_hdf5_versions() -> Vec<Version> {
vs.extend((5..=21).map(|v| Version::new(1, 8, v))); // 1.8.[5-23]
vs.extend((0..=8).map(|v| Version::new(1, 10, v))); // 1.10.[0-10]
vs.extend((0..=2).map(|v| Version::new(1, 12, v))); // 1.12.[0-2]
vs.extend((0..=4).map(|v| Version::new(1, 14, v))); // 1.14.[0-4]
vs.extend((0..=5).map(|v| Version::new(1, 14, v))); // 1.14.[0-5]
vs
}

Expand Down
Loading