+ fixes #2347: freecad fails to build with Boost 1.60.0

FreeCAD · Dec 28, 2015 · e0683f4 · e0683f4
1 parent 07ba938
commit e0683f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Mod/Drawing/App/FeaturePage.cpp b/src/Mod/Drawing/App/FeaturePage.cpp
@@ -211,7 +211,7 @@ App::DocumentObjectExecReturn *FeaturePage::execute(void)
             if (count < editText.size()) {
                 // change values of editable texts
                 boost::regex e2 ("(<text.*?freecad:editable=\""+what[1].str()+"\".*?<tspan.*?)>(.*?)(</tspan>)");
-                boost::re_detail::string_out_iterator<std::string > out(newfragment);
+                std::back_insert_iterator<std::string> out(newfragment);
                 boost::regex_replace(out, begin, what[0].second, e2, "$1>"+editText[count]+"$3");
             }
             count++;

diff --git a/src/Mod/Drawing/App/FeatureViewSymbol.cpp b/src/Mod/Drawing/App/FeatureViewSymbol.cpp
@@ -28,6 +28,7 @@
 #endif
 
 #include <iomanip>
+#include <iterator>
 #include <boost/regex.hpp>
 
 #include <Base/Exception.h>
@@ -103,7 +104,7 @@ App::DocumentObjectExecReturn *FeatureViewSymbol::execute(void)
                 // change values of editable texts. Also strip the "freecad:editable"
                 // attribute so it isn't detected by the page
                 boost::regex e2 ("(<text.*?)(freecad:editable=\""+what[1].str()+"\")(.*?<tspan.*?)>(.*?)(</tspan>)");
-                boost::re_detail::string_out_iterator<std::string > out(newsvg);
+                std::back_insert_iterator<std::string> out(newsvg);
                 boost::regex_replace(out, begin, what[0].second, e2, "$1$3>"+editText[count]+"$5");
             }
             count++;