From 3c4375986e146e9c80a2b01031b653ee801f112e Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Thu, 8 Dec 2022 22:11:33 +0100
Subject: [PATCH] TD: [skip ci] fix build failure with boost >= 1.78 on Windows

---
 src/Mod/TechDraw/App/AppTechDrawPy.cpp       |  2 +-
 src/Mod/TechDraw/App/DrawUtil.cpp            |  2 +-
 src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp |  2 +-
 src/Mod/TechDraw/App/PreCompiled.h           |  2 +-
 src/boost_regex.hpp                          | 16 ++++++++++++++++
 5 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 src/boost_regex.hpp

diff --git a/src/Mod/TechDraw/App/AppTechDrawPy.cpp b/src/Mod/TechDraw/App/AppTechDrawPy.cpp
index 9ad5c027a0..3330332779 100644
--- a/src/Mod/TechDraw/App/AppTechDrawPy.cpp
+++ b/src/Mod/TechDraw/App/AppTechDrawPy.cpp
@@ -34,7 +34,7 @@
 #include <TopoDS_Wire.hxx>
 #endif
 
-#include <boost/regex.hpp>
+#include <boost_regex.hpp>
 
 #include <App/DocumentObject.h>
 #include <App/DocumentObjectPy.h>
diff --git a/src/Mod/TechDraw/App/DrawUtil.cpp b/src/Mod/TechDraw/App/DrawUtil.cpp
index 1d011c010b..617b3fc805 100644
--- a/src/Mod/TechDraw/App/DrawUtil.cpp
+++ b/src/Mod/TechDraw/App/DrawUtil.cpp
@@ -28,7 +28,7 @@
 #include <cstring>
 #include <sstream>
 
-#include <boost/regex.hpp>
+#include <boost_regex.hpp>
 
 #include <QChar>
 #include <QPointF>
diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp
index 5636538f63..d5f75ba42a 100644
--- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp
+++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp
@@ -26,7 +26,7 @@
 #ifndef _PreComp_
 #include <iomanip>
 #include <sstream>
-#include <boost/regex.hpp>
+#include <boost_regex.hpp>
 #endif
 
 #include <App/Property.h>
diff --git a/src/Mod/TechDraw/App/PreCompiled.h b/src/Mod/TechDraw/App/PreCompiled.h
index 5ac70f8e99..8d30795913 100644
--- a/src/Mod/TechDraw/App/PreCompiled.h
+++ b/src/Mod/TechDraw/App/PreCompiled.h
@@ -47,7 +47,7 @@
 // boost
 #include <boost/graph/boyer_myrvold_planar_test.hpp>
 #include <boost/graph/is_kuratowski_subgraph.hpp>
-#include <boost/regex.hpp>
+#include <boost_regex.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_generators.hpp>
 #include <boost/uuid/uuid_io.hpp>
diff --git a/src/boost_regex.hpp b/src/boost_regex.hpp
new file mode 100644
index 0000000000..ed25454ac3
--- /dev/null
+++ b/src/boost_regex.hpp
@@ -0,0 +1,16 @@
+#ifndef FREECAD_REGEX_HPP_WORKAROUND
+#define FREECAD_REGEX_HPP_WORKAROUND
+
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 107800
+
+// Workaround for boost >= 1.78
+#ifdef WIN32
+#include <Windows.h>
+#endif
+
+#endif
+#include <boost/regex.hpp>
+
+#endif // #ifndef FREECAD_REGEX_HPP_WORKAROUND