[Boost-commit] svn:boost r62675 - trunk/boost/fusion/container/set/detail

Subject: [Boost-commit] svn:boost r62675 - trunk/boost/fusion/container/set/detail
From: christophe.j.henry_at_[hidden]
Date: 2010-06-09 13:39:26

Author: chenry
Date: 2010-06-09 13:39:26 EDT (Wed, 09 Jun 2010)
New Revision: 62675
URL: http://svn.boost.org/trac/boost/changeset/62675

Log:
fixed conflict detected by g++4.x between fusion::at and mpl::at
Text files modified: 
   trunk/boost/fusion/container/set/detail/deref_impl.hpp |     2 +-                                      
   1 files changed, 1 insertions(+), 1 deletions(-)

Modified: trunk/boost/fusion/container/set/detail/deref_impl.hpp
==============================================================================
--- trunk/boost/fusion/container/set/detail/deref_impl.hpp	(original)
+++ trunk/boost/fusion/container/set/detail/deref_impl.hpp	2010-06-09 13:39:26 EDT (Wed, 09 Jun 2010)
@@ -36,7 +36,7 @@
             static type
             call(It const& it)
             {
-                return at<typename It::index>(it.seq->get_data());
+                return ::boost::fusion::at<typename It::index>(it.seq->get_data());
             }
         };
     };