[Boost-commit] svn:boost r57041 - trunk/libs/spirit/test/qi

Subject: [Boost-commit] svn:boost r57041 - trunk/libs/spirit/test/qi
From: joel_at_[hidden]
Date: 2009-10-21 10:05:38

Author: djowel
Date: 2009-10-21 10:05:37 EDT (Wed, 21 Oct 2009)
New Revision: 57041
URL: http://svn.boost.org/trac/boost/changeset/57041

Log:
fix unwanted merge
Text files modified: 
   trunk/libs/spirit/test/qi/alternative.cpp |     6 +++---                                  
   1 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/libs/spirit/test/qi/alternative.cpp
==============================================================================
--- trunk/libs/spirit/test/qi/alternative.cpp	(original)
+++ trunk/libs/spirit/test/qi/alternative.cpp	2009-10-21 10:05:37 EDT (Wed, 21 Oct 2009)
@@ -86,7 +86,7 @@
     }
 
     {
-        boost::variant</*unused_type,*/ int, char, unused_type> v;
+        boost::variant<unused_type, int, char> v;
 
         BOOST_TEST((test_attr("12345", lit("rock") | int_ | char_, v)));
         BOOST_TEST(boost::get<int>(v) == 12345);
@@ -115,7 +115,7 @@
     {   // test action
 
         namespace phoenix = boost::phoenix;
-        boost::variant<int, char, unused_type> v;
+        boost::variant<unused_type, int, char> v;
 
         BOOST_TEST((test("12345", (lit("rock") | int_ | char_)[phoenix::ref(v) = _1])));
         BOOST_TEST(boost::get<int>(v) == 12345);
@@ -175,7 +175,7 @@
         BOOST_TEST( (test("ab1_", lexeme[*(alnum | char_('_'))][test_action('_')])) );
         BOOST_TEST( (test("ab12", lexeme[*(alpha | digit)][test_action('2')])) );
 
-        //~ BOOST_TEST( (test("abcab12", lexeme[*("abc" | alnum)][test_action_2()])) );
+        BOOST_TEST( (test("abcab12", lexeme[*("abc" | alnum)][test_action_2()])) );
     }
 
     {