Skip to content

Commit

Permalink
[HDF] Fix clash of names with new upstream function
Browse files Browse the repository at this point in the history
HighFive 2.7.0 introduces a new create_enum_boolean function, which
clashes with an existing local function in Storage.cpp. The local
function is renamed as a solution.
  • Loading branch information
ischoegl committed Apr 1, 2023
1 parent 5e04031 commit 60de5a8
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/base/Storage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,20 @@

namespace h5 = HighFive;

// Implement read/wrote support for Booleans
// Note that HighFive 2.7.0 introduces native boolean support

enum class H5Boolean {
FALSE = 0,
TRUE = 1,
};

h5::EnumType<H5Boolean> create_enum_boolean() {
h5::EnumType<H5Boolean> create_h5_boolean() {
return {{"FALSE", H5Boolean::FALSE},
{"TRUE", H5Boolean::TRUE}};
}

HIGHFIVE_REGISTER_TYPE(H5Boolean, create_enum_boolean)
HIGHFIVE_REGISTER_TYPE(H5Boolean, create_h5_boolean)

#endif

Expand Down

0 comments on commit 60de5a8

Please sign in to comment.