[Boost-commit] svn:boost r71669 - in trunk/boost/phoenix/bind: . detail

Subject: [Boost-commit] svn:boost r71669 - in trunk/boost/phoenix/bind: . detail
From: thom.heller_at_[hidden]
Date: 2011-05-02 10:43:13

Author: theller
Date: 2011-05-02 10:43:12 EDT (Mon, 02 May 2011)
New Revision: 71669
URL: http://svn.boost.org/trac/boost/changeset/71669

Log:
[phoenix] fixed possible msvc hickup with bind
Removed:
   trunk/boost/phoenix/bind/bind.hpp
Text files modified: 
   trunk/boost/phoenix/bind/detail/member_variable.hpp |     6 ++++--                                  
   1 files changed, 4 insertions(+), 2 deletions(-)

Deleted: trunk/boost/phoenix/bind/bind.hpp
==============================================================================
--- trunk/boost/phoenix/bind/bind.hpp	2011-05-02 10:43:12 EDT (Mon, 02 May 2011)
+++ (empty file)
@@ -1,80 +0,0 @@
-
-#if !defined(BOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES)
-#ifndef BOOST_PHOENIX_BIND_BIND_HPP
-#define BOOST_PHOENIX_BIND_BIND_HPP
-
-#include <boost/phoenix/core/limits.hpp>
-#include <boost/phoenix/function.hpp>
-#include <boost/phoenix/support/iterate.hpp>
-#include <boost/utility/result_of.hpp>
-
-#include <boost/phoenix/bind/preprocessed/bind.hpp>
-
-#endif
-#else
-
-#if !BOOST_PHOENIX_IS_ITERATING
-
-#ifndef BOOST_PHOENIX_BIND_BIND_HPP
-#define BOOST_PHOENIX_BIND_BIND_HPP
-
-#include <boost/phoenix/core/limits.hpp>
-#include <boost/phoenix/function.hpp>
-#include <boost/phoenix/support/iterate.hpp>
-#include <boost/utility/result_of.hpp>
-
-#if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES)
-#pragma wave option(preserve: 2, line: 0, output: "preprocessed/bind_" BOOST_PHOENIX_LIMIT_STR ".hpp")
-#endif
-/*==============================================================================
-    Copyright (c) 2001-2010 Joel de Guzman
-    Copyright (c) 2010 Eric Niebler
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-
-#if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES)
-#pragma wave option(preserve: 1)
-#endif
-
-namespace boost { namespace phoenix
-{
-    ////////////////////////////////////////////////////////////////////////////
-    // Bind
-    ////////////////////////////////////////////////////////////////////////////
-    
-    template <typename F>
-    inline
-    typename expression::function<F>::type
-    bind(F f)
-    {
-        return function<F>(f)();
-    }
-
-#define BOOST_PHOENIX_ITERATION_PARAMS                                                \
-    (3, (1, BOOST_PHOENIX_ARG_LIMIT,                                                  \
-    <boost/phoenix/bind/bind.hpp>))
-#include BOOST_PHOENIX_ITERATE()
-
-}}
-
-#if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES)
-#pragma wave option(output: null)
-#endif
-
-#endif
-
-#else
-    
-    template <typename F, BOOST_PHOENIX_typename_A>
-    inline
-    typename expression::function<F, BOOST_PHOENIX_A>::type const
-    bind(F f, BOOST_PHOENIX_A_const_ref_a)
-    {
-        return function<F>(f)(BOOST_PHOENIX_a);
-    }
-
-#endif
-
-#endif // BOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES

Modified: trunk/boost/phoenix/bind/detail/member_variable.hpp
==============================================================================
--- trunk/boost/phoenix/bind/detail/member_variable.hpp	(original)
+++ trunk/boost/phoenix/bind/detail/member_variable.hpp	2011-05-02 10:43:12 EDT (Mon, 02 May 2011)
@@ -11,8 +11,6 @@
 
 namespace boost { namespace phoenix { namespace detail {
 
-        BOOST_PROTO_USE_GET_POINTER();
-
         template <typename RT, typename MP>
         struct member_variable
         {
@@ -45,6 +43,8 @@
             template <typename Class>
             RT& operator()(Class& obj) const
             {
+                BOOST_PROTO_USE_GET_POINTER();
+
                 typedef typename proto::detail::classtypeof<MP>::type class_type;
                 return (BOOST_PROTO_GET_POINTER(class_type, obj)->*mp);
             }
@@ -58,6 +58,8 @@
             template <typename Class>
             RT const& operator()(Class const& obj) const
             {
+                BOOST_PROTO_USE_GET_POINTER();
+
                 typedef typename proto::detail::classtypeof<MP>::type class_type;
                 return (BOOST_PROTO_GET_POINTER(class_type, obj)->*mp);
             }