Mercurial > hg > octave-nkf
diff liboctave/oct-norm.cc @ 8319:c374691576f6
Fix for MSVC compilation
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Wed, 12 Nov 2008 21:36:39 +0000 |
parents | 05b7a8ffec65 |
children | 1b097d86a61a |
line wrap: on
line diff
--- a/liboctave/oct-norm.cc +++ b/liboctave/oct-norm.cc @@ -508,13 +508,13 @@ // and finally, here's what we've promised in the header file #define DEFINE_XNORM_FUNCS(PREFIX, RTYPE) \ - RTYPE xnorm (const PREFIX##ColumnVector& x, RTYPE p) \ + OCTAVE_API RTYPE xnorm (const PREFIX##ColumnVector& x, RTYPE p) \ { return vector_norm (x, p); } \ - RTYPE xnorm (const PREFIX##RowVector& x, RTYPE p) \ + OCTAVE_API RTYPE xnorm (const PREFIX##RowVector& x, RTYPE p) \ { return vector_norm (x, p); } \ - RTYPE xnorm (const PREFIX##Matrix& x, RTYPE p) \ + OCTAVE_API RTYPE xnorm (const PREFIX##Matrix& x, RTYPE p) \ { return matrix_norm (x, p, PREFIX##Matrix (), PREFIX##SVD ()); } \ - RTYPE xfrobnorm (const PREFIX##Matrix& x) \ + OCTAVE_API RTYPE xfrobnorm (const PREFIX##Matrix& x) \ { return vector_norm (x, static_cast<RTYPE> (2)); } DEFINE_XNORM_FUNCS(, double) @@ -534,9 +534,9 @@ } #define DEFINE_XNORM_SPARSE_FUNCS(PREFIX, RTYPE) \ - RTYPE xnorm (const Sparse##PREFIX##Matrix& x, RTYPE p) \ + OCTAVE_API RTYPE xnorm (const Sparse##PREFIX##Matrix& x, RTYPE p) \ { return matrix_norm (x, p, PREFIX##Matrix ()); } \ - RTYPE xfrobnorm (const Sparse##PREFIX##Matrix& x) \ + OCTAVE_API RTYPE xfrobnorm (const Sparse##PREFIX##Matrix& x) \ { \ RTYPE res; \ array_norm_2 (x.data (), x.nnz (), res); \ @@ -547,9 +547,9 @@ DEFINE_XNORM_SPARSE_FUNCS(Complex, double) #define DEFINE_COLROW_NORM_FUNCS(PREFIX, RPREFIX, RTYPE) \ - extern RPREFIX##RowVector xcolnorms (const PREFIX##Matrix& m, RTYPE p) \ + extern OCTAVE_API RPREFIX##RowVector xcolnorms (const PREFIX##Matrix& m, RTYPE p) \ { return column_norms (m, p); } \ - extern RPREFIX##ColumnVector xrownorms (const PREFIX##Matrix& m, RTYPE p) \ + extern OCTAVE_API RPREFIX##ColumnVector xrownorms (const PREFIX##Matrix& m, RTYPE p) \ { return row_norms (m, p); } \ DEFINE_COLROW_NORM_FUNCS(, , double)