Subject: [Boost-commit] svn:boost r59144 - in sandbox/numeric_bindings: boost/numeric/bindings/std libs/numeric/bindings/atlas
From: thomas.klimpel_at_[hidden]
Date: 2010-01-19 16:32:22
Author: klimpel
Date: 2010-01-19 16:32:21 EST (Tue, 19 Jan 2010)
New Revision: 59144
URL: http://svn.boost.org/trac/boost/changeset/59144
Log:
compile fix for msvc
Text files modified:
sandbox/numeric_bindings/boost/numeric/bindings/std/valarray.hpp | 4 ++--
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr2.cc | 12 ++++++------
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr2ger.cc | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
Modified: sandbox/numeric_bindings/boost/numeric/bindings/std/valarray.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/std/valarray.hpp (original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/std/valarray.hpp 2010-01-19 16:32:21 EST (Tue, 19 Jan 2010)
@@ -34,11 +34,11 @@
}
static value_type* begin_value( Id& id ) {
- return &id[0];
+ return &const_cast< std::valarray< T >& >( id )[0];
}
static value_type* end_value( Id& id ) {
- return &id[0] + id.size();
+ return &const_cast< std::valarray< T >& >( id )[0] + id.size();
}
};
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr2.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr2.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr2.cc 2010-01-19 16:32:21 EST (Tue, 19 Jan 2010)
@@ -100,7 +100,7 @@
std::cout << "m vx " << bindings::noop( vy ) << std::endl;
cout << endl;
- blas::set ( 1+1i, vx );
+ blas::set ( cmplx_t (1, 1), vx );
std::cout << "vx " << bindings::noop( vx ) << std::endl;
// vy = m vx
@@ -111,7 +111,7 @@
cout << endl;
// vx = m^H vy
- blas::set ( -1-1i, vy );
+ blas::set ( cmplx_t (-1,-1), vy );
std::cout << "vy " << bindings::noop( vy ) << std::endl;
blas::gemv ( 1.0, bindings::conj(m), vy, 0.0, vx);
std::cout << "m^H vy " << bindings::noop( vx ) << std::endl;
@@ -126,10 +126,10 @@
ublas::matrix_column<m_t> myc0 (my, 0),
myc1 (my, 1);
- blas::set ( 1+0i, mxc0 );
- blas::set ( 0+0i, mxc1 );
- blas::set ( 0+0i, myc0 );
- blas::set ( 0+0i, myc1 );
+ blas::set ( cmplx_t (1, 0), mxc0 );
+ blas::set ( cmplx_t (0, 0), mxc1 );
+ blas::set ( cmplx_t (0, 0), myc0 );
+ blas::set ( cmplx_t (0, 0), myc1 );
print_m (mx, "mx");
cout << endl;
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr2ger.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr2ger.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr2ger.cc 2010-01-19 16:32:21 EST (Tue, 19 Jan 2010)
@@ -62,7 +62,7 @@
cout << endl;
// m += x y^T
- blas::geru ( 1.0+0.0i, vx, vy, m);
+ blas::geru (cmplx_t (1.0, 0.0), vx, vy, m);
print_m (m, "m += x y^T");
cout << endl << endl;