Skip to content

Commit d461f20

Browse files
author
steven varga
committed
Merge remote-tracking branch 'origin/289-fix-macro-redef' into staging
2 parents de82de0 + 4d985de commit d461f20

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

h5cpp/H5Tmeta.hpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,12 @@
2626
#include <cstring>
2727
#include <utility>
2828

29-
//FIXME: move it elsewhere
30-
#define H5CPP_supported_elementary_types "supported elementary types ::= pod_struct | float | double | [signed](int8 | int16 | int32 | int64)"
29+
// H5CPP_supported_elementary_types is defined once in H5misc.hpp (the
30+
// canonical copy that includes `enum`); H5misc is always pulled in ahead of
31+
// this header via h5cpp/core, and the macro is only consumed by the
32+
// static_assert diagnostics in H5Dread/H5Dwrite. The duplicate definition
33+
// that used to live here conflicted with H5misc's and produced a redefinition
34+
// warning in every TU including core (#289).
3135

3236
// stl detection with templates, this probably should stay until concepts become mainstream
3337
namespace h5::meta {

0 commit comments

Comments
 (0)