From 024f81c3ee60050e3291052d18d601e174484ffe Mon Sep 17 00:00:00 2001
From: Joel de Guzman <djowel@gmail.com>
Date: Thu, 10 Jun 2010 06:52:06 +0000
Subject: [PATCH] + the environment concept + better result_of modularization

[SVN r62712]
---
 include/boost/phoenix/core/environment.hpp |  4 ++--
 include/boost/phoenix/core/nothing.hpp     | 18 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/include/boost/phoenix/core/environment.hpp b/include/boost/phoenix/core/environment.hpp
index 7984fa2..1d2e448 100644
--- a/include/boost/phoenix/core/environment.hpp
+++ b/include/boost/phoenix/core/environment.hpp
@@ -11,8 +11,8 @@
 
 namespace boost { namespace phoenix 
 {
-//    template <typename T, typename Enable = void>
-//    struct is_environment : fusion::is_sequence<T> {};
+    template <typename T, typename Enable = void>
+    struct is_environment : fusion::traits::is_sequence<T> {};
     
     namespace result_of 
     {
diff --git a/include/boost/phoenix/core/nothing.hpp b/include/boost/phoenix/core/nothing.hpp
index 8c7f021..7ce4665 100644
--- a/include/boost/phoenix/core/nothing.hpp
+++ b/include/boost/phoenix/core/nothing.hpp
@@ -12,26 +12,24 @@
 
 namespace boost { namespace phoenix
 {
-///////////////////////////////////////////////////////////////////////////////
-//
-//  null_actor
-//
-//      A actor that does nothing (a "bum", if you will :-).
-//
-///////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    //  null_actor
+    //
+    //      A actor that does nothing (a "bum", if you will :-).
+    //
+    ////////////////////////////////////////////////////////////////////////////
     struct null_actor
     {
         typedef void result_type;
 
         template <typename Env>
-        void
-        eval(Env const&) const
+        void eval(Env const&) const
         {
         }
     };
 
     as_actor<null_actor, actor>::result_type const nothing = {};
-
 }}
 
 #endif