40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
|
src/ChangeLog:
|
||
|
|
|
||
|
|
2006-07-02 John W. Eaton <jwe at octave.org>
|
||
|
|
|
||
|
|
* ov-str-mat.cc (CHAR_MATRIX_CONV): Omit "warn-" from label.
|
||
|
|
* parse.y (maybe_warn_variable_switch_label): Likewise.
|
||
|
|
|
||
|
|
|
||
|
|
Index: src/ov-str-mat.cc
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cvs/octave/src/ov-str-mat.cc,v
|
||
|
|
retrieving revision 1.62
|
||
|
|
diff -u -u -r1.62 ov-str-mat.cc
|
||
|
|
--- src/ov-str-mat.cc 23 May 2006 06:05:14 -0000 1.62
|
||
|
|
+++ src/ov-str-mat.cc 2 Jul 2006 17:44:21 -0000
|
||
|
|
@@ -176,7 +176,7 @@
|
||
|
|
gripe_invalid_conversion ("string", TNAME); \
|
||
|
|
else \
|
||
|
|
{ \
|
||
|
|
- warning_with_id ("Octave:warn-str-to-num", \
|
||
|
|
+ warning_with_id ("Octave:str-to-num", \
|
||
|
|
"implicit conversion from %s to %s", \
|
||
|
|
"string", TNAME); \
|
||
|
|
\
|
||
|
|
Index: src/parse.y
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cvs/octave/src/parse.y,v
|
||
|
|
retrieving revision 1.264
|
||
|
|
diff -u -u -r1.264 parse.y
|
||
|
|
--- src/parse.y 1 Jul 2006 15:24:44 -0000 1.264
|
||
|
|
+++ src/parse.y 2 Jul 2006 17:44:21 -0000
|
||
|
|
@@ -1533,7 +1533,7 @@
|
||
|
|
maybe_warn_variable_switch_label (tree_expression *expr)
|
||
|
|
{
|
||
|
|
if (! expr->is_constant ())
|
||
|
|
- warning_with_id ("Octave:warn-variable-switch-label",
|
||
|
|
+ warning_with_id ("Octave:variable-switch-label",
|
||
|
|
"variable switch label");
|
||
|
|
}
|