*** empty log message ***

dabrahams · dabrahams · commit f0e3fd9e721f · 2002-04-18T04:00:30.000Z
[SVN r13520]
diff --git a/doc/v2/call.html b/doc/v2/call.html
@@ -39,16 +39,22 @@ <h2><a name="introduction"></a>Introduction</h2>
 <h2><a name="functions"></a>Functions</h2>
 <pre>
 <a name="call-spec">template &lt;class R, class A1, class A2, ... class A<i>n</i>&gt;</a>
-<i>result-type</i> call(PyObject* callable, A1 const&amp;, A2 const&amp;, ... A<i>n</i> const&amp;)
+R call(PyObject* callable, A1 const&amp;, A2 const&amp;, ... A<i>n</i> const&amp;)
 </pre>
 <dl class="function-semantics"> 
-  <dt><b>Requires:</b> {{text}}</dt>
-  <dt><b>Effects:</b> {{text}}</dt>
+  <dt><b>Requires:</b> <code>R</code> is a complete type with an accessible copy constructor</dt>
+
+  <dt><b>Effects:</b> Invokes <code>callable(a1,&nbsp;a2,&nbsp;...a<i>n</i>)</code> in
+  Python, where <code>a1</code>...<code>a<i>n</i></code> are the arguments to
+  <code>call()</code>, converted to Python objects.
   <dt><b>Postconditions:</b> {{text}}</dt>
-  <dt><b>Returns:</b> {{text}}</dt>
-  <dt><b>Throws:</b> {{text}}</dt>
-  <dt><b>Complexity:</b> {{text}}</dt>
-  <dt><b>Rationale:</b> {{text}}</dt>
+  <dt><b>Returns:</b> The result of the Python call, converted to the
+  C++ type <code>R</code>.</dt>
+
+</dt>
+  <dt><b>Rationale:</b> 
+
+</dt>
 </dl>
 
 <h2><a name="examples"></a>Example(s)</h2>
diff --git a/test/multi_arg_constructor.cpp b/test/multi_arg_constructor.cpp
@@ -3,7 +3,9 @@
 
 struct A
 {
-    A(const double, const double, const double, const double, const double, const double, const double) {}
+    A(const double, const double, const double, const double, const double
+      , const double, const double
+        ) {}
 };
 
 BOOST_PYTHON_MODULE_INIT(multi_arg_constructor_ext)
@@ -14,7 +16,9 @@ BOOST_PYTHON_MODULE_INIT(multi_arg_constructor_ext)
   module("multi_arg_constructor_ext")
   
     .add(class_<A, shared_ptr<A> >("A")
-         .def_init(args<const double, const double, const double, const double, const double, const double, const double>())
+         .def_init(args<double, double, double, double, double
+                   , double, double
+                   >())
         )
       ;
 
diff --git a/test/multi_arg_constructor.py b/test/multi_arg_constructor.py
@@ -1,6 +1,6 @@
 '''
 >>> from multi_arg_constructor_ext import *
->>> a = A(1.0, 2, 3, 4, 5, 6, 7.0)
+>>> a = A(1.0, 2, 3, 4, 5, 6, 7.0, 8.1, 9.3)
 '''
 def run(args = None):
     import sys

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,9 @@`
`3`	`3`
`4`	`4`	`struct A`
`5`	`5`	`{`
`6`		`- A(const double, const double, const double, const double, const double, const double, const double) {}`
	`6`	`+ A(const double, const double, const double, const double, const double`
	`7`	`+ , const double, const double`
	`8`	`+ ) {}`
`7`	`9`	`};`
`8`	`10`
`9`	`11`	`BOOST_PYTHON_MODULE_INIT(multi_arg_constructor_ext)`
`@@ -14,7 +16,9 @@ BOOST_PYTHON_MODULE_INIT(multi_arg_constructor_ext)`
`14`	`16`	`module("multi_arg_constructor_ext")`
`15`	`17`
`16`	`18`	`.add(class_<A, shared_ptr<A> >("A")`
`17`		`- .def_init(args<const double, const double, const double, const double, const double, const double, const double>())`
	`19`	`+ .def_init(args<double, double, double, double, double`
	`20`	`+ , double, double`
	`21`	`+ >())`
`18`	`22`	`)`
`19`	`23`	`;`
`20`	`24`