Some fixes for DatatypeMacros

franzpoeschel · Nov 9, 2023 · 54f14bc · 54f14bc
1 parent 01fa2c3
commit 54f14bc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/include/openPMD/DatatypeMacros.hpp b/include/openPMD/DatatypeMacros.hpp
@@ -18,7 +18,11 @@
  * and the GNU Lesser General Public License along with openPMD-api.
  * If not, see <http://www.gnu.org/licenses/>.
  */
-#pragma once
+
+// sic!
+// no #pragma once
+// Since the macros can be un-defined with UndefDatatypeMacros.hpp, this header
+// may be included multiple times into one translation unit
 
 #include <array>
 #include <complex>
@@ -89,7 +93,6 @@ using openpmd_array_double_7 = std::array<double, 7>;
     MACRO(std::complex<double>)                                                \
     MACRO(std::complex<long double>)                                           \
     MACRO(std::string)                                                         \
-    MACRO(array_double_7)                                                      \
     MACRO(bool)
 
 #define OPENPMD_FOREACH_DATASET_DATATYPE(MACRO)                                \
@@ -109,5 +112,4 @@ using openpmd_array_double_7 = std::array<double, 7>;
     MACRO(long double)                                                         \
     MACRO(std::complex<float>)                                                 \
     MACRO(std::complex<double>)                                                \
-    MACRO(std::complex<long double>)                                           \
-    MACRO(std::array<double, 7>)
+    MACRO(std::complex<long double>)
diff --git a/include/openPMD/backend/Attribute.hpp b/include/openPMD/backend/Attribute.hpp
@@ -21,10 +21,13 @@
 #pragma once
 
 #include "openPMD/Datatype.hpp"
-#include "openPMD/DatatypeMacros.hpp"
 #include "openPMD/auxiliary/TypeTraits.hpp"
 #include "openPMD/auxiliary/Variant.hpp"
 
+// comment to prevent clang-format from moving this #include up
+// datatype macros may be included and un-included in other headers
+#include "openPMD/DatatypeMacros.hpp"
+
 #include <algorithm>
 #include <array>
 #include <complex>