Boost logo

Boost-Commit :

From: hartmut.kaiser_at_[hidden]
Date: 2008-04-29 21:57:39


Author: hkaiser
Date: 2008-04-29 21:57:39 EDT (Tue, 29 Apr 2008)
New Revision: 44904
URL: http://svn.boost.org/trac/boost/changeset/44904

Log:
Spirit.Karma: Fixing ref() ambiguity
Text files modified:
   trunk/libs/spirit/test/karma/lazy.cpp | 10 +++++-----
   1 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/libs/spirit/test/karma/lazy.cpp
==============================================================================
--- trunk/libs/spirit/test/karma/lazy.cpp (original)
+++ trunk/libs/spirit/test/karma/lazy.cpp 2008-04-29 21:57:39 EDT (Tue, 29 Apr 2008)
@@ -25,16 +25,16 @@
     using spirit_test::test;
     using namespace boost::spirit;
     using namespace boost::spirit::karma;
- using namespace boost::phoenix;
     using namespace boost::spirit::arg_names;
+ namespace phx = boost::phoenix;
 
     {
- BOOST_TEST(test("123", lazy(val(int_)), 123));
+ BOOST_TEST(test("123", lazy(phx::val(int_)), 123));
     }
 
     {
         int result = 123;
- BOOST_TEST(test("123", lazy(val(int_))[_1 = ref(result)]));
+ BOOST_TEST(test("123", lazy(phx::val(int_))[_1 = phx::ref(result)]));
     }
 
     {
@@ -44,8 +44,8 @@
         r = char_('<') << lazy(_r1) << '>' << "</" << lazy(_r1) << '>';
 
         std::string tag("tag"), foo("foo");
- BOOST_TEST(test("<tag></tag>", r (ref(tag))));
- BOOST_TEST(!test("<foo></bar>", r (ref(foo))));
+ BOOST_TEST(test("<tag></tag>", r (phx::ref(tag))));
+ BOOST_TEST(!test("<foo></bar>", r (phx::ref(foo))));
     }
 
     return boost::report_errors();


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk