From 25a9d91bcc1c6d0c968dcdc7e5aa22c56fd900e1 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Sun, 5 Jun 2005 18:10:59 +0000
Subject: [PATCH] named_param.hpp; Work around CW not handling operator, using
 declaration, by using a real operator,(). token_iterator_test.cpp; Work
 around CW-8 confused with array initialization.

[SVN r29438]
---
 include/boost/test/utils/named_params.hpp | 11 +++++++++++
 test/token_iterator_test.cpp              |  6 +++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/include/boost/test/utils/named_params.hpp b/include/boost/test/utils/named_params.hpp
index 5957375d..356570ba 100755
--- a/include/boost/test/utils/named_params.hpp
+++ b/include/boost/test/utils/named_params.hpp
@@ -116,6 +116,7 @@ struct unknown_id_helper {
 template<typename NP, typename Rest = nil>
 struct named_parameter_combine : Rest, named_parameter_base<named_parameter_combine<NP,Rest> > {
     typedef typename NP::ref_type  res_type;
+    typedef named_parameter_combine<NP,Rest> self_type;
 
     // Constructor
     named_parameter_combine( NP const& np, Rest const& r )
@@ -129,7 +130,13 @@ struct named_parameter_combine : Rest, named_parameter_base<named_parameter_comb
     bool        has( keyword<typename NP::id,false> ) const             { return true; }
     using       Rest::has;
 
+    #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3206))
+    template<typename NP>
+    named_parameter_combine<NP,self_type> operator,( NP const& np ) const
+    { return named_parameter_combine<NP,self_type>( np, *this ); }
+    #else
     using       named_parameter_base<named_parameter_combine<NP,Rest> >::operator,;
+    #endif
 
     // Visitation support
     template<typename Visitor>
@@ -307,6 +314,10 @@ optionally_assign( T& target, Params const& p, Keyword k )
 //   Revision History:
 //  
 //  $Log$
+//  Revision 1.3  2005/06/05 18:10:59  grafik
+//  named_param.hpp; Work around CW not handling operator, using declaration, by using a real operator,().
+//  token_iterator_test.cpp; Work around CW-8 confused with array initialization.
+//
 //  Revision 1.2  2005/05/03 05:02:49  rogeeff
 //  como fixes
 //
diff --git a/test/token_iterator_test.cpp b/test/token_iterator_test.cpp
index 4cd1bc39..0285d0f9 100644
--- a/test/token_iterator_test.cpp
+++ b/test/token_iterator_test.cpp
@@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE( test_range_token_iterator )
 template<typename Iter>
 void moo( Iter b )
 {
-    char const* res[] = { "ABC", "SDF", " ", "SD", "FG", " " };
+    char const* res[6] = { "ABC", "SDF", " ", "SD", "FG", " " };
 
     Iter end;
     BOOST_CHECK_EQUAL_COLLECTIONS( b, end, res, res+sizeof(res)/sizeof(char const*) );
@@ -191,6 +191,10 @@ BOOST_AUTO_TEST_CASE( test_istream_token_iterator )
 // History :
 //
 // $Log$
+// Revision 1.11  2005/06/05 18:10:59  grafik
+// named_param.hpp; Work around CW not handling operator, using declaration, by using a real operator,().
+// token_iterator_test.cpp; Work around CW-8 confused with array initialization.
+//
 // Revision 1.10  2005/05/11 05:07:57  rogeeff
 // licence update
 //