Merged changes for #2981, #4166, and #4377 to release branch

mclow · mclow · commit 63a3f188b846 · 2010-07-02T15:37:14.000Z
[SVN r63523]
diff --git a/doc/v2/args.html b/doc/v2/args.html
@@ -101,7 +101,7 @@ <h4><a name="arg-synopsis"></a>Class <code>arg</code> synopsis</h4>
         struct arg 
         {
           template &lt;class T&gt;
-                  arg &amp;perator = (T const &amp;value);
+                  arg &amp;operator = (T const &amp;value);
           explicit arg (char const *name){elements[0].name = name;}
         };
 
diff --git a/doc/v2/return_internal_reference.html b/doc/v2/return_internal_reference.html
@@ -167,12 +167,13 @@ <h3>C++ module definition</h3>
 
 class Bar
 {
+ public:
    Bar(int x) : x(x) {}
    int get_x() const { return x; }
    void set_x(int x) { this-&gt;x = x; }
  private:
    int x;
-}
+};
 
 class Foo
 {
@@ -189,7 +190,7 @@ <h3>C++ module definition</h3>
 using namespace boost::python;
 BOOST_PYTHON_MODULE(internal_refs)
 {
-   class_&lt;Bar&gt;("Bar")
+   class_&lt;Bar&gt;("Bar", init&lt;int&gt;())
       .def("get_x", &amp;Bar::get_x)
       .def("set_x", &amp;Bar::set_x)
       ;

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ <h4><a name="arg-synopsis"></a>Class <code>arg</code> synopsis</h4>`
`101`	`101`	`struct arg`
`102`	`102`	`{`
`103`	`103`	`template <class T>`
`104`		`- arg &perator = (T const &value);`
	`104`	`+ arg &operator = (T const &value);`
`105`	`105`	`explicit arg (char const *name){elements[0].name = name;}`
`106`	`106`	`};`
`107`	`107`
Original file line number	Diff line number	Diff line change
`@@ -167,12 +167,13 @@ <h3>C++ module definition</h3>`
`167`	`167`
`168`	`168`	`class Bar`
`169`	`169`	`{`
	`170`	`+ public:`
`170`	`171`	`Bar(int x) : x(x) {}`
`171`	`172`	`int get_x() const { return x; }`
`172`	`173`	`void set_x(int x) { this->x = x; }`
`173`	`174`	`private:`
`174`	`175`	`int x;`
`175`		`-}`
	`176`	`+};`
`176`	`177`
`177`	`178`	`class Foo`
`178`	`179`	`{`
`@@ -189,7 +190,7 @@ <h3>C++ module definition</h3>`
`189`	`190`	`using namespace boost::python;`
`190`	`191`	`BOOST_PYTHON_MODULE(internal_refs)`
`191`	`192`	`{`
`192`		`- class_<Bar>("Bar")`
	`193`	`+ class_<Bar>("Bar", init<int>())`
`193`	`194`	`.def("get_x", &Bar::get_x)`
`194`	`195`	`.def("set_x", &Bar::set_x)`
`195`	`196`	`;`