merged from trunk

dabrahams · dabrahams · commit 45e4cf506f4d · 2006-08-11T00:48:19.000Z
[SVN r34865]
diff --git a/test/args.cpp b/test/args.cpp
@@ -14,6 +14,10 @@
 
 using namespace boost::python;
 
+#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580))
+using boost::python::make_tuple;
+#endif 
+
 tuple f(int x = 1, double y = 4.25, char const* z = "wow")
 {
     return make_tuple(x, y, z);
@@ -85,6 +89,7 @@ BOOST_PYTHON_MODULE(args_ext)
         .def("inner5", &X::inner, "docstring", args("n"), return_internal_reference<>())
 
         .def("f1", &X::f, X_f_overloads(args("x", "y", "z")))
+        .def("f2", &X::f, X_f_overloads(args("x", "y", "z"), "f2's docstring"))
         ;
 
     def("inner", &X::inner, "docstring", args("self", "n"), return_internal_reference<>());

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,10 @@`
`14`	`14`
`15`	`15`	`using namespace boost::python;`
`16`	`16`
	`17`	`+#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580))`
	`18`	`+using boost::python::make_tuple;`
	`19`	`+#endif`
	`20`	`+`
`17`	`21`	`tuple f(int x = 1, double y = 4.25, char const* z = "wow")`
`18`	`22`	`{`
`19`	`23`	`return make_tuple(x, y, z);`
`@@ -85,6 +89,7 @@ BOOST_PYTHON_MODULE(args_ext)`
`85`	`89`	`.def("inner5", &X::inner, "docstring", args("n"), return_internal_reference<>())`
`86`	`90`
`87`	`91`	`.def("f1", &X::f, X_f_overloads(args("x", "y", "z")))`
	`92`	`+ .def("f2", &X::f, X_f_overloads(args("x", "y", "z"), "f2's docstring"))`
`88`	`93`	`;`
`89`	`94`
`90`	`95`	`def("inner", &X::inner, "docstring", args("self", "n"), return_internal_reference<>());`