[Boost-commit] svn:boost r62544 - sandbox/SOC/2010/phoenix3/boost/phoenix

Subject: [Boost-commit] svn:boost r62544 - sandbox/SOC/2010/phoenix3/boost/phoenix
From: joel_at_[hidden]
Date: 2010-06-07 22:30:52

Author: djowel
Date: 2010-06-07 22:30:51 EDT (Mon, 07 Jun 2010)
New Revision: 62544
URL: http://svn.boost.org/trac/boost/changeset/62544

Log:
missed merge
Text files modified: 
   sandbox/SOC/2010/phoenix3/boost/phoenix/core.hpp |    13 ++++++++++++-                           
   1 files changed, 12 insertions(+), 1 deletions(-)

Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core.hpp	(original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core.hpp	2010-06-07 22:30:51 EDT (Mon, 07 Jun 2010)
@@ -7,6 +7,17 @@
 #ifndef PHOENIX_CORE_HPP
 #define PHOENIX_CORE_HPP
 
-#include <boost/spirit/home/phoenix/version.hpp>
+#include <boost/proto/proto.hpp>
+
+#include <boost/phoenix/version.hpp>
+#include <boost/phoenix/core/limits.hpp>
+#include <boost/phoenix/core/actor.hpp>
+#include <boost/phoenix/core/as_actor.hpp>
+#include <boost/phoenix/core/is_actor.hpp>
+#include <boost/phoenix/core/argument.hpp>
+#include <boost/phoenix/core/value.hpp>
+#include <boost/phoenix/core/reference.hpp>
+#include <boost/phoenix/core/nothing.hpp>
+//#include <boost/phoenix/core/extension.hpp>
 
 #endif