From 6b5e015f94ef46dd6e73d6f1f653d3f20d9d160a Mon Sep 17 00:00:00 2001 From: Uwe Date: Tue, 20 Dec 2022 02:56:10 +0100 Subject: [PATCH] [skip ci] [Mesh] add comment for boost --- .../MeshPart/App/MeshFlatteningBoostPython.cpp | 2 ++ src/boost_regex.hpp | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Mod/MeshPart/App/MeshFlatteningBoostPython.cpp b/src/Mod/MeshPart/App/MeshFlatteningBoostPython.cpp index 1efb7d6115..7c332318ef 100644 --- a/src/Mod/MeshPart/App/MeshFlatteningBoostPython.cpp +++ b/src/Mod/MeshPart/App/MeshFlatteningBoostPython.cpp @@ -31,6 +31,8 @@ # include #endif +// boost is purposely not in the precompiled headers, see +// https://github.com/FreeCAD/FreeCAD/pull/7979#issuecomment-1358123252 #include #include #include diff --git a/src/boost_regex.hpp b/src/boost_regex.hpp index 48d6e5e870..ac5b5fbced 100644 --- a/src/boost_regex.hpp +++ b/src/boost_regex.hpp @@ -3,17 +3,16 @@ #include -#if BOOST_VERSION >= 107800 - // Workaround for boost >= 1.78 -#ifdef WIN32 -#ifndef NOMINMAX -#define NOMINMAX -#endif -#include +#if BOOST_VERSION >= 107800 +# ifdef WIN32 +# ifndef NOMINMAX +# define NOMINMAX +# endif +# include +# endif #endif -#endif #include #endif // #ifndef FREECAD_REGEX_HPP_WORKAROUND