[Boost-commit] svn:boost r44805 - trunk/libs/spirit/test/support

From: hartmut.kaiser_at_[hidden]
Date: 2008-04-26 22:04:08

Author: hkaiser
Date: 2008-04-26 22:04:07 EDT (Sat, 26 Apr 2008)
New Revision: 44805
URL: http://svn.boost.org/trac/boost/changeset/44805

Log:
Spirit: Fixed a ambiguity reported by VC8 for embedded systems
Text files modified: 
   trunk/libs/spirit/test/support/hold_any.cpp |    12 ++++++------                            
   1 files changed, 6 insertions(+), 6 deletions(-)

Modified: trunk/libs/spirit/test/support/hold_any.cpp
==============================================================================
--- trunk/libs/spirit/test/support/hold_any.cpp	(original)
+++ trunk/libs/spirit/test/support/hold_any.cpp	2008-04-26 22:04:07 EDT (Sat, 26 Apr 2008)
@@ -36,9 +36,9 @@
     {
         o << any_cast<double>(a);
     }
-    else if (a.type() == typeid(complex<int>)) 
+    else if (a.type() == typeid(std::complex<int>)) 
     {
-        o << any_cast<complex<int> >(a);
+        o << any_cast<std::complex<int> >(a);
     }
     else 
     {
@@ -61,12 +61,12 @@
     BOOST_TEST(output_any(42, "42"));
     BOOST_TEST(output_any('q', "q"));
     BOOST_TEST(output_any(3.14, "3.14"));
-    BOOST_TEST(output_any(complex<int>(1, 2), "(1,2)"));
+    BOOST_TEST(output_any(std::complex<int>(1, 2), "(1,2)"));
 
     int n = 42; BOOST_TEST(output_any(n, "42"));
     char c = 'q'; BOOST_TEST(output_any(c, "q"));
     double d = 3.14; BOOST_TEST(output_any(d, "3.14"));
-    complex<int> x(1, 2); BOOST_TEST(output_any(x, "(1,2)"));
+    std::complex<int> x(1, 2); BOOST_TEST(output_any(x, "(1,2)"));
   
     hold_any a;
     BOOST_TEST(output_any(a = n, "42"));
@@ -79,13 +79,13 @@
     BOOST_TEST(output_any_direct(n = hold_any(42), "42"));
     BOOST_TEST(output_any_direct(c = hold_any('q'), "q"));
     BOOST_TEST(output_any_direct(d = hold_any(3.14), "3.14"));  
-    BOOST_TEST(output_any_direct(x = complex<int>(hold_any(complex<int>(1, 2))), "(1,2)"));
+    BOOST_TEST(output_any_direct(x = std::complex<int>(hold_any(std::complex<int>(1, 2))), "(1,2)"));
 #endif
   
     BOOST_TEST(output_any_direct(hold_any(42), "42"));
     BOOST_TEST(output_any_direct(hold_any('q'), "q"));
     BOOST_TEST(output_any_direct(hold_any(3.14), "3.14"));  
-    BOOST_TEST(output_any_direct(hold_any(complex<int>(1, 2)), "(1,2)"));
+    BOOST_TEST(output_any_direct(hold_any(std::complex<int>(1, 2)), "(1,2)"));
 
     BOOST_TEST(!a.empty());
     a = 0;