From bf78e1c9d7ab59c604eea3ca4a7c384517bf764c Mon Sep 17 00:00:00 2001
From: Jochem Snuverink <jochem.snuverink@psi.ch>
Date: Tue, 1 Oct 2019 16:07:12 +0200
Subject: [PATCH] fix compiler error with boost 1.68 : ambiguity of _1 and _2,
make explicit
---
optimizer/Expression/Parser/evaluator.hpp | 7 ++++---
optimizer/Expression/Parser/requirements.hpp | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/optimizer/Expression/Parser/evaluator.hpp b/optimizer/Expression/Parser/evaluator.hpp
index 66e03d85c..62c579ff6 100644
--- a/optimizer/Expression/Parser/evaluator.hpp
+++ b/optimizer/Expression/Parser/evaluator.hpp
@@ -31,12 +31,13 @@ namespace client { namespace code_gen
template <typename ErrorHandler>
StackEvaluator(ErrorHandler& error_handler_)
{
- using namespace boost::phoenix::arg_names;
namespace phx = boost::phoenix;
using boost::phoenix::function;
- error_handler = function<ErrorHandler>(error_handler_)(
- std::string("Error! "), _2, phx::cref(error_handler_.iters)[_1]);
+ error_handler = function<ErrorHandler>(error_handler_)
+ (std::string("Error! "),
+ phx::arg_names::_2,
+ phx::cref(error_handler_.iters)[phx::arg_names::_1]);
}
double result() {
diff --git a/optimizer/Expression/Parser/requirements.hpp b/optimizer/Expression/Parser/requirements.hpp
index f9b1d329c..50b8a26b2 100644
--- a/optimizer/Expression/Parser/requirements.hpp
+++ b/optimizer/Expression/Parser/requirements.hpp
@@ -25,12 +25,13 @@ namespace client { namespace code_gen
template <typename ErrorHandler>
requirements(ErrorHandler& error_handler_)
{
- using namespace boost::phoenix::arg_names;
namespace phx = boost::phoenix;
using boost::phoenix::function;
- error_handler = function<ErrorHandler>(error_handler_)(
- std::string("Error! "), _2, phx::cref(error_handler_.iters)[_1]);
+ error_handler = function<ErrorHandler>(error_handler_)
+ (std::string("Error! "),
+ phx::arg_names::_2,
+ phx::cref(error_handler_.iters)[phx::arg_names::_1]);
}
bool operator()(ast::nil) { BOOST_ASSERT(0); return false; }
--
GitLab