# HG changeset patch
# User jwe
# Date 1120754784 0
# Node ID 7bdddf96f0289bc7b716a03b43239ee6921676bf
# Parent  2ecbb26cd239a41fd07c7ed64dbdc1e1883ccf58
[project @ 2005-07-07 16:46:23 by jwe]

diff -r 2ecbb26cd239 -r 7bdddf96f028 src/ChangeLog
--- a/src/ChangeLog	Wed Jul 06 22:12:42 2005 +0000
+++ b/src/ChangeLog	Thu Jul 07 16:46:24 2005 +0000
@@ -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
diff -r 2ecbb26cd239 -r 7bdddf96f028 src/DLD-FUNCTIONS/matrix_type.cc
--- a/src/DLD-FUNCTIONS/matrix_type.cc	Wed Jul 06 22:12:42 2005 +0000
+++ b/src/DLD-FUNCTIONS/matrix_type.cc	Thu Jul 07 16:46:24 2005 +0000
@@ -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 ();
diff -r 2ecbb26cd239 -r 7bdddf96f028 src/oct-stream.cc
--- a/src/oct-stream.cc	Wed Jul 06 22:12:42 2005 +0000
+++ b/src/oct-stream.cc	Thu Jul 07 16:46:24 2005 +0000
@@ -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>