# HG changeset patch
# User jwe
# Date 993608944 0
# Node ID bbe74a066592ee2aeda65d1724129461ba9acc44
# Parent  79474340b3a11d7ffe0d63c2def1d57f4dca2e27
[project @ 2001-06-27 02:29:03 by jwe]

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-26  Mumit Khan  <khan@nanotech.wisc.edu>
+
+	* c-file-ptr-stream.h (c_file_ptr_buf::c_file_ptr_buf): Add GCC3
+	libstdc++-v3 support.
+	* load-save.cc (save_mat5_binary_element): Cast arguments to the
+	correct type.
+	(save_ascii_data): Eliminate compiler warning.
+	* toplev.cc (system): Prefix std::.
+
 2001-05-31  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* ov-cx-mat.cc: Deleve unnecessary instantiation of assign function.
diff --git a/src/c-file-ptr-stream.h b/src/c-file-ptr-stream.h
--- a/src/c-file-ptr-stream.h
+++ b/src/c-file-ptr-stream.h
@@ -46,11 +46,10 @@
 
   c_file_ptr_buf (FILE *f_arg, close_fcn cf_arg = ::fclose)
     : 
-#ifdef __SUNPRO_CC
-    std::filebuf (f_arg ? fileno (f_arg) : -1),
+#if defined __GNUC__ && __GNUC__ >= 3
+    std::filebuf (f_arg, std::ios::in | std::ios::out),
 #else
-    std::filebuf (f_arg ? fileno (f_arg) : -1,
-                  0, std::ios::in | std::ios::out),
+    std::filebuf (f_arg ? fileno (f_arg) : -1),
 #endif
     f (f_arg), cf (cf_arg),
     fd (f_arg ? fileno (f_arg) : -1)
diff --git a/src/load-save.cc b/src/load-save.cc
--- a/src/load-save.cc
+++ b/src/load-save.cc
@@ -4254,7 +4254,8 @@
 
   contin = os.tellp ();
   os.seekp (fixup);
-  write_mat5_tag (os, miMATRIX, contin - fixup - 8); // the actual length
+  write_mat5_tag (os, miMATRIX, 
+                  static_cast<int>(contin - fixup) - 8); // the actual length
   os.seekp (contin);
 
   return true;
@@ -4473,7 +4474,7 @@
       os << "# elements: " << elements << "\n";
       for (int i = 0; i < elements; i++)
 	{
-	  int len = chm.cols ();
+	  unsigned len = chm.cols ();
 	  os << "# length: " << len << "\n";
 	  std::string tstr = chm.row_as_string (i, false, true);
 	  const char *tmp = tstr.data ();
diff --git a/src/toplev.cc b/src/toplev.cc
--- a/src/toplev.cc
+++ b/src/toplev.cc
@@ -482,7 +482,7 @@
 	  // kpathsearch library to not always do TeX-specific
 	  // things...
 
-	  static string odb;
+	  static std::string odb;
 
 	  odb = octave_env::getenv ("TEXMFDBS");