# HG changeset patch # User jwe # Date 1114810240 0 # Node ID 4f5faf0fd322346a11b23114bc7e8a1ff54c3a6e # Parent ecbe4aa87e51fa822ae83d98449a6addf700fa85 [project @ 2005-04-29 21:30:16 by jwe] diff -r ecbe4aa87e51 -r 4f5faf0fd322 src/ChangeLog --- a/src/ChangeLog Fri Apr 29 20:48:36 2005 +0000 +++ b/src/ChangeLog Fri Apr 29 21:30:40 2005 +0000 @@ -1,5 +1,8 @@ 2005-04-29 John W. Eaton + * oct-stream.cc (DO_LITERAL_CONVERSION): Cast fmt[i] to unsigned + char for comparison. + * c-file-ptr-stream.h (c_file_ptr_stream): New template class, converted from i_c_file_ptr_stream. (i_c_file_ptr_stream, o_c_file_ptr_stream, io_c_file_ptr_stream): @@ -18,44 +21,48 @@ 2005-04-29 David Bateman - * Makefile.in: Add matrix_type.cc and spkron.cc to DLD_XSRC - - * ls.mat.cc (read_mat5_binary_element): Allow for endian change for - compressed data elements. + * Makefile.in: Add matrix_type.cc and spkron.cc to DLD_XSRC. + + * ls.mat.cc (read_mat5_binary_element): Allow for endian change + for compressed data elements. * ov-base-sparse.cc (assign): Invalidate matrix type. * ov-base-sparse.cc (SparseType sparse_type (void), - SparseType sparse_type (const SparseType&): Functions to read and set - sparse matrix type. - - * ov-bool-sparse.cc (load_binary): Remove third argument - (load_hdf5): Cast hsize_t comparisions with int to avoid warning - * ov-cx-sparse.cc (load_hdf5): ditto - * ov-re-sparse.cc (load_hdf5): ditto - - * ov-re-sparse.cc (convert_to_str_internal): Add third argument for string - type. + SparseType sparse_type (const SparseType&): + Functions to read and set sparse matrix type. + + * ov-bool-sparse.cc (load_binary): Remove third argument. + (load_hdf5): Cast hsize_t comparisions with int to avoid warning. + * ov-cx-sparse.cc (load_hdf5): Ditto. + * ov-re-sparse.cc (load_hdf5): Ditto. + + * ov-re-sparse.cc (convert_to_str_internal): Add third argument + for string type. * ov-re-sparse.h (convert_to_str_internal): Adject declaration. - * sparse-xdiv.cc (xdiv, xleftdiv): Pass SparseType as third argument, use - it and return it to allow caching of type. - * sparse-xdiv.h (xdiv, xleftdiv): Change declarations for third argument - of type SparseType. - - * DLD-FUNCTIONS/luinc.cc (Fluinc): use type_name and not class_name to - test for real/complex sparse matrices. Set matrix type + * sparse-xdiv.cc (xdiv, xleftdiv): Pass SparseType as third + argument, use it and return it to allow caching of type. + * sparse-xdiv.h (xdiv, xleftdiv): Change declarations for third + argument of type SparseType. + + * DLD-FUNCTIONS/luinc.cc (Fluinc): Use type_name and not + class_name to test for real/complex sparse matrices. + Set matrix type. * DLD-FUNCTIONS/splu.cc (Fsplu): Set matrix type. - * OPERATORS/op-cm-scm.cc, OPERATORS/op-cm-sm.cc, OPERATORS/op-cs-scm.cc, - OPERATORS/op-cs-sm.cc, OPERATORS/op-m-scm.cc, OPERATORS/op-m-sm.cc, - OPERATORS/op-s-scm.cc, OPERATORS/op-s-sm.cc, OPERATORS/op-scm-cm.cc, - OPERATORS/op-scm-cs.cc, OPERATORS/op-scm-m.cc, OPERATORS/op-scm-s.cc, - OPERATORS/op-scm-scm.cc, OPERATORS/op-scm-sm.cc, OPERATORS/op-sm-cm.cc, - OPERATORS/op-sm-cs.cc, OPERATORS/op-sm-m.cc, OPERATORS/op-sm-s.cc, - OPERATORS/op-sm-scm.cc, OPERATORS/op-sm-sm.cc (div, ldiv): Pass and - recache SparseType wirh xdiv/xleftdiv. + * OPERATORS/op-cm-scm.cc, OPERATORS/op-cm-sm.cc, + OPERATORS/op-cs-scm.cc, OPERATORS/op-cs-sm.cc, + OPERATORS/op-m-scm.cc, OPERATORS/op-m-sm.cc, + OPERATORS/op-s-scm.cc, OPERATORS/op-s-sm.cc, + OPERATORS/op-scm-cm.cc, OPERATORS/op-scm-cs.cc, + OPERATORS/op-scm-m.cc, OPERATORS/op-scm-s.cc, + OPERATORS/op-scm-scm.cc, OPERATORS/op-scm-sm.cc, + OPERATORS/op-sm-cm.cc, OPERATORS/op-sm-cs.cc, + OPERATORS/op-sm-m.cc, OPERATORS/op-sm-s.cc, + OPERATORS/op-sm-scm.cc, OPERATORS/op-sm-sm.cc (div, ldiv): + Pass and recache SparseType wirh xdiv/xleftdiv. 2005-04-29 John W. Eaton diff -r ecbe4aa87e51 -r 4f5faf0fd322 src/oct-stream.cc --- a/src/oct-stream.cc Fri Apr 29 20:48:36 2005 +0000 +++ b/src/oct-stream.cc Fri Apr 29 21:30:40 2005 +0000 @@ -1411,7 +1411,7 @@ \ while (i < n && is && (c = is.get ()) != EOF) \ { \ - if (c == fmt[i]) \ + if (c == static_cast (fmt[i])) \ { \ i++; \ continue; \