From 6329b2091bbd23e5969377501b178ed405446f3c Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 20 Aug 2024 15:29:12 -0400 Subject: [PATCH 1/2] fix: never use `..` in a header include Signed-off-by: Henry Schreiner --- include/pybind11/detail/class.h | 4 ++-- include/pybind11/detail/internals.h | 2 +- include/pybind11/detail/type_caster_base.h | 3 ++- include/pybind11/eigen/matrix.h | 3 ++- include/pybind11/eigen/tensor.h | 3 ++- include/pybind11/stl/filesystem.h | 10 +++++----- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/include/pybind11/detail/class.h b/include/pybind11/detail/class.h index 485f7ac63d..454c186b9a 100644 --- a/include/pybind11/detail/class.h +++ b/include/pybind11/detail/class.h @@ -9,8 +9,8 @@ #pragma once -#include "../attr.h" -#include "../options.h" +#include +#include PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE) PYBIND11_NAMESPACE_BEGIN(detail) diff --git a/include/pybind11/detail/internals.h b/include/pybind11/detail/internals.h index 329d89b93f..dec18f680e 100644 --- a/include/pybind11/detail/internals.h +++ b/include/pybind11/detail/internals.h @@ -15,7 +15,7 @@ # include "../gil.h" #endif -#include "../pytypes.h" +#include #include #include diff --git a/include/pybind11/detail/type_caster_base.h b/include/pybind11/detail/type_caster_base.h index 481b7c783c..bc42252f9d 100644 --- a/include/pybind11/detail/type_caster_base.h +++ b/include/pybind11/detail/type_caster_base.h @@ -9,7 +9,8 @@ #pragma once -#include "../pytypes.h" +#include + #include "common.h" #include "descr.h" #include "internals.h" diff --git a/include/pybind11/eigen/matrix.h b/include/pybind11/eigen/matrix.h index 8d4342f81b..5cf1f0a2a0 100644 --- a/include/pybind11/eigen/matrix.h +++ b/include/pybind11/eigen/matrix.h @@ -9,7 +9,8 @@ #pragma once -#include "../numpy.h" +#include + #include "common.h" /* HINT: To suppress warnings originating from the Eigen headers, use -isystem. diff --git a/include/pybind11/eigen/tensor.h b/include/pybind11/eigen/tensor.h index 14bb91c40f..0a9d7c2522 100644 --- a/include/pybind11/eigen/tensor.h +++ b/include/pybind11/eigen/tensor.h @@ -7,7 +7,8 @@ #pragma once -#include "../numpy.h" +#include + #include "common.h" #if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) diff --git a/include/pybind11/stl/filesystem.h b/include/pybind11/stl/filesystem.h index 935d794815..c16a9ae5c2 100644 --- a/include/pybind11/stl/filesystem.h +++ b/include/pybind11/stl/filesystem.h @@ -4,11 +4,11 @@ #pragma once -#include "../pybind11.h" -#include "../detail/common.h" -#include "../detail/descr.h" -#include "../cast.h" -#include "../pytypes.h" +#include +#include +#include +#include +#include #include From 63a355206e9083d14bf5838d086be9b7da5cec30 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 21 Aug 2024 12:28:47 -0400 Subject: [PATCH 2/2] fix: one more parent include Signed-off-by: Henry Schreiner --- include/pybind11/detail/internals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/pybind11/detail/internals.h b/include/pybind11/detail/internals.h index dec18f680e..17e6df8244 100644 --- a/include/pybind11/detail/internals.h +++ b/include/pybind11/detail/internals.h @@ -12,7 +12,7 @@ #include "common.h" #if defined(PYBIND11_SIMPLE_GIL_MANAGEMENT) -# include "../gil.h" +# include #endif #include