[Boost-commit] svn:boost r63523 - in branches/release: boost/numeric/ublas libs/python/doc/v2

Subject: [Boost-commit] svn:boost r63523 - in branches/release: boost/numeric/ublas libs/python/doc/v2
From: marshall_at_[hidden]
Date: 2010-07-02 14:57:35

Author: marshall
Date: 2010-07-02 11:37:14 EDT (Fri, 02 Jul 2010)
New Revision: 63523
URL: http://svn.boost.org/trac/boost/changeset/63523

Log:
Merged changes for #2981, #4166, and #4377 to release branch
Properties modified: 
   branches/release/boost/numeric/ublas/functional.hpp   (contents, props changed)
   branches/release/libs/python/doc/v2/args.html   (contents, props changed)
   branches/release/libs/python/doc/v2/return_internal_reference.html   (contents, props changed)
Text files modified: 
   branches/release/boost/numeric/ublas/functional.hpp                |    28 ++++++++++++++--------------            
   branches/release/libs/python/doc/v2/args.html                      |     2 +-                                      
   branches/release/libs/python/doc/v2/return_internal_reference.html |     5 +++--                                   
   3 files changed, 18 insertions(+), 17 deletions(-)

Modified: branches/release/boost/numeric/ublas/functional.hpp
==============================================================================
--- branches/release/boost/numeric/ublas/functional.hpp	(original)
+++ branches/release/boost/numeric/ublas/functional.hpp	2010-07-02 11:37:14 EDT (Fri, 02 Jul 2010)
@@ -1730,22 +1730,22 @@
         // FIXME: this should not be used at all
         static
         BOOST_UBLAS_INLINE
-        size_type restrict1 (size_type i, size_type j) {
+        size_type restrict1 (size_type i, size_type /* j */) {
             return i;
         }
         static
         BOOST_UBLAS_INLINE
-        size_type restrict2 (size_type i, size_type j) {
+        size_type restrict2 (size_type /* i */, size_type j) {
             return j;
         }
         static
         BOOST_UBLAS_INLINE
-        size_type mutable_restrict1 (size_type i, size_type j) {
+        size_type mutable_restrict1 (size_type i, size_type /* j */) {
             return i;
         }
         static
         BOOST_UBLAS_INLINE
-        size_type mutable_restrict2 (size_type i, size_type j) {
+        size_type mutable_restrict2 (size_type /* i */, size_type j) {
             return j;
         }
     };
@@ -1780,7 +1780,7 @@
             template<class LAYOUT>
             static
             BOOST_UBLAS_INLINE
-            size_type element (LAYOUT l, size_type i, size_type size_i, size_type j, size_type size_j) {
+            size_type element (LAYOUT /* l */, size_type i, size_type size_i, size_type j, size_type size_j) {
                 return L::element(typename LAYOUT::transposed_layout(), j, size_j, i, size_i);
             }
 
@@ -1877,7 +1877,7 @@
         // return nearest valid mutable index in column j
         static
         BOOST_UBLAS_INLINE
-        size_type mutable_restrict1 (size_type i, size_type j, size_type size1, size_type size2) {
+        size_type mutable_restrict1 (size_type i, size_type j, size_type size1, size_type /* size2 */) {
             return (std::max)(j, (std::min) (size1, i));
         }
         // return nearest valid mutable index in row i
@@ -1890,26 +1890,26 @@
         // return an index between the first and (1+last) filled row
         static
         BOOST_UBLAS_INLINE
-        size_type global_restrict1 (size_type index1, size_type size1, size_type index2, size_type size2) {
+        size_type global_restrict1 (size_type index1, size_type size1, size_type /* index2 */, size_type /* size2 */) {
             return (std::max)(size_type(0), (std::min)(size1, index1) );
         }
         // return an index between the first and (1+last) filled column
         static
         BOOST_UBLAS_INLINE
-        size_type global_restrict2 (size_type index1, size_type size1, size_type index2, size_type size2) {
+        size_type global_restrict2 (size_type /* index1 */, size_type /* size1 */, size_type index2, size_type size2) {
             return (std::max)(size_type(0), (std::min)(size2, index2) );
         }
 
         // return an index between the first and (1+last) filled mutable row
         static
         BOOST_UBLAS_INLINE
-        size_type global_mutable_restrict1 (size_type index1, size_type size1, size_type index2, size_type size2) {
+        size_type global_mutable_restrict1 (size_type index1, size_type size1, size_type /* index2 */, size_type /* size2 */) {
             return (std::max)(size_type(0), (std::min)(size1, index1) );
         }
         // return an index between the first and (1+last) filled mutable column
         static
         BOOST_UBLAS_INLINE
-        size_type global_mutable_restrict2 (size_type index1, size_type size1, size_type index2, size_type size2) {
+        size_type global_mutable_restrict2 (size_type /* index1 */, size_type /* size1 */, size_type index2, size_type size2) {
             return (std::max)(size_type(0), (std::min)(size2, index2) );
         }
     };
@@ -1950,25 +1950,25 @@
 
         static
         BOOST_UBLAS_INLINE
-        size_type mutable_restrict1 (size_type i, size_type j, size_type size1, size_type size2) {
+        size_type mutable_restrict1 (size_type i, size_type j, size_type size1, size_type /* size2 */) {
             return (std::max)(j+1, (std::min) (size1, i));
         }
         static
         BOOST_UBLAS_INLINE
-        size_type mutable_restrict2 (size_type i, size_type j, size_type size1, size_type size2) {
+        size_type mutable_restrict2 (size_type i, size_type j, size_type /* size1 */, size_type /* size2 */) {
             return (std::max)(size_type(0), (std::min) (i, j));
         }
 
         // return an index between the first and (1+last) filled mutable row
         static
         BOOST_UBLAS_INLINE
-        size_type global_mutable_restrict1 (size_type index1, size_type size1, size_type index2, size_type size2) {
+        size_type global_mutable_restrict1 (size_type index1, size_type size1, size_type /* index2 */, size_type /* size2 */) {
             return (std::max)(size_type(1), (std::min)(size1, index1) );
         }
         // return an index between the first and (1+last) filled mutable column
         static
         BOOST_UBLAS_INLINE
-        size_type global_mutable_restrict2 (size_type index1, size_type size1, size_type index2, size_type size2) {
+        size_type global_mutable_restrict2 (size_type /* index1 */, size_type /* size1 */, size_type index2, size_type size2) {
             BOOST_UBLAS_CHECK( size2 >= 1 , external_logic() );
             return (std::max)(size_type(0), (std::min)(size2-1, index2) );
         }

Modified: branches/release/libs/python/doc/v2/args.html
==============================================================================
--- branches/release/libs/python/doc/v2/args.html	(original)
+++ branches/release/libs/python/doc/v2/args.html	2010-07-02 11:37:14 EDT (Fri, 02 Jul 2010)
@@ -101,7 +101,7 @@
         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;}
         };
 

Modified: branches/release/libs/python/doc/v2/return_internal_reference.html
==============================================================================
--- branches/release/libs/python/doc/v2/return_internal_reference.html	(original)
+++ branches/release/libs/python/doc/v2/return_internal_reference.html	2010-07-02 11:37:14 EDT (Fri, 02 Jul 2010)
@@ -167,12 +167,13 @@
 
 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 @@
 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)
       ;