From 6d66f5dde8fbf7d9249a20f1634846a26794e7d2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 15 Jan 2025 12:53:19 -0500 Subject: [PATCH] Include for fixed-width integers in API headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit At least in the API headers, include everywhere that fixed-width integer types `int32_t`, `uint32_t`, or `uint64_t` are used. Including headers everywhere they are used avoids relying on indirectly including them via the C++ standard library, which tends to break with new compiler versions. This change doesn’t implement that idea project-wide even for ``, let alone in general, but it is enough to fix failure to build with GCC 15. --- include/morphio/mitochondria.h | 1 + include/morphio/morphology.h | 2 ++ include/morphio/mut/endoplasmic_reticulum.h | 2 ++ include/morphio/mut/glial_cell.h | 2 ++ include/morphio/mut/mitochondria.h | 1 + include/morphio/mut/morphology.h | 1 + include/morphio/mut/section.h | 2 ++ include/morphio/properties.h | 2 +- include/morphio/vasc/properties.h | 1 + include/morphio/vasc/section.h | 1 + include/morphio/vasc/vasculature.h | 1 + include/morphio/warning_handling.h | 1 + 12 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/morphio/mitochondria.h b/include/morphio/mitochondria.h index b43bcea69..a740db2ff 100644 --- a/include/morphio/mitochondria.h +++ b/include/morphio/mitochondria.h @@ -4,6 +4,7 @@ */ #pragma once +#include // uint32_t #include #include diff --git a/include/morphio/morphology.h b/include/morphio/morphology.h index 81efb25c4..01d0d1e3b 100644 --- a/include/morphio/morphology.h +++ b/include/morphio/morphology.h @@ -4,6 +4,8 @@ */ #pragma once +#include // uint32_t + #include #include diff --git a/include/morphio/mut/endoplasmic_reticulum.h b/include/morphio/mut/endoplasmic_reticulum.h index 9d460e1f8..e8923286e 100644 --- a/include/morphio/mut/endoplasmic_reticulum.h +++ b/include/morphio/mut/endoplasmic_reticulum.h @@ -4,6 +4,8 @@ */ #pragma once +#include // uint32_t + #include #include diff --git a/include/morphio/mut/glial_cell.h b/include/morphio/mut/glial_cell.h index 39ab8e551..468e6dd0d 100644 --- a/include/morphio/mut/glial_cell.h +++ b/include/morphio/mut/glial_cell.h @@ -4,6 +4,8 @@ */ #pragma once +#include // uint32_t + #include // std::string #include // mut::Morphology diff --git a/include/morphio/mut/mitochondria.h b/include/morphio/mut/mitochondria.h index 80942eaca..b38b2e4b4 100644 --- a/include/morphio/mut/mitochondria.h +++ b/include/morphio/mut/mitochondria.h @@ -4,6 +4,7 @@ */ #pragma once +#include // uint32_t #include #include diff --git a/include/morphio/mut/morphology.h b/include/morphio/mut/morphology.h index 9a315713e..a2cebecf4 100644 --- a/include/morphio/mut/morphology.h +++ b/include/morphio/mut/morphology.h @@ -4,6 +4,7 @@ */ #pragma once +#include // uint32_t #include #include #include diff --git a/include/morphio/mut/section.h b/include/morphio/mut/section.h index d7cca8c08..ff8b08854 100644 --- a/include/morphio/mut/section.h +++ b/include/morphio/mut/section.h @@ -4,6 +4,8 @@ */ #pragma once +#include // uint32_t + #include #include #include diff --git a/include/morphio/properties.h b/include/morphio/properties.h index f5a3c4f1a..9ec90752a 100644 --- a/include/morphio/properties.h +++ b/include/morphio/properties.h @@ -1,6 +1,6 @@ #pragma once -#include // uint32_t +#include // int32_t, uint32_t #include #include diff --git a/include/morphio/vasc/properties.h b/include/morphio/vasc/properties.h index 30aa4e86f..03e69c240 100644 --- a/include/morphio/vasc/properties.h +++ b/include/morphio/vasc/properties.h @@ -4,6 +4,7 @@ */ #pragma once +#include // uint32_t #include #include // std::string #include // std::vector diff --git a/include/morphio/vasc/section.h b/include/morphio/vasc/section.h index e79a15032..c0c1853a0 100644 --- a/include/morphio/vasc/section.h +++ b/include/morphio/vasc/section.h @@ -4,6 +4,7 @@ */ #pragma once +#include // uint32_t #include // std::ostream #include // std::shared_ptr #include // std::vector diff --git a/include/morphio/vasc/vasculature.h b/include/morphio/vasc/vasculature.h index a2f38e028..8652d5ed5 100644 --- a/include/morphio/vasc/vasculature.h +++ b/include/morphio/vasc/vasculature.h @@ -4,6 +4,7 @@ */ #pragma once +#include // uint32_t #include // std::shared_ptr #include // std::string #include // std::vector diff --git a/include/morphio/warning_handling.h b/include/morphio/warning_handling.h index 0c8ef28fd..2a6aef710 100644 --- a/include/morphio/warning_handling.h +++ b/include/morphio/warning_handling.h @@ -4,6 +4,7 @@ */ #pragma once +#include // int32_t, uint32_t, uint64_t #include #include #include