Fix broken vc6 compatibility

dabrahams · dabrahams · commit fe3906a7cbd8 · 2005-04-28T14:15:19.000Z
[SVN r28515]
diff --git a/include/boost/python/class.hpp b/include/boost/python/class.hpp
@@ -279,25 +279,25 @@ class class_ : public objects::class_base
     template <class D>
     self& def_readonly(char const* name, D const& d, char const* doc=0)
     {
-        return this->def_readonly_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER(D), doc);
+        return this->def_readonly_impl(name, d, doc BOOST_PYTHON_DATA_MEMBER_HELPER(D));
     }
 
     template <class D>
     self& def_readwrite(char const* name, D const& d, char const* doc=0)
     {
-        return this->def_readwrite_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER(D), doc);
+        return this->def_readwrite_impl(name, d, doc BOOST_PYTHON_DATA_MEMBER_HELPER(D));
     }
     
     template <class D>
     self& def_readonly(char const* name, D& d, char const* doc=0)
     {
-        return this->def_readonly_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER(D), doc);
+        return this->def_readonly_impl(name, d, doc BOOST_PYTHON_DATA_MEMBER_HELPER(D));
     }
 
     template <class D>
     self& def_readwrite(char const* name, D& d, char const* doc=0)
     {
-        return this->def_readwrite_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER(D), doc);
+        return this->def_readwrite_impl(name, d, doc BOOST_PYTHON_DATA_MEMBER_HELPER(D));
     }
 
     // Property creation
@@ -422,28 +422,28 @@ class class_ : public objects::class_base
     
     template <class D, class B>
     self& def_readonly_impl(
-        char const* name, D B::*pm_ BOOST_PYTHON_YES_DATA_MEMBER, char const* doc)
+        char const* name, D B::*pm_, char const* doc BOOST_PYTHON_YES_DATA_MEMBER)
     {
         return this->add_property(name, pm_, doc);
     }
 
     template <class D, class B>
     self& def_readwrite_impl(
-        char const* name, D B::*pm_ BOOST_PYTHON_YES_DATA_MEMBER, char const* doc)
+        char const* name, D B::*pm_, char const* doc BOOST_PYTHON_YES_DATA_MEMBER)
     {
         return this->add_property(name, pm_, pm_, doc);
     }
 
     template <class D>
     self& def_readonly_impl(
-        char const* name, D& d BOOST_PYTHON_NO_DATA_MEMBER, char const*)
+        char const* name, D& d, char const* BOOST_PYTHON_NO_DATA_MEMBER)
     {
         return this->add_static_property(name, python::make_getter(d));
     }
 
     template <class D>
     self& def_readwrite_impl(
-        char const* name, D& d  BOOST_PYTHON_NO_DATA_MEMBER, char const*)
+        char const* name, D& d, char const* BOOST_PYTHON_NO_DATA_MEMBER)
     {
         return this->add_static_property(name, python::make_getter(d), python::make_setter(d));
     }

Original file line number	Diff line number	Diff line change
`@@ -279,25 +279,25 @@ class class_ : public objects::class_base`
`279`	`279`	`template <class D>`
`280`	`280`	`self& def_readonly(char const* name, D const& d, char const* doc=0)`
`281`	`281`	`{`
`282`		`- return this->def_readonly_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER(D), doc);`
	`282`	`+ return this->def_readonly_impl(name, d, doc BOOST_PYTHON_DATA_MEMBER_HELPER(D));`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`template <class D>`
`286`	`286`	`self& def_readwrite(char const* name, D const& d, char const* doc=0)`
`287`	`287`	`{`
`288`		`- return this->def_readwrite_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER(D), doc);`
	`288`	`+ return this->def_readwrite_impl(name, d, doc BOOST_PYTHON_DATA_MEMBER_HELPER(D));`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`template <class D>`
`292`	`292`	`self& def_readonly(char const* name, D& d, char const* doc=0)`
`293`	`293`	`{`
`294`		`- return this->def_readonly_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER(D), doc);`
	`294`	`+ return this->def_readonly_impl(name, d, doc BOOST_PYTHON_DATA_MEMBER_HELPER(D));`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`template <class D>`
`298`	`298`	`self& def_readwrite(char const* name, D& d, char const* doc=0)`
`299`	`299`	`{`
`300`		`- return this->def_readwrite_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER(D), doc);`
	`300`	`+ return this->def_readwrite_impl(name, d, doc BOOST_PYTHON_DATA_MEMBER_HELPER(D));`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`// Property creation`
`@@ -422,28 +422,28 @@ class class_ : public objects::class_base`
`422`	`422`
`423`	`423`	`template <class D, class B>`
`424`	`424`	`self& def_readonly_impl(`
`425`		`- char const* name, D B::pm_ BOOST_PYTHON_YES_DATA_MEMBER, char const doc)`
	`425`	`+ char const* name, D B::pm_, char const doc BOOST_PYTHON_YES_DATA_MEMBER)`
`426`	`426`	`{`
`427`	`427`	`return this->add_property(name, pm_, doc);`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`template <class D, class B>`
`431`	`431`	`self& def_readwrite_impl(`
`432`		`- char const* name, D B::pm_ BOOST_PYTHON_YES_DATA_MEMBER, char const doc)`
	`432`	`+ char const* name, D B::pm_, char const doc BOOST_PYTHON_YES_DATA_MEMBER)`
`433`	`433`	`{`
`434`	`434`	`return this->add_property(name, pm_, pm_, doc);`
`435`	`435`	`}`
`436`	`436`
`437`	`437`	`template <class D>`
`438`	`438`	`self& def_readonly_impl(`
`439`		`- char const* name, D& d BOOST_PYTHON_NO_DATA_MEMBER, char const*)`
	`439`	`+ char const* name, D& d, char const* BOOST_PYTHON_NO_DATA_MEMBER)`
`440`	`440`	`{`
`441`	`441`	`return this->add_static_property(name, python::make_getter(d));`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`template <class D>`
`445`	`445`	`self& def_readwrite_impl(`
`446`		`- char const* name, D& d BOOST_PYTHON_NO_DATA_MEMBER, char const*)`
	`446`	`+ char const* name, D& d, char const* BOOST_PYTHON_NO_DATA_MEMBER)`
`447`	`447`	`{`
`448`	`448`	`return this->add_static_property(name, python::make_getter(d), python::make_setter(d));`
`449`	`449`	`}`