The following commit has been merged in the master branch:
commit e9a34d0c357af2c6e5423f1c57c0ea6884cc3f25
Author: Andrei Zavada <[email protected]>
Date: Sun Sep 30 21:37:02 2012 +0300
ICM
diff --git a/configure.ac b/configure.ac
index 2e6331a..22b2ea9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,14 +176,13 @@ fi
PKGDATADIR=$prefix/share/$PACKAGE
AC_SUBST(PKGDATADIR)
-
+#AC_SUBST(LASTVERSIONCHANGELOG, ["`sed '/^$/'q ChangeLog`"])
dnl Any private defines
AC_SUBST(user, [`whoami`@`hostname`])
AC_SUBST(build_date, [`date +"%F"`])
AC_SUBST(build_datetime, [`date`])
-
dnl fafa is a powerful debugging tool
AC_DEFINE( [FAFA], [printf( __FILE__ ":%d (%s): fafa\n", __LINE__,
__FUNCTION__);], [FAFA])
AC_DEFINE( [FABUF], [printf( __FILE__ ":%d (%s): %s\n", __LINE__,
__FUNCTION__, __buf__);], [FABUF])
diff --git a/src/expdesign/primaries.cc b/src/expdesign/primaries.cc
index a507c11..d6c6f0f 100644
--- a/src/expdesign/primaries.cc
+++ b/src/expdesign/primaries.cc
@@ -176,11 +176,14 @@ for_all_recordings( const TRecordingOpFun& F, const
TRecordingReportFun& report,
CRecording*>> v;
for ( auto& G : groups )
for ( auto& J : G.second )
- for ( auto& M : J.measurements )
- for ( auto& E : M.second.episodes )
+ for ( auto& D : J.measurements )
+ for ( auto& E : D.second.episodes )
for ( auto &R : E.recordings )
if ( filter(R.second) )
- v.emplace_back(
make_tuple (&G.second, &J, &M.first, &E, &R.second));
+ v.emplace_back(
+ make_tuple
(&G.second, &J, &D.first,
+ &E,
+
&R.second));
size_t global_i = 0;
#pragma omp parallel for
for ( size_t i = 0; i < v.size(); ++i ) {
diff --git a/src/expdesign/recording.cc b/src/expdesign/recording.cc
index a2412fd..29eb844 100644
--- a/src/expdesign/recording.cc
+++ b/src/expdesign/recording.cc
@@ -108,7 +108,7 @@ CSCourse (CSubject& J, const string& d, const
sigfile::SChannel& h,
F.pages(), pz-pa, ctime( &F.start_time()));
if ( pz - pa != (int)F.pages() ) {
- fprintf( stderr, "CSCourse::CSCourse(): correct end
page to match page count in EDF: %d->%zu\n",
+ fprintf( stderr, "CSCourse::CSCourse(): correcting end
page to match page count in EDF: %d->%zu\n",
pz, pa + F.pages());
pz = pa + F.pages();
}
diff --git a/src/libsigfile/page.hh b/src/libsigfile/page.hh
index 233159f..5faaf93 100644
--- a/src/libsigfile/page.hh
+++ b/src/libsigfile/page.hh
@@ -211,13 +211,13 @@ class CHypnogram {
wrongpagesize = -3,
shortread = -4
};
- CHypnogram::TError save( const char*) const;
- CHypnogram::TError load( const char*);
- CHypnogram::TError save( const string& s) const
+ TError save( const char*) const;
+ TError load( const char*);
+ TError save( const string& s) const
{
return save(s.c_str());
}
- CHypnogram::TError load( const string& s)
+ TError load( const string& s)
{
return load(s.c_str());
}
diff --git a/src/libsigfile/source.cc b/src/libsigfile/source.cc
index dd088fa..54a8b72 100644
--- a/src/libsigfile/source.cc
+++ b/src/libsigfile/source.cc
@@ -15,9 +15,10 @@
using namespace std;
-sigfile::CSource::CSource( const char* fname,
- size_t pagesize,
- int flags)
+sigfile::CSource::
+CSource (const char* fname,
+ size_t pagesize,
+ int flags)
: CHypnogram (pagesize)
{
switch ( _type = source_file_type(fname) ) {
@@ -51,7 +52,8 @@ sigfile::CSource::CSource( const char* fname,
-sigfile::CSource::CSource( CSource&& rv)
+sigfile::CSource::
+CSource (CSource&& rv)
: CHypnogram (move(rv))
{
switch ( _type = rv._type ) {
@@ -75,7 +77,8 @@ sigfile::CSource::CSource( CSource&& rv)
}
-sigfile::CSource::~CSource()
+sigfile::CSource::
+~CSource ()
{
if ( _obj ) {
if ( not (flags() & no_ancillary_files) )
diff --git a/src/libsigfile/source.hh b/src/libsigfile/source.hh
index d55dca8..8397e38 100644
--- a/src/libsigfile/source.hh
+++ b/src/libsigfile/source.hh
@@ -34,6 +34,7 @@ class CSource
: public CHypnogram {
void operator=( const CSource&) = delete;
+ CSource () = delete;
public:
enum class TType : int {
unrecognised,
@@ -45,9 +46,6 @@ class CSource
TType _type; // rtti is evil
CSource_base
*_obj;
-
- // deleted
- CSource() = delete;
public:
CSource (const CSource&)
: CHypnogram (-1)
diff --git a/src/ui/modelrun-facility.cc b/src/ui/modelrun-facility.cc
index 579f889..ef7c9db 100644
--- a/src/ui/modelrun-facility.cc
+++ b/src/ui/modelrun-facility.cc
@@ -33,7 +33,7 @@ unsigned short __score_hypn_depth[8] = {
aghui::SModelrunFacility::
-SModelrunFacility( agh::ach::CModelRun& csim, SExpDesignUI& parent)
+SModelrunFacility (agh::ach::CModelRun& csim, SExpDesignUI& parent)
: csimulation (csim),
// subject is known only by name, so look up his full object now
csubject (parent.ED->subject_by_x( csim.subject())),
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
