From 3eba56d463f3b02ae3b2bd68e45babe04370305c Mon Sep 17 00:00:00 2001 From: WandererFan Date: Wed, 18 May 2016 23:02:47 -0400 Subject: [PATCH] Apply fix (FC2347) for boost v1.60.0 --- src/Mod/TechDraw/App/DrawViewClip.cpp | 1 - src/Mod/TechDraw/App/DrawViewDimension.cpp | 1 - src/Mod/TechDraw/App/DrawViewDraft.cpp | 1 - src/Mod/TechDraw/App/DrawViewSymbol.cpp | 3 ++- src/Mod/TechDraw/Gui/CommandCreateDims.cpp | 1 - src/Mod/TechDraw/Gui/CommandDecorate.cpp | 1 - 6 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawViewClip.cpp b/src/Mod/TechDraw/App/DrawViewClip.cpp index eaf711d54..27f3a163f 100644 --- a/src/Mod/TechDraw/App/DrawViewClip.cpp +++ b/src/Mod/TechDraw/App/DrawViewClip.cpp @@ -33,7 +33,6 @@ #include #include #include -#include #include #include "DrawViewClip.h" diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp index f602511a7..a33abaa22 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp @@ -27,7 +27,6 @@ # include # include # include -# include # include # include # include diff --git a/src/Mod/TechDraw/App/DrawViewDraft.cpp b/src/Mod/TechDraw/App/DrawViewDraft.cpp index 38d43c26b..2d7aba66d 100644 --- a/src/Mod/TechDraw/App/DrawViewDraft.cpp +++ b/src/Mod/TechDraw/App/DrawViewDraft.cpp @@ -28,7 +28,6 @@ #endif #include -#include #include #include diff --git a/src/Mod/TechDraw/App/DrawViewSymbol.cpp b/src/Mod/TechDraw/App/DrawViewSymbol.cpp index a1a636407..3273fe6cc 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbol.cpp +++ b/src/Mod/TechDraw/App/DrawViewSymbol.cpp @@ -28,6 +28,7 @@ #endif #include +#include #include #include @@ -104,7 +105,7 @@ App::DocumentObjectExecReturn *DrawViewSymbol::execute(void) // change values of editable texts. Also strip the "freecad:editable" // attribute so it isn't detected by the page boost::regex e2 ("((.*?)()"); - boost::re_detail::string_out_iterator out(newsvg); + std::back_insert_iterator out(newsvg); boost::regex_replace(out, begin, what[0].second, e2, "$1$3>"+editText[count]+"$5"); } count++; diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp index 55a61fd39..1a5fc5c81 100644 --- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp @@ -28,7 +28,6 @@ # include # include # include -# include #endif //#ifndef _PreComp_ #include diff --git a/src/Mod/TechDraw/Gui/CommandDecorate.cpp b/src/Mod/TechDraw/Gui/CommandDecorate.cpp index 1e9f364b5..16e8829ec 100644 --- a/src/Mod/TechDraw/Gui/CommandDecorate.cpp +++ b/src/Mod/TechDraw/Gui/CommandDecorate.cpp @@ -28,7 +28,6 @@ # include # include # include -# include #endif //#ifndef _PreComp_ #include