Update of /cvsroot/boost/boost/libs/parameter/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18908/libs/parameter/test
Modified Files:
preprocessor.cpp python_test.cpp
Log Message:
Fixed python test regression and PP test failure.
Index: preprocessor.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/parameter/test/preprocessor.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- preprocessor.cpp 28 Sep 2006 10:22:12 -0000 1.12
+++ preprocessor.cpp 29 Sep 2006 00:30:42 -0000 1.13
@@ -77,7 +77,10 @@
)
)
{
- BOOST_MPL_ASSERT((boost::is_same<index_type, int const>));
+# if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) \
+ && !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+ BOOST_MPL_ASSERT((boost::is_same<index_type, int>));
+# endif
tester(
name
@@ -99,8 +102,9 @@
)
)
{
-# if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
- BOOST_MPL_ASSERT((boost::is_same<index_type, int const>));
+# if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) \
+ && !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+ BOOST_MPL_ASSERT((boost::is_same<index_type, int>));
# endif
tester(
Index: python_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/parameter/test/python_test.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- python_test.cpp 25 Sep 2006 10:40:35 -0000 1.2
+++ python_test.cpp 29 Sep 2006 00:30:42 -0000 1.3
@@ -98,6 +98,18 @@
struct h_fwd
{
+ template <class R, class T>
+ R operator()(boost::type<R>, T& self)
+ {
+ return self.h();
+ }
+
+ template <class R, class T, class A0>
+ R operator()(boost::type<R>, T& self, A0 const& a0)
+ {
+ return self.h(a0);
+ }
+
template <class R, class T, class A0, class A1>
R operator()(boost::type<R>, T& self, A0 const& a0, A1 const& a1)
{
@@ -142,7 +154,7 @@
, boost::parameter::python::function<
h_fwd
, mpl::vector<
- X&, tag::x*(std::string), tag::y*(std::string)
+ X&, tag::x**(std::string), tag::y**(std::string)
>
>()
, return_arg<>()
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
|