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

Remove read(T*, ...). #942

Merged
merged 3 commits into from
Feb 8, 2024
Merged

Remove read(T*, ...). #942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ab3f68
More migration to `read_raw`.
1uc Feb 6, 2024
fa7cd44
Remove `read(T*, ...)`.
1uc Feb 5, 2024
70f5788
Merge branch 'master' into 1uc/remove_read_T_star
Feb 8, 2024
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
10 changes: 0 additions & 10 deletions include/highfive/H5Attribute.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,6 @@ class Attribute: public Object, public PathTraits<Attribute> {
template <typename T>
void read(T& array) const;

/// \brief Read the attribute into a pre-allocated buffer.
/// \deprecated use `read(T&` or `read_raw`.
template <typename T>
void read(T* array, const DataType& mem_datatype) const;

/// \brief Read the attribute into a buffer.
/// \deprecated use `read(T&` or `read_raw`.
template <typename T>
void read(T* array) const;

/// \brief Read the attribute into a pre-allocated buffer.
/// \param array A pointer to the first byte of sufficient pre-allocated memory.
/// \param mem_datatype The DataType of the array.
Expand Down
10 changes: 0 additions & 10 deletions include/highfive/bits/H5Attribute_misc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,6 @@ inline void Attribute::read(T& array) const {
}
}

template <typename T>
inline void Attribute::read(T* array, const DataType& mem_datatype) const {
read_raw(array, mem_datatype);
}

template <typename T>
inline void Attribute::read_raw(T* array, const DataType& mem_datatype) const {
static_assert(!std::is_const<T>::value,
Expand All @@ -114,11 +109,6 @@ inline void Attribute::read_raw(T* array, const DataType& mem_datatype) const {
detail::h5a_read(getId(), mem_datatype.getId(), static_cast<void*>(array));
}

template <typename T>
inline void Attribute::read(T* array) const {
read_raw(array);
}

template <typename T>
inline void Attribute::read_raw(T* array) const {
using element_type = typename details::inspector<T>::base_type;
Expand Down
30 changes: 0 additions & 30 deletions include/highfive/bits/H5Slice_traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,36 +303,6 @@ class SliceTraits {
template <typename T>
void read(T& array, const DataTransferProps& xfer_props = DataTransferProps()) const;

///
/// Read the entire dataset into a raw buffer
///
/// \deprecated Use `read_raw` instead.
///
/// No dimensionality checks will be performed, it is the user's
/// responsibility to ensure that the right amount of space has been
/// allocated.
/// \param array: A buffer containing enough space for the data
/// \param dtype: The datatype of elements of the in memory buffer.
/// \param xfer_props: Data Transfer properties
template <typename T>
void read(T* array,
const DataType& dtype,
const DataTransferProps& xfer_props = DataTransferProps()) const;

///
/// Read the entire dataset into a raw buffer
///
/// \deprecated Use `read_raw` instead.
///
/// Same as `read(T*, const DataType&, const DataTransferProps&)`. However,
/// this overload deduces the HDF5 datatype of the element of `array` from
/// `T`. Note, that the file datatype is already fixed.
///
/// \param array: A buffer containing enough space for the data
/// \param xfer_props: Data Transfer properties
template <typename T>
void read(T* array, const DataTransferProps& xfer_props = DataTransferProps()) const;

///
/// Read the entire dataset into a raw buffer
///
Expand Down
14 changes: 0 additions & 14 deletions include/highfive/bits/H5Slice_traits_misc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,20 +207,6 @@ inline void SliceTraits<Derivate>::read(T& array, const DataTransferProps& xfer_
}
}

template <typename Derivate>
template <typename T>
inline void SliceTraits<Derivate>::read(T* array,
const DataType& mem_datatype,
const DataTransferProps& xfer_props) const {
read_raw(array, mem_datatype, xfer_props);
}

template <typename Derivate>
template <typename T>
inline void SliceTraits<Derivate>::read(T* array, const DataTransferProps& xfer_props) const {
read_raw(array, xfer_props);
}


template <typename Derivate>
template <typename T>
Expand Down
Loading