[Boost-commit] svn:boost r57121 - branches/release/boost/spirit/home/phoenix/operator/detail

Subject: [Boost-commit] svn:boost r57121 - branches/release/boost/spirit/home/phoenix/operator/detail
From: hartmut.kaiser_at_[hidden]
Date: 2009-10-23 22:55:08

Author: hkaiser
Date: 2009-10-23 22:55:08 EDT (Fri, 23 Oct 2009)
New Revision: 57121
URL: http://svn.boost.org/trac/boost/changeset/57121

Log:
Phoenix: disambiguating addressof for vc10 (merging from trunk)
Text files modified: 
   branches/release/boost/spirit/home/phoenix/operator/detail/io.hpp |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

Modified: branches/release/boost/spirit/home/phoenix/operator/detail/io.hpp
==============================================================================
--- branches/release/boost/spirit/home/phoenix/operator/detail/io.hpp	(original)
+++ branches/release/boost/spirit/home/phoenix/operator/detail/io.hpp	2009-10-23 22:55:08 EDT (Fri, 23 Oct 2009)
@@ -31,7 +31,7 @@
     {
         static T x;
         BOOST_STATIC_CONSTANT(bool,
-            value = sizeof(detail::ostream_test(addressof(x))) == sizeof(yes));
+            value = sizeof(detail::ostream_test(boost::addressof(x))) == sizeof(yes));
     };
 
     template <typename T>
@@ -39,7 +39,7 @@
     {
         static T x;
         BOOST_STATIC_CONSTANT(bool,
-            value = sizeof(detail::istream_test(addressof(x))) == sizeof(yes));
+            value = sizeof(detail::istream_test(boost::addressof(x))) == sizeof(yes));
     };
 
     template <typename T0, typename T1>