summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Boost/src/boost/phoenix/core.hpp')
-rw-r--r--3rdParty/Boost/src/boost/phoenix/core.hpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/3rdParty/Boost/src/boost/phoenix/core.hpp b/3rdParty/Boost/src/boost/phoenix/core.hpp
index 0eb2bc8..eb1c987 100644
--- a/3rdParty/Boost/src/boost/phoenix/core.hpp
+++ b/3rdParty/Boost/src/boost/phoenix/core.hpp
@@ -7,12 +7,10 @@
#ifndef BOOST_PHOENIX_CORE_HPP
#define BOOST_PHOENIX_CORE_HPP
-#ifdef BOOST_PHOENIX_USE_V2_OVER_V3
-#include <boost/spirit/home/phoenix/core.hpp>
-#else
#include <boost/phoenix/version.hpp>
#include <boost/phoenix/core/limits.hpp>
#include <boost/phoenix/core/actor.hpp>
+#include <boost/phoenix/core/debug.hpp>
#include <boost/phoenix/core/is_actor.hpp>
#include <boost/phoenix/core/argument.hpp>
#include <boost/phoenix/core/value.hpp>
@@ -21,6 +19,7 @@
#include <boost/phoenix/core/function_equal.hpp>
#include <boost/phoenix/core/visit_each.hpp>
#include <boost/phoenix/core/v2_eval.hpp>
-#endif
+#include <boost/phoenix/scope/local_variable.hpp> // to fix 5824
+#include <boost/proto/generate.hpp> // attempt to fix problems in intel 14.0.1
#endif