Mercurial > octave
changeset 26148:8c72f0345ee8
maint: Silence compiler warnings about unused or too many parameters.
* libinterp/dldfcn/audiodevinfo.cc: Use "warning_with_id", if an ID is given.
Those problems can now be detectec since cset 216d857732eb.
* liboctave/numeric/oct-fftw.cc (fftw_planner::threads,
float_fftw_planner::threads): Avoid compiler warning about unused parameter 'nt'
when compiling without FFTW thread support.
author | Kai T. Ohlhus <k.ohlhus@gmail.com> |
---|---|
date | Thu, 29 Nov 2018 12:54:15 +0100 |
parents | 216d857732eb |
children | 242aa7b2c783 |
files | libinterp/dldfcn/audiodevinfo.cc liboctave/numeric/oct-fftw.cc |
diffstat | 2 files changed, 20 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/dldfcn/audiodevinfo.cc Thu Nov 29 12:54:15 2018 +0100 +++ b/libinterp/dldfcn/audiodevinfo.cc Thu Nov 29 12:54:15 2018 +0100 @@ -135,8 +135,8 @@ if (! device_info) { - warning ("Octave:invalid-audio-device", - "invalid audio device ID = %d", i); + warning_with_id ("Octave:invalid-audio-device", + "invalid audio device ID = %d", i); continue; } @@ -161,8 +161,8 @@ if (! device_info) { - warning ("Octave:invalid-audio-device", - "invalid audio device ID = %d", i); + warning_with_id ("Octave:invalid-audio-device", + "invalid audio device ID = %d", i); continue; } @@ -311,8 +311,8 @@ if (! device_info) { - warning ("Octave:invalid-audio-device", - "invalid audio device ID = %d", i); + warning_with_id ("Octave:invalid-audio-device", + "invalid audio device ID = %d", i); continue; } @@ -834,8 +834,8 @@ { if (isplaying ()) { - warning ("Octave:audio-interrupt", - "interrupting playing audioplayer"); + warning_with_id ("Octave:audio-interrupt", + "interrupting playing audioplayer"); stop (); } } @@ -874,8 +874,8 @@ const PaDeviceInfo *device_info = Pa_GetDeviceInfo (device); if (! device_info) - warning ("Octave:invalid-default-audio-device", - "invalid default audio device ID = %d", device); + warning_with_id ("Octave:invalid-default-audio-device", + "invalid default audio device ID = %d", device); output_parameters.suggestedLatency = (device_info ? device_info->defaultHighOutputLatency : -1); @@ -918,8 +918,8 @@ const PaDeviceInfo *device_info = Pa_GetDeviceInfo (device); if (! device_info) - warning ("Octave:invalid-default-audio-device", - "invalid default audio device ID = %d", device); + warning_with_id ("Octave:invalid-default-audio-device", + "invalid default audio device ID = %d", device); output_parameters.suggestedLatency = (device_info ? device_info->defaultHighOutputLatency : -1); @@ -1470,8 +1470,8 @@ { if (isrecording ()) { - warning ("Octave:audio-interrupt", - "interrupting recording audiorecorder"); + warning_with_id ("Octave:audio-interrupt", + "interrupting recording audiorecorder"); stop (); } } @@ -1510,8 +1510,8 @@ const PaDeviceInfo *device_info = Pa_GetDeviceInfo (device); if (! device_info) - warning ("Octave:invalid-default-audio-device", - "invalid default audio device ID = %d", device); + warning_with_id ("Octave:invalid-default-audio-device", + "invalid default audio device ID = %d", device); input_parameters.suggestedLatency = (device_info ? device_info->defaultHighInputLatency : -1);
--- a/liboctave/numeric/oct-fftw.cc Thu Nov 29 12:54:15 2018 +0100 +++ b/liboctave/numeric/oct-fftw.cc Thu Nov 29 12:54:15 2018 +0100 @@ -136,6 +136,8 @@ instance->rplan = instance->plan[0] = instance->plan[1] = nullptr; } #else + octave_unused_parameter (nt); + (*current_liboctave_warning_handler) ("unable to change number of threads without FFTW thread support"); #endif @@ -494,6 +496,8 @@ instance->rplan = instance->plan[0] = instance->plan[1] = nullptr; } #else + octave_unused_parameter (nt); + (*current_liboctave_warning_handler) ("unable to change number of threads without FFTW thread support"); #endif