This is an automated email from the git hooks/post-receive script. hmmr-guest pushed a commit to branch master in repository aghermann.
commit 38a5eaa33df715e82b6f6ef85da152b5bde20e76 Author: Andrei Zavada <[email protected]> Date: Thu Aug 29 12:55:14 2013 +0300 heed or gag most -Wextra and -Wmissing-field-initializers --- upstream/src/aghermann/model/achermann.hh | 6 ++++++ upstream/src/aghermann/model/ultradian-cycle.cc | 18 +++++++++--------- upstream/src/aghermann/ui/mf/mf.cc | 2 +- upstream/src/aghermann/ui/mw/admit-one_cb.cc | 16 ++++++++-------- upstream/src/aghermann/ui/mw/mainmenu_cb.cc | 6 +++--- upstream/src/aghermann/ui/sf/d/phasediff_cb.cc | 4 ++-- upstream/src/aghermann/ui/sf/mainmenu_cb.cc | 10 +++++----- upstream/src/aghermann/ui/sf/montage-overlays.cc | 2 +- upstream/src/aghermann/ui/sf/montage_cb.cc | 2 +- upstream/src/aghermann/ui/ui.cc | 2 +- upstream/src/libmetrics/swu.hh | 2 +- upstream/src/libsigfile/source-base.cc | 2 +- upstream/src/libsigfile/tsv.cc | 4 ++-- upstream/src/tools/agh-profile-gen.cc | 3 +++ upstream/src/tools/edfhed.cc | 3 +++ 15 files changed, 47 insertions(+), 35 deletions(-) diff --git a/upstream/src/aghermann/model/achermann.hh b/upstream/src/aghermann/model/achermann.hh index d92ec17..52cb4dd 100644 --- a/upstream/src/aghermann/model/achermann.hh +++ b/upstream/src/aghermann/model/achermann.hh @@ -73,6 +73,10 @@ class CModelRun : public agh::CProfile { public: +// warning: base class 'class agh::CProfile' should be explicitly initialized in the copy constructor [-Wextra] +// makes no practical sense +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic push CModelRun (const CModelRun&) : tx (t0, tstep, tlo, thi) { @@ -83,6 +87,8 @@ class CModelRun { throw runtime_error ("nono"); } +#pragma GCC diagnostic pop + CModelRun (CModelRun&&); CModelRun (CSubject&, const string& session, const sigfile::SChannel&, const agh::SProfileParamSet&, diff --git a/upstream/src/aghermann/model/ultradian-cycle.cc b/upstream/src/aghermann/model/ultradian-cycle.cc index 5ba9e5f..6b58979 100644 --- a/upstream/src/aghermann/model/ultradian-cycle.cc +++ b/upstream/src/aghermann/model/ultradian-cycle.cc @@ -56,7 +56,7 @@ uc_cost_function( void *xp) { auto& P = *(SUltradianCyclePPack*)(xp); - agh::beersma::FUltradianCycle F ({P.X[0], P.X[1], P.X[2], P.X[3]}); + agh::beersma::FUltradianCycle F ({P.X[0], P.X[1], P.X[2], P.X[3], NAN}); // if ( (unlikely (F.r > F.ur || F.r < F.lr || // F.T > F.uT || F.T < F.lT || // F.d > F.ud || F.d < F.ld || @@ -75,7 +75,7 @@ uc_siman_step( const gsl_rng *r, void *xp, double step_size) { auto& P = *(SUltradianCyclePPack*)(xp); agh::beersma::SUltradianCycle - Xm = {P.X[0], P.X[1], P.X[2], P.X[3]}, + Xm = {P.X[0], P.X[1], P.X[2], P.X[3], NAN}, X0 = Xm; retry: @@ -136,8 +136,8 @@ uc_siman_metric( void *xp, void *yp) auto& P1 = *(SUltradianCyclePPack*)xp; auto& P2 = *(SUltradianCyclePPack*)yp; agh::beersma::SUltradianCycle - X1 = {P1.X[0], P1.X[1], P1.X[2], P1.X[3]}, - X2 = {P2.X[0], P2.X[1], P2.X[2], P2.X[3]}; + X1 = {P1.X[0], P1.X[1], P1.X[2], P1.X[3], NAN}, + X2 = {P2.X[0], P2.X[1], P2.X[2], P2.X[3], NAN}; return agh::beersma::distance( X1, X2); } @@ -182,7 +182,7 @@ ultradian_cycles( agh::CRecording& M, C.siman_params); // gsl_siman_params_t agh::beersma::SUltradianCycle - X = {P.X[0], P.X[1], P.X[2], P.X[3]}; + X = {P.X[0], P.X[1], P.X[2], P.X[3], NAN}; { FUltradianCycle F (X); @@ -205,15 +205,15 @@ ultradian_cycles( agh::CRecording& M, list<agh::beersma::SUltradianCycleDetails> agh::beersma:: -analyse_deeper( const SUltradianCycle& C, - agh::CRecording& M, - const agh::beersma::SUltradianCycleCtl& P) +analyse_deeper( const SUltradianCycle&, + agh::CRecording&, + const agh::beersma::SUltradianCycleCtl&) { list<agh::beersma::SUltradianCycleDetails> ret; - return ret; + return move(ret); } diff --git a/upstream/src/aghermann/ui/mf/mf.cc b/upstream/src/aghermann/ui/mf/mf.cc index 43d679b..f4d7184 100644 --- a/upstream/src/aghermann/ui/mf/mf.cc +++ b/upstream/src/aghermann/ui/mf/mf.cc @@ -123,7 +123,7 @@ SModelrunFacility:: void SModelrunFacility:: -siman_param_printer( void *xp) +siman_param_printer( void* /* xp */) { // memcpy( __t_set.tunables, xp, __t_set.n_tunables * sizeof(double)); // access this directly, no? diff --git a/upstream/src/aghermann/ui/mw/admit-one_cb.cc b/upstream/src/aghermann/ui/mw/admit-one_cb.cc index 52e7f30..9740ce5 100644 --- a/upstream/src/aghermann/ui/mw/admit-one_cb.cc +++ b/upstream/src/aghermann/ui/mw/admit-one_cb.cc @@ -60,12 +60,12 @@ check_gtk_entry_nonempty_cb( void cMeasurements_drag_data_received_cb( - const GtkWidget *widget, + const GtkWidget*, GdkDragContext *context, - const gint x, - const gint y, + const gint, // x, + const gint, // y, const GtkSelectionData *selection_data, - const guint info, + const guint, // info, const guint time, const gpointer userdata) { @@ -101,10 +101,10 @@ __attribute__ ((const)) cMeasurements_drag_drop_cb( GtkWidget*, GdkDragContext*, - gint x, - gint y, - guint time, - gpointer userdata) + gint, // x, + gint, // y, + guint, // time, + gpointer) // userdata) { //auto& ED = *(SExpDesignUI*)userdata; // GdkAtom target_type; diff --git a/upstream/src/aghermann/ui/mw/mainmenu_cb.cc b/upstream/src/aghermann/ui/mw/mainmenu_cb.cc index 27aec76..1ad9ca5 100644 --- a/upstream/src/aghermann/ui/mw/mainmenu_cb.cc +++ b/upstream/src/aghermann/ui/mw/mainmenu_cb.cc @@ -114,9 +114,9 @@ iExpAnnotations_activate_cb( void tvGlobalAnnotations_row_activated_cb( - GtkTreeView* tree_view, + GtkTreeView*, GtkTreePath* path, - GtkTreeViewColumn *column, + GtkTreeViewColumn*, const gpointer userdata) { auto& ED = *(SExpDesignUI*)userdata; @@ -324,7 +324,7 @@ iExpGloballyDetectArtifacts_activate_cb( void eGlobalADProfiles_changed_cb( - GtkComboBox *b, + GtkComboBox*, const gpointer userdata) { auto& ED = *(SExpDesignUI*)userdata; diff --git a/upstream/src/aghermann/ui/sf/d/phasediff_cb.cc b/upstream/src/aghermann/ui/sf/d/phasediff_cb.cc index 531a8e0..5af4ecf 100644 --- a/upstream/src/aghermann/ui/sf/d/phasediff_cb.cc +++ b/upstream/src/aghermann/ui/sf/d/phasediff_cb.cc @@ -188,8 +188,8 @@ wSFPD_show_cb( void wSFPD_hide_cb( - GtkWidget *wid, - const gpointer userdata) + GtkWidget*, + const gpointer) { // auto& PD = *(SScoringFacility::SPhasediffDialog*)userdata; diff --git a/upstream/src/aghermann/ui/sf/mainmenu_cb.cc b/upstream/src/aghermann/ui/sf/mainmenu_cb.cc index 857276a..b03e63a 100644 --- a/upstream/src/aghermann/ui/sf/mainmenu_cb.cc +++ b/upstream/src/aghermann/ui/sf/mainmenu_cb.cc @@ -21,7 +21,7 @@ extern "C" { void iSFMontageMenu_activate_cb( - const GtkMenuItem *menuitem, + const GtkMenuItem*, gpointer userdata) { auto& SF = *(SScoringFacility*)userdata; @@ -257,11 +257,11 @@ namespace { #define EVENT_X 30 size_t position_for_channel = -1; -void channel_menu_position( GtkMenu *menu, +void channel_menu_position( GtkMenu*, gint *x, gint *y, - gboolean *push_in, - gpointer userdata) + gboolean*, //push_in, + const gpointer userdata) { auto& SF = *(SScoringFacility*)userdata; int mwx, mwy, rwx, rwy; @@ -277,7 +277,7 @@ void channel_menu_position( GtkMenu *menu, } gboolean -wSF_key_press_event_cb( GtkWidget *wid, GdkEventKey *event, gpointer userdata) +wSF_key_press_event_cb( GtkWidget*, const GdkEventKey *event, const gpointer userdata) { auto& SF = *(SScoringFacility*)userdata; diff --git a/upstream/src/aghermann/ui/sf/montage-overlays.cc b/upstream/src/aghermann/ui/sf/montage-overlays.cc index 5610a35..6f22670 100644 --- a/upstream/src/aghermann/ui/sf/montage-overlays.cc +++ b/upstream/src/aghermann/ui/sf/montage-overlays.cc @@ -23,7 +23,7 @@ using namespace agh::ui; void SScoringFacility::SChannel:: draw_overlays( cairo_t* cr, - const int wd, const float zeroy) const + const int, const float zeroy) const { if ( _p.mode != TMode::scoring ) return; diff --git a/upstream/src/aghermann/ui/sf/montage_cb.cc b/upstream/src/aghermann/ui/sf/montage_cb.cc index 4a99f08..8b25b91 100644 --- a/upstream/src/aghermann/ui/sf/montage_cb.cc +++ b/upstream/src/aghermann/ui/sf/montage_cb.cc @@ -329,7 +329,7 @@ daSFMontage_motion_notify_event_cb( gboolean daSFMontage_leave_notify_event_cb( GtkWidget*, - GdkEventMotion *event, + GdkEventMotion*, const gpointer userdata) { auto& SF = *(SScoringFacility*)userdata; diff --git a/upstream/src/aghermann/ui/ui.cc b/upstream/src/aghermann/ui/ui.cc index 9917699..ded6c04 100644 --- a/upstream/src/aghermann/ui/ui.cc +++ b/upstream/src/aghermann/ui/ui.cc @@ -154,7 +154,7 @@ cairo_draw_envelope( cairo_t *cr, const valarray<TFloat>& V, double dps = (double)(end - start) / hspan; cairo_move_to( cr, hoff, voff); - size_t i = start; + ssize_t i = start; for ( ; i < end; ++i ) cairo_line_to( cr, i / dps, voff - V[i] * scale/2); diff --git a/upstream/src/libmetrics/swu.hh b/upstream/src/libmetrics/swu.hh index 03a184c..0570bf7 100644 --- a/upstream/src/libmetrics/swu.hh +++ b/upstream/src/libmetrics/swu.hh @@ -40,7 +40,7 @@ struct SPPack reset(); } size_t - compute_n_bins( size_t _samplerate) const + compute_n_bins( size_t) const { return 1; } diff --git a/upstream/src/libsigfile/source-base.cc b/upstream/src/libsigfile/source-base.cc index d4d5081..a7a4658 100644 --- a/upstream/src/libsigfile/source-base.cc +++ b/upstream/src/libsigfile/source-base.cc @@ -366,7 +366,7 @@ figure_session_and_episode() void CSource:: -figure_times( const string& date_s, const string& time_s, TAcceptTimeFormat option) +figure_times( const string& date_s, const string& time_s, TAcceptTimeFormat) { struct tm ts; char *p; diff --git a/upstream/src/libsigfile/tsv.cc b/upstream/src/libsigfile/tsv.cc index e737d9a..606aabd 100644 --- a/upstream/src/libsigfile/tsv.cc +++ b/upstream/src/libsigfile/tsv.cc @@ -211,8 +211,8 @@ _parse_header() if ( _status & bad_datetime && !(_flags & CSource::TFlags::no_field_consistency_check) ) return -1; - if ( metadata.find( "comment") == metadata.end() ) - ; + // if ( metadata.find( "comment") == metadata.end() ) + // ; if ( metadata.find( "samplerate") == metadata.end() || (_samplerate = stoi( metadata["samplerate"])) > 2048 ) { diff --git a/upstream/src/tools/agh-profile-gen.cc b/upstream/src/tools/agh-profile-gen.cc index c68b9cf..944735c 100644 --- a/upstream/src/tools/agh-profile-gen.cc +++ b/upstream/src/tools/agh-profile-gen.cc @@ -54,6 +54,8 @@ enum TOptChar : char { o_channel = 'h', }; +#pragma GCC diagnostic ignored "-Wmissing-field-initializers" +#pragma GCC diagnostic push static struct argp_option options[] = { {"channel", o_channel, "CHANNEL", 0, "use this channel (0-based)" }, {"profile", o_profile, "pms", 0, "profile(s) to generate (p=PSD, m=MC, s=SWU)"}, @@ -65,6 +67,7 @@ static struct argp_option options[] = { {"swu-params", o_swu_params, "MIN_UPSWING_LEN", 0, "SWU parameters" }, { 0 } }; +#pragma GCC diagnostic pop static char args_doc[] = "FILE"; diff --git a/upstream/src/tools/edfhed.cc b/upstream/src/tools/edfhed.cc index e3d864b..09fb6b0 100644 --- a/upstream/src/tools/edfhed.cc +++ b/upstream/src/tools/edfhed.cc @@ -41,6 +41,8 @@ const char static char doc[] = "edfhed -- EDF file header viewer and non-interctive editor"; +#pragma GCC diagnostic ignored "-Wmissing-field-initializers" +#pragma GCC diagnostic push static struct argp_option options[] = { {"no-channels", 'b', 0, 0, "Only dump general header fields (no channel details)"}, {"with-annotations", 'a', 0, 0, "List embedded annotations"}, @@ -50,6 +52,7 @@ static struct argp_option options[] = { {"touch-mtime", 't', 0, 0, "Parse 'recording_date' and 'recording_time' and set file modification timestamp"}, { 0 } }; +#pragma GCC diagnostic pop static char args_doc[] = "FILE.edf ..."; -- Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
