Boost logo

Boost :

From: Markus Schöpflin (markus.schoepflin_at_[hidden])
Date: 2005-06-03 11:31:52


Hello,

attached patch fixes the current regression failure for the basics test.
The code in questions contains a non-working workaround for this compiler,
the patch removes this workaround as well. Ok to commit?

Markus

Index: basics.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/parameter/test/basics.cpp,v
retrieving revision 1.8
diff -u -r1.8 basics.cpp
--- basics.cpp 16 May 2005 12:58:48 -0000 1.8
+++ basics.cpp 3 Jun 2005 16:29:10 -0000
@@ -14,7 +14,6 @@
 
 namespace test
 {
-
   // A separate function for getting the "value" key, so we can deduce
   // F and use lazy_binding on it.
   template <class Params, class F>
@@ -39,8 +38,13 @@
           
       typename boost::parameter::binding<
         Params, index_, int
- >::type i = p[index | 999];
-
+ >::type i =
+#if BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042))
+ p[test::index | 999];
+#else
+ p[index | 999];
+#endif
+
       p[tester](n,v,i);
 
       return 1;
Index: basics.hpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/parameter/test/basics.hpp,v
retrieving revision 1.2
diff -u -r1.2 basics.hpp
--- basics.hpp 15 May 2005 10:15:56 -0000 1.2
+++ basics.hpp 3 Jun 2005 16:29:10 -0000
@@ -88,13 +88,6 @@
 {
     return values_t<Name,Value,Index>(n,v,i);
 }
-
-#if defined( __DECCXX_VER )
- && BOOST_WORKAROUND(__EDG_VERSION__, BOOST_TESTED_AT(245))
- // Some kind of nasty ambiguity arises here -- is there an index in
- // the global namespace?
- using test::index;
-#endif
 
 } // namespace test
 


Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk