From 1f170e3d2386dc3b40d06eb61df027e9c7f45cc9 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 21 May 2022 06:28:07 +0200 Subject: [PATCH] Mod: handle removed headers in PCH files for OCC 7.6 --- src/Mod/Drawing/App/PreCompiled.h | 4 ---- src/Mod/Fem/App/PreCompiled.h | 5 ++++- src/Mod/MeshPart/App/PreCompiled.h | 4 ---- src/Mod/Part/App/OpenCascadeAll.h | 20 ++++++++------------ 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/Mod/Drawing/App/PreCompiled.h b/src/Mod/Drawing/App/PreCompiled.h index 18fba82600..853f563786 100644 --- a/src/Mod/Drawing/App/PreCompiled.h +++ b/src/Mod/Drawing/App/PreCompiled.h @@ -174,13 +174,9 @@ #include #include #include -#include #include -#include -#include #include #include -#include #include #include #include diff --git a/src/Mod/Fem/App/PreCompiled.h b/src/Mod/Fem/App/PreCompiled.h index 44ed064080..6c97c9c1f8 100644 --- a/src/Mod/Fem/App/PreCompiled.h +++ b/src/Mod/Fem/App/PreCompiled.h @@ -119,7 +119,6 @@ #include #include #include -#include #include #include #include @@ -143,6 +142,7 @@ #include #include #include +#include #include #include #include @@ -151,6 +151,9 @@ #include #include #include +#if OCC_VERSION_HEX < 0x070600 +#include +#endif // VTK #include diff --git a/src/Mod/MeshPart/App/PreCompiled.h b/src/Mod/MeshPart/App/PreCompiled.h index f245301f7e..15617e2740 100644 --- a/src/Mod/MeshPart/App/PreCompiled.h +++ b/src/Mod/MeshPart/App/PreCompiled.h @@ -185,13 +185,9 @@ #include #include #include -#include #include -#include -#include #include #include -#include #include #include #include diff --git a/src/Mod/Part/App/OpenCascadeAll.h b/src/Mod/Part/App/OpenCascadeAll.h index e847c7d7b3..ef654837ea 100644 --- a/src/Mod/Part/App/OpenCascadeAll.h +++ b/src/Mod/Part/App/OpenCascadeAll.h @@ -188,12 +188,18 @@ #if OCC_VERSION_HEX >= 0x060600 #include #endif +#if OCC_VERSION_HEX < 0x070600 +#include +#include +#include +#include +#include +#include +#endif #include #include #include -#include -#include #include #include #include @@ -325,7 +331,6 @@ #include #include #include -#include #include #include #include @@ -363,7 +368,6 @@ #include #include #include -#include #include #include #include @@ -432,10 +436,6 @@ #include #include -// Adaptors -#include -#include - #include #include @@ -447,15 +447,11 @@ #include #include #include -#include #include #include #include -#include -#include #include #include -#include #include // Shape