# HG changeset patch
# User jwe
# Date 1196439526 0
# Node ID bf7235434a2a259f0a6135af9871ffbc3e3b93ca
# Parent  a3ad66fea44a8ece51f191f24bdc25d9833ddd10
[project @ 2007-11-30 16:18:46 by jwe]

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-30  Moritz Borgmann  <octave@moriborg.de>
+
+	* ls-mat5.h (mat5_data_type): Delete trailing comma in enum decl.
+	* oct-stream.cc (octave_base_stream::do_printf): Use
+	OCTAVE_EMPTY_CPP_ARG to avoid annoying Sun compiler warning.
+	* OPERATORS/op-sbm-sbm.cc (DEFDBLCONVFN): Likewise.
+
 2007-11-30  John W. Eaton  <jwe@octave.org>
 
 	* graphics.cc (updating_axis_limits): New static variable.
diff --git a/src/OPERATORS/op-sbm-sbm.cc b/src/OPERATORS/op-sbm-sbm.cc
--- a/src/OPERATORS/op-sbm-sbm.cc
+++ b/src/OPERATORS/op-sbm-sbm.cc
@@ -82,7 +82,7 @@
   return new octave_sparse_matrix (SparseMatrix (v.sparse_bool_matrix_value ()));
 }
 
-DEFDBLCONVFN (, sparse_bool_matrix, bool_array)
+DEFDBLCONVFN (OCTAVE_EMPTY_CPP_ARG, sparse_bool_matrix, bool_array)
 
 void
 install_sbm_sbm_ops (void)
diff --git a/src/ls-mat5.h b/src/ls-mat5.h
--- a/src/ls-mat5.h
+++ b/src/ls-mat5.h
@@ -42,7 +42,7 @@
     miCOMPRESSED,		// Compressed data
     miUTF8,			// Unicode UTF-8 Encoded Character Data
     miUTF16,			// Unicode UTF-16 Encoded Character Data
-    miUTF32,			// Unicode UTF-32 Encoded Character Data
+    miUTF32			// Unicode UTF-32 Encoded Character Data
   };
 
 extern int
diff --git a/src/oct-stream.cc b/src/oct-stream.cc
--- a/src/oct-stream.cc
+++ b/src/oct-stream.cc
@@ -2618,7 +2618,7 @@
 			  switch (type)
 			    {
 			    case 'd': case 'i': case 'c':
-			      DO_DOUBLE_CONV ();
+			      DO_DOUBLE_CONV (OCTAVE_EMPTY_CPP_ARG);
 			      break;
 
 			    case 'o': case 'x': case 'X': case 'u':