[Boost-commit] svn:boost r56290 - in sandbox/numeric_bindings/libs/numeric/bindings/tools: . templates

Subject: [Boost-commit] svn:boost r56290 - in sandbox/numeric_bindings/libs/numeric/bindings/tools: . templates
From: rutger_at_[hidden]
Date: 2009-09-18 02:47:24

Author: rutger
Date: 2009-09-18 02:47:23 EDT (Fri, 18 Sep 2009)
New Revision: 56290
URL: http://svn.boost.org/trac/boost/changeset/56290

Log:
fixed a typo in the generator, removed extra namespace from blas bindings

Text files modified: 
   sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py          |     4 ++--                                    
   sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas.hpp |    18 +++++++++++-------                      
   2 files changed, 13 insertions(+), 9 deletions(-)

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py	2009-09-18 02:47:23 EDT (Fri, 18 Sep 2009)
@@ -117,8 +117,8 @@
     if properties[ 'trait_type' ] == 'num_rows':
       result = "traits::matrix_num_rows(" + properties[ 'trait_of' ].lower() + ")"
     if properties[ 'trait_type' ] == 'trans_num_columns':
-      result = "(" + properties[ 'trait_of' ][0].lower() + "=='N'?" + \
-               "traits::matrix_num_columns(" + properties[ 'trait_of' ][1].lower() + ")," + \
+      result = "(" + properties[ 'trait_of' ][0].lower() + "=='N' ? " + \
+               "traits::matrix_num_columns(" + properties[ 'trait_of' ][1].lower() + ") : " + \
                "traits::matrix_num_rows(" + properties[ 'trait_of' ][1].lower() + "))"
     if properties[ 'trait_type' ] == 'size':
       my_name = properties[ 'trait_of' ].lower()

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas.hpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas.hpp	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas.hpp	2009-09-18 02:47:23 EDT (Fri, 18 Sep 2009)
@@ -21,21 +21,25 @@
 namespace numeric {
 namespace bindings {
 namespace blas {
-namespace $dirname {
 
 // overloaded functions to call blas
 namespace detail {
-$OVERLOADS}
+
+$OVERLOADS} // namespace detail
 
 $LEVEL1
 $LEVEL2
-}}}}} // namespace boost::numeric::bindings::blas::$dirname
+} // namespace blas
+} // namespace bindings
+} // namespace numeric
+} // namespace boost
 
 #endif
 $TEMPLATE[blas_overloads]
-    inline $RETURN_TYPE $groupname( $LEVEL0 ) {
-        $RETURN_STATEMENTBLAS_$SUBROUTINE( $CALL_C_HEADER );
-    }
+inline $RETURN_TYPE $groupname( $LEVEL0 ) {
+    $RETURN_STATEMENTBLAS_$SUBROUTINE( $CALL_C_HEADER );
+}
+
 $TEMPLATE[blas_level1]
 // value-type based template
 template< typename ValueType >
@@ -54,7 +58,7 @@
     }
 };
 $TEMPLATE[blas_level2]
-// low-level template function for direct calls to $dirname::$groupname
+// generic template function for calling to $groupname
 template< $TYPES >
 inline typename $groupname_impl< typename traits::$TYPEOF_FIRST_TYPENAME_traits< $FIRST_TYPENAME >::value_type >::return_type
 $groupname( $LEVEL2 ) {