diff --git a/src/App/Expression.cpp b/src/App/Expression.cpp index de135ccf61..a68118389f 100644 --- a/src/App/Expression.cpp +++ b/src/App/Expression.cpp @@ -3258,16 +3258,16 @@ static void initParser(const App::DocumentObject *owner) } } -std::vector > tokenize(const std::string &str) +std::vector > tokenize(const std::string &str) { ExpressionParser::YY_BUFFER_STATE buf = ExpressionParser_scan_string(str.c_str()); - std::vector > result; + std::vector > result; int token; column = 0; try { while ( (token = ExpressionParserlex()) != 0) - result.push_back(boost::make_tuple(token, ExpressionParser::last_column, yytext)); + result.push_back(std::make_tuple(token, ExpressionParser::last_column, yytext)); } catch (...) { // Ignore all exceptions diff --git a/src/App/Expression.h b/src/App/Expression.h index d6e269e799..d0071500b0 100644 --- a/src/App/Expression.h +++ b/src/App/Expression.h @@ -24,7 +24,7 @@ #define EXPRESSION_H #include -#include +#include #include #include #include diff --git a/src/App/ExpressionParser.h b/src/App/ExpressionParser.h index ce1d4c2200..0e3b9f8a95 100644 --- a/src/App/ExpressionParser.h +++ b/src/App/ExpressionParser.h @@ -451,7 +451,7 @@ AppExport UnitExpression * parseUnit(const App::DocumentObject *owner, const cha AppExport ObjectIdentifier parsePath(const App::DocumentObject *owner, const char* buffer); AppExport bool isTokenAnIndentifier(const std::string & str); AppExport bool isTokenAUnit(const std::string & str); -AppExport std::vector > tokenize(const std::string & str); +AppExport std::vector > tokenize(const std::string & str); /// Convenient class to mark begin of importing class AppExport ExpressionImporter { diff --git a/src/App/PreCompiled.h b/src/App/PreCompiled.h index b52ee733bc..f72e640986 100644 --- a/src/App/PreCompiled.h +++ b/src/App/PreCompiled.h @@ -78,13 +78,13 @@ #include #include #include +#include // Boost #include #include #include -#include #include #include