Mercurial > octave
diff libinterp/corefcn/oct-stream.cc @ 26164:7f6a50f73625
Silence compiler warnings about format identifier for octave_idx_type (bug #55046).
* build-aux/mk-octave-config-h.sh, oct-conf-post.in.h: Rename macro to
OCTAVE_FORMAT_PRINTF. Add version for compiling with MinGW. Define
OCTAVE_IDX_TYPE_FORMAT.
* error.h: Use renamed macro.
* __eigs__.cc, convhulln.cc, qr.cc, pt-eval.cc, __magick_read__.cc,
cellfunn.cc, data.cc, errwarn.cc, graphics.cc, ls-mat-ascii.cc,
ls-oct-text.cc, oct-stream.cc: Use preprocessor macro for format identifier
for octave_idx_type.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Fri, 30 Nov 2018 20:07:20 +0100 |
| parents | 12d4271aed87 |
| children | 2398d2cc3d70 |
line wrap: on
line diff
--- a/libinterp/corefcn/oct-stream.cc Mon Dec 03 19:32:31 2018 +0100 +++ b/libinterp/corefcn/oct-stream.cc Fri Nov 30 20:07:20 2018 +0100 @@ -2657,8 +2657,8 @@ } if ((err & 4) && ! return_on_error) - error ("%s: Read error in field %d of row %d", who.c_str (), - done_after + 1, row + 1); + error ("%s: Read error in field %d of row %" OCTAVE_IDX_TYPE_FORMAT, + who.c_str (), done_after + 1, row + 1); // If file does not end in EOL, do not pad columns with NaN. bool uneven_columns = false;