Mercurial > hg > octave-max
changeset 5403:7bdddf96f028
[project @ 2005-07-07 16:46:23 by jwe]
| author | jwe |
|---|---|
| date | Thu, 07 Jul 2005 16:46:24 +0000 |
| parents | 2ecbb26cd239 |
| children | b91241999ba6 |
| files | src/ChangeLog src/DLD-FUNCTIONS/matrix_type.cc src/oct-stream.cc |
| diffstat | 3 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2005-07-07 John W. Eaton <jwe@octave.org> + + * oct-stream.cc (octave_scan): Delete explicit instantiation of + octave_scan<double> since a specialization is provided. + + * DLD-FUNCTIONS/matrix_type.cc (Fmatrix_type): Include + <algorithm>, for std::transform decl. Use std qualifier for + transform and tolower. + 2005-07-05 Antoine Moreau <antoine.moreau@univ-bpclermont.fr> * DLD-FUNCTIONS/betainc.cc (Fbetainc): Fix doc string to match
--- a/src/DLD-FUNCTIONS/matrix_type.cc +++ b/src/DLD-FUNCTIONS/matrix_type.cc @@ -22,6 +22,8 @@ #include <config.h> #endif +#include <algorithm> + #include "ov.h" #include "defun-dld.h" #include "error.h" @@ -177,8 +179,8 @@ else { // Use STL function to convert to lower case - transform (str_typ.begin (), str_typ.end (), str_typ.begin (), - tolower); + std::transform (str_typ.begin (), str_typ.end (), + str_typ.begin (), std::tolower); if (str_typ == "diagonal") mattyp.mark_as_diagonal ();
--- a/src/oct-stream.cc +++ b/src/oct-stream.cc @@ -1143,9 +1143,9 @@ octave_scan (std::istream&, const scanf_format_elt&, float*); #endif -template <> +template<> std::istream& -octave_scan (std::istream& is, const scanf_format_elt& fmt, double* valptr) +octave_scan<> (std::istream& is, const scanf_format_elt& fmt, double* valptr) { double& ref = *valptr; @@ -1318,9 +1318,6 @@ return is; } -template std::istream& -octave_scan (std::istream&, const scanf_format_elt&, double*); - #endif template <class T>