[Boost-commit] svn:boost r58691 - in sandbox/numeric_bindings: boost/numeric/bindings/lapack boost/numeric/bindings/traits/detail libs/numeric/bindings/lapack/test

Subject: [Boost-commit] svn:boost r58691 - in sandbox/numeric_bindings: boost/numeric/bindings/lapack boost/numeric/bindings/traits/detail libs/numeric/bindings/lapack/test
From: thomas.klimpel_at_[hidden]
Date: 2010-01-04 17:08:47

Author: klimpel
Date: 2010-01-04 17:08:45 EST (Mon, 04 Jan 2010)
New Revision: 58691
URL: http://svn.boost.org/trac/boost/changeset/58691

Log:
compile fix
Text files modified: 
   sandbox/numeric_bindings/boost/numeric/bindings/lapack/workspace.hpp            |    12 ++++++------                            
   sandbox/numeric_bindings/boost/numeric/bindings/traits/detail/array.hpp         |    28 +++++++++++++++++++++++++++-            
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/convenience.h        |     2 ++                                      
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gees.cpp       |     2 ++                                      
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_geqrf.cpp      |     2 ++                                      
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heev.hpp       |     2 ++                                      
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hesv.cc        |     2 ++                                      
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc |     2 ++                                      
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sysv.cc        |     2 ++                                      
   9 files changed, 47 insertions(+), 7 deletions(-)

Modified: sandbox/numeric_bindings/boost/numeric/bindings/lapack/workspace.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/lapack/workspace.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/lapack/workspace.hpp	2010-01-04 17:08:45 EST (Mon, 04 Jan 2010)
@@ -72,7 +72,7 @@
             typedef typename value<W>::type w_value_type ;
             W& select( w_value_type const& ) { return w_ ; }
 
-            typedef typename traits::vector_traits<WRI>::value_type wri_value_type ;
+            typedef typename value<WRI>::type wri_value_type ;
             WRI& select( wri_value_type const& ) { return wri_ ; }
 
           private:
@@ -93,10 +93,10 @@
             typedef typename value<W>::type w_value_type ;
             W& select( w_value_type const& ) { return w_ ; }
 
-            typedef typename traits::vector_traits<WR>::value_type wr_value_type ;
+            typedef typename value<WR>::type wr_value_type ;
             WR& select( wr_value_type const& ) { return wr_ ; }
 
-            typedef typename traits::vector_traits<WI>::value_type wi_value_type ;
+            typedef typename value<WI>::type wi_value_type ;
             WI& select( wi_value_type const& ) { return wi_ ; }
 
           private:
@@ -119,13 +119,13 @@
             typedef typename value<W>::type w_value_type ;
             W& select( w_value_type const& ) { return w_ ; }
 
-            typedef typename traits::vector_traits<WR>::value_type wr_value_type ;
+            typedef typename value<WR>::type wr_value_type ;
             WR& select( wr_value_type const& ) { return wr_ ; }
 
-            typedef typename traits::vector_traits<WI>::value_type wi_value_type ;
+            typedef typename value<WI>::type wi_value_type ;
             WI& select( wi_value_type const& ) { return wi_ ; }
 
-            typedef typename traits::vector_traits<WB>::value_type wb_value_type ;
+            typedef typename value<WB>::type wb_value_type ;
             WB& select( wb_value_type const& ) { return wb_ ; }
 
           private:

Modified: sandbox/numeric_bindings/boost/numeric/bindings/traits/detail/array.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/traits/detail/array.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/traits/detail/array.hpp	2010-01-04 17:08:45 EST (Mon, 04 Jan 2010)
@@ -15,6 +15,7 @@
 #define BOOST_NUMERIC_BINDINGS_TRAITS_DETAIL_ARRAY_HPP
 
 #include <boost/numeric/bindings/traits/vector_traits.hpp>
+#include <boost/numeric/bindings/detail/adaptor.hpp>
 
 #ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS 
 
@@ -31,7 +32,32 @@
     static pointer storage (detail::array<T>& a) { return a.storage(); }
     static size_type size (detail::array<T>& a) { return a.size(); } 
   }; 
-  
+
+} namespace detail {
+
+  template< typename T, typename Id, typename Enable >
+  struct adaptor< traits::detail::array< T >, Id, Enable > {
+    typedef typename copy_const< Id, T >::type value_type;
+    typedef mpl::map<
+        mpl::pair< tag::value_type, value_type >,
+        mpl::pair< tag::entity, tag::vector >,
+        mpl::pair< tag::size_type<1>, std::ptrdiff_t >,
+        mpl::pair< tag::data_structure, tag::linear_array >,
+        mpl::pair< tag::stride_type<1>, tag::contiguous >
+    > property_map;
+
+    static std::ptrdiff_t size1( const Id& t ) {
+        return t.size();
+    }
+
+    static value_type* begin_value( Id& t ) {
+        return t.storage();
+    }
+
+    static value_type* end_value( Id& t ) {
+        return t.storage() + t.size();
+    }
+};
 
 }}}}
 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/convenience.h
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/convenience.h	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/convenience.h	2010-01-04 17:08:45 EST (Mon, 04 Jan 2010)
@@ -16,6 +16,8 @@
 #include <iomanip>
 #include <sstream>
 
+#include <boost/numeric/bindings/ublas/matrix.hpp>
+#include <boost/numeric/bindings/ublas/vector.hpp>
 #include <boost/numeric/bindings/traits/ublas_matrix.hpp>
 #include <boost/numeric/bindings/traits/ublas_vector.hpp>
 #include <boost/numeric/bindings/traits/matrix_traits.hpp>

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gees.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gees.cpp	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gees.cpp	2010-01-04 17:08:45 EST (Mon, 04 Jan 2010)
@@ -8,6 +8,8 @@
 
 #include "../../blas/test/random.hpp"
 
+#include <boost/numeric/bindings/ublas/matrix.hpp>
+#include <boost/numeric/bindings/ublas/vector.hpp>
 #include <boost/numeric/bindings/lapack/driver/gees.hpp>
 #include <boost/numeric/bindings/traits/ublas_matrix.hpp>
 #include <boost/numeric/bindings/traits/ublas_vector.hpp>

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_geqrf.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_geqrf.cpp	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_geqrf.cpp	2010-01-04 17:08:45 EST (Mon, 04 Jan 2010)
@@ -8,6 +8,8 @@
 
 #include "../../blas/test/random.hpp"
 
+#include <boost/numeric/bindings/ublas/matrix.hpp>
+#include <boost/numeric/bindings/ublas/vector.hpp>
 #include <boost/numeric/bindings/lapack/computational/geqrf.hpp>
 #include <boost/numeric/bindings/lapack/computational/ormqr.hpp>
 #include <boost/numeric/bindings/lapack/computational/orgqr.hpp>

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heev.hpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heev.hpp	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heev.hpp	2010-01-04 17:08:45 EST (Mon, 04 Jan 2010)
@@ -12,6 +12,8 @@
 
 #include "../../blas/test/random.hpp"
 
+#include <boost/numeric/bindings/ublas/matrix.hpp>
+#include <boost/numeric/bindings/ublas/vector.hpp>
 #include <boost/numeric/bindings/traits/ublas_matrix.hpp>
 #include <boost/numeric/ublas/matrix_proxy.hpp>
 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hesv.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hesv.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hesv.cc	2010-01-04 17:08:45 EST (Mon, 04 Jan 2010)
@@ -3,6 +3,8 @@
 // A hermitian
 // driver function hesv()
 
+#include <boost/numeric/bindings/ublas/matrix.hpp>
+#include <boost/numeric/bindings/std/vector.hpp>
 #include <cstddef>
 #include <iostream>
 #include <complex>

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc	2010-01-04 17:08:45 EST (Mon, 04 Jan 2010)
@@ -3,6 +3,8 @@
 // A hermitian
 // hetrf() & hetrs()
 
+#include <boost/numeric/bindings/ublas/matrix.hpp>
+#include <boost/numeric/bindings/std/vector.hpp>
 #include <cstddef>
 #include <iostream>
 #include <complex>

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sysv.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sysv.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sysv.cc	2010-01-04 17:08:45 EST (Mon, 04 Jan 2010)
@@ -3,6 +3,8 @@
 // A symmetric
 // driver function sysv()
 
+#include <boost/numeric/bindings/ublas/matrix.hpp>
+#include <boost/numeric/bindings/std/vector.hpp>
 #include <cstddef>
 #include <iostream>
 #include <complex>