This is an automated email from the git hooks/post-receive script. hmmr-guest pushed a commit to branch master in repository aghermann.
commit e610ac4c429c5e01907915b0cff766437d345b12 Author: Andrei Zavada <[email protected]> Date: Mon Aug 5 23:09:51 2013 +0300 ICM --- src/aghermann/ui/mw/mw.hh | 23 +++++++-------------- src/aghermann/ui/mw/populate.cc | 12 ++++++----- src/common/config-validate.hh | 1 + src/common/lang.hh | 38 ++++++++++++++++++++++------------- src/libmetrics/page-metrics-base.hh | 3 ++- 5 files changed, 41 insertions(+), 36 deletions(-) diff --git a/src/aghermann/ui/mw/mw.hh b/src/aghermann/ui/mw/mw.hh index 241cbbf..0c8187d 100644 --- a/src/aghermann/ui/mw/mw.hh +++ b/src/aghermann/ui/mw/mw.hh @@ -48,6 +48,9 @@ class SExpDesignUI *ED; aghui::SSessionChooser *_p; + // ctor, dtor + SExpDesignUI (aghui::SSessionChooser *parent, const string& dir); + ~SExpDesignUI (); // forward decl class SGroupPresentation; @@ -65,16 +68,12 @@ class SExpDesignUI list<agh::CSubject::SEpisode>& sepisodesequence() const - { - return csubject.measurements[*_p._p._AghDi].episodes; - } + { return csubject.measurements[*_p._p._AghDi].episodes; } agh::CSubject::SEpisode *using_episode; bool is_episode_focused() const - { - return using_episode != nullptr; - } + { return using_episode != nullptr; } bool is_focused; bool get_episode_from_timeline_click( unsigned along); // possibly sets episode_focused @@ -112,13 +111,9 @@ class SExpDesignUI friend class SExpDesignUI; const char* name() const - { - return gi->first.c_str(); - } + { return gi->first.c_str(); } agh::CJGroup& cjgroup() - { - return gi->second; - } + { return gi->second; } SGroupPresentation (agh::CExpDesign::TJGroups::iterator& gi_, SExpDesignUI& parent) : _p (parent), @@ -142,10 +137,6 @@ class SExpDesignUI SSubjectPresentation* subject_presentation_by_csubject( const agh::CSubject&); - // ctor, dtor - SExpDesignUI (aghui::SSessionChooser *parent, const string& dir); - ~SExpDesignUI (); - // flags bool draw_nremrem_cycles; bool finalize_ui:1, diff --git a/src/aghermann/ui/mw/populate.cc b/src/aghermann/ui/mw/populate.cc index d4af478..78fbc02 100644 --- a/src/aghermann/ui/mw/populate.cc +++ b/src/aghermann/ui/mw/populate.cc @@ -69,8 +69,9 @@ populate( bool do_load) } } - gtk_window_set_title( wMainWindow, - (string ("Aghermann: ") + agh::str::homedir2tilda( ED->session_dir())).c_str()); + gtk_window_set_title( + wMainWindow, + (string ("Aghermann: ") + agh::str::homedir2tilda( ED->session_dir())).c_str()); if ( ED->last_used_version != VERSION ) { printf( "Upgrading from version %s, here's ChangeLog for you\n", ED->last_used_version.c_str()); @@ -83,9 +84,10 @@ populate( bool do_load) snprintf_buf( "Smooth: %zu", smooth_profile)); if ( AghTT.empty() ) - aghui::pop_ok_message( wMainWindow, - "No EEG channels", - "There are no EEG channels found in any recordings in the tree."); + aghui::pop_ok_message( + wMainWindow, + "No EEG channels", + "There are no EEG channels found in any recordings in the tree."); if ( AghTT.empty() or AghGG.empty() ) { show_empty_experiment_blurb(); set_controls_for_empty_experiment( true); diff --git a/src/common/config-validate.hh b/src/common/config-validate.hh index 959ecdc..0a8b18d 100644 --- a/src/common/config-validate.hh +++ b/src/common/config-validate.hh @@ -22,6 +22,7 @@ #include <libconfig.h++> #include "string.hh" +#include "lang.hh" #if HAVE_CONFIG_H && !defined(VERSION) # include "config.h" diff --git a/src/common/lang.hh b/src/common/lang.hh index 287760c..c77dd73 100644 --- a/src/common/lang.hh +++ b/src/common/lang.hh @@ -22,23 +22,16 @@ using namespace std; -// # define __pure __attribute__ ((pure)) -// # define __const __attribute__ ((const)) -// # define __noreturn __attribute__ ((noreturn)) -// # define __malloc __attribute__ ((malloc)) -// # define __must_check __attribute__ ((warn_unused_result)) -// # define __deprecated __attribute__ ((deprecated)) -// # define __used __attribute__ ((used)) -// # define __unused __attribute__ ((unused)) -// # define __packed __attribute__ ((packed)) -#define likely(x) __builtin_expect (!!(x), 1) -#define unlikely(x) __builtin_expect (!!(x), 0) +namespace agh { -#define ASPRINTF(...) \ - assert (asprintf(__VA_ARGS__) > 0) +typedef unsigned long hash_t; + + +// g++ bits + #define MAKE_UNIQUE_CHARP(p) \ unique_ptr<void,void(*)(void*)> p##_pp(p,free); @@ -49,13 +42,30 @@ using namespace std; void operator=( const T&) = delete; -typedef unsigned long hash_t; +// gcc bits + +// # define __pure __attribute__ ((pure)) +// # define __const __attribute__ ((const)) +// # define __noreturn __attribute__ ((noreturn)) +// # define __malloc __attribute__ ((malloc)) +// # define __must_check __attribute__ ((warn_unused_result)) +// # define __deprecated __attribute__ ((deprecated)) +// # define __used __attribute__ ((used)) +// # define __unused __attribute__ ((unused)) +// # define __packed __attribute__ ((packed)) +#define likely(x) __builtin_expect (!!(x), 1) +#define unlikely(x) __builtin_expect (!!(x), 0) + + +#define ASPRINTF(...) \ + assert (asprintf(__VA_ARGS__) > 0) #define FABUF printf( __FILE__ ":%d (%s): %s\n", __LINE__, __FUNCTION__, __buf__); #define FAFA printf( __FILE__ ":%d (%s): fafa\n", __LINE__, __FUNCTION__); +} // namespace agh #endif diff --git a/src/libmetrics/page-metrics-base.hh b/src/libmetrics/page-metrics-base.hh index 2e4d1ae..d0ecb4c 100644 --- a/src/libmetrics/page-metrics-base.hh +++ b/src/libmetrics/page-metrics-base.hh @@ -179,7 +179,8 @@ class CProfile { _data; // it is always double because it is saved/loaded in this form size_t _bins; - hash_t _signature_when_mirrored; + agh::hash_t + _signature_when_mirrored; const sigfile::CTypedSource& _using_F; int _using_sig_no; -- 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
