Mercurial > octave-nkf
changeset 7270:20b3ac39ee40
[project @ 2007-12-10 06:26:20 by jwe]
| author | jwe |
|---|---|
| date | Mon, 10 Dec 2007 06:26:20 +0000 |
| parents | 3fade00a6ac7 |
| children | c18512d0ddb6 |
| files | liboctave/ChangeLog liboctave/oct-time.cc src/ChangeLog src/pt-mat.cc |
| diffstat | 4 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Fri Dec 07 19:26:21 2007 +0000 +++ b/liboctave/ChangeLog Mon Dec 10 06:26:20 2007 +0000 @@ -1,3 +1,8 @@ +2007-12-07 John W. Eaton <jwe@octave.org> + + * oct-time.cc (octave_base_tm::init): Only assign t->tm_zone if it + is not 0. + 2007-12-07 David Bateman <dbateman@free.fr> * Sparse-op-defs.h (SPARSE_SMS_CMP_OP, SPARSE_SMS_BOOL_OP,
--- a/liboctave/oct-time.cc Fri Dec 07 19:26:21 2007 +0000 +++ b/liboctave/oct-time.cc Mon Dec 10 06:26:20 2007 +0000 @@ -304,7 +304,8 @@ tm_isdst = t->tm_isdst; #if defined (HAVE_STRUCT_TM_TM_ZONE) - tm_zone = t->tm_zone; + if (t->tm_zone) + tm_zone = t->tm_zone; #elif defined (HAVE_TZNAME) if (t->tm_isdst == 0 || t->tm_isdst == 1) tm_zone = tzname[t->tm_isdst];
--- a/src/ChangeLog Fri Dec 07 19:26:21 2007 +0000 +++ b/src/ChangeLog Mon Dec 10 06:26:20 2007 +0000 @@ -1,3 +1,8 @@ +2007-12-10 John W. Eaton <jwe@octave.org> + + * pt-mat.cc (tree_matrix::rvalue): Produce sq_string if any + strings are sq_string objects. + 2007-12-07 David Bateman <dbateman@free.fr> * data.cc (Fnorm): Don't return a scalar stored as a sparse
--- a/src/pt-mat.cc Fri Dec 07 19:26:21 2007 +0000 +++ b/src/pt-mat.cc Mon Dec 10 06:26:20 2007 +0000 @@ -811,7 +811,7 @@ #endif else if (result_type == "char") { - char type = all_sq_strings_p ? '\'' : '"'; + char type = all_dq_strings_p ? '"' : '\''; maybe_warn_string_concat (all_dq_strings_p, all_sq_strings_p);