From 2a88b87682d4f08102d0e7bb6234c449c2c67dbe Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Sat, 13 Dec 2014 20:41:03 +0000
Subject: [PATCH] Dropped support for obsolete phoenix V2

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@760 860be788-9bd5-4423-9f1e-828f051e677b
---
 build/boost/doc/changelog.qbk   | 5 +++++
 test/detail/test_is_functor.cpp | 4 ----
 test/test_log.cpp               | 5 -----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/build/boost/doc/changelog.qbk b/build/boost/doc/changelog.qbk
index e942308..c7e669c 100644
--- a/build/boost/doc/changelog.qbk
+++ b/build/boost/doc/changelog.qbk
@@ -7,6 +7,11 @@
 
 [section Changelog]
 
+[section trunk]
+Not yet released
+
+* Dropped support for obsolete Boost.Phoenix V2
+
 [section 1.2.6]
 Released 24 May 2014
 
diff --git a/test/detail/test_is_functor.cpp b/test/detail/test_is_functor.cpp
index 666558d..597cf0c 100644
--- a/test/detail/test_is_functor.cpp
+++ b/test/detail/test_is_functor.cpp
@@ -12,11 +12,7 @@
 #pragma warning( push, 0 )
 #endif
 #include <boost/lambda/lambda.hpp>
-#   ifdef BOOST_PHOENIX_USE_V2_OVER_V3
-#include <boost/spirit/home/phoenix.hpp>
-#   else
 #include <boost/phoenix/phoenix.hpp>
-#   endif
 #ifdef BOOST_MSVC
 #pragma warning( pop )
 #endif
diff --git a/test/test_log.cpp b/test/test_log.cpp
index 0502991..436a62d 100644
--- a/test/test_log.cpp
+++ b/test/test_log.cpp
@@ -15,13 +15,8 @@
 #ifdef BOOST_MSVC
 #pragma warning( push, 0 )
 #endif
-#   ifdef BOOST_PHOENIX_USE_V2_OVER_V3
-#include <boost/spirit/home/phoenix.hpp>
-#include <boost/spirit/home/phoenix/bind.hpp>
-#   else
 #include <boost/phoenix/phoenix.hpp>
 #include <boost/phoenix/bind.hpp>
-#   endif
 #ifdef BOOST_MSVC
 #pragma warning( pop )
 #endif