Skip to content

add compat feature for unsafe get_value_ptr #13

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

Open
JoshCu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add compat feature for unsafe get_value_ptr #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions bmi-rs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ license = "MIT"
homepage = "https://github.com/aaraney/bmi-rs"
repository = "https://github.com/aaraney/bmi-rs"

[features]
compat = []

[dependencies]
ffi = { path = "../bmi-rs-sys", package = "bmi-rs-sys", version = "0.0.1" }
20 changes: 14 additions & 6 deletions bmi-rs/src/wrapper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,17 +356,13 @@ pub extern "C" fn get_value<T: Bmi>(
BMI_SUCCESS
}

/// See
/// (#3)[https://github.com/aaraney/bmi-rs/issues/3]
/// for why this returns `BMI_FAILURE`.
#[cfg(feature = "compat")]
#[allow(unused_variables)]
pub extern "C" fn get_value_ptr<T: Bmi>(
self_: *mut ffi::Bmi,
name: *const c_char,
dest: *mut *mut c_void,
) -> c_int {
BMI_FAILURE
/*
let var_name = as_str_ref_or_fail!(name);
let data: &mut T = data_field!(&self_);

Expand All @@ -384,7 +380,19 @@ pub extern "C" fn get_value_ptr<T: Bmi>(
};
unsafe { *dest = src };
BMI_SUCCESS
*/
}

/// See
/// (#3)[https://github.com/aaraney/bmi-rs/issues/3]
/// for why this returns `BMI_FAILURE`.
#[cfg(not(feature = "compat"))]
#[allow(unused_variables)]
pub extern "C" fn get_value_ptr<T: Bmi>(
self_: *mut ffi::Bmi,
name: *const c_char,
dest: *mut *mut c_void,
) -> c_int {
BMI_FAILURE
}

pub extern "C" fn get_value_at_indices<T: Bmi>(
Expand Down