The following commit has been merged in the master branch:
commit ee1604cdba3458c35529ae8191df0727c6c2d04b
Merge: a7a124fe2cc771607d8885e1da96ded2101452ea
979caa6de4a40b6b65ec48f09d22f7ca455433b1
Author: Andrei Zavada <[email protected]>
Date: Mon Mar 11 23:40:49 2013 +0200
Merge branch 'master' of github.com:hmmr/aghermann
diff --combined src/expdesign/tree-scanner.cc
index bcae68c,4022592..354081d
--- a/src/expdesign/tree-scanner.cc
+++ b/src/expdesign/tree-scanner.cc
@@@ -22,14 -22,14 +22,14 @@@ using namespace std
-inline namespace {
+namespace {
struct progress_fun_stdout_fo {
void operator() ( const char* current, size_t n, size_t i) const
{
printf( "(%zu of %zu) %s\n", i, n, current);
}
};
-} // inline namespace
+} // namespace
agh::CExpDesign::TMsmtCollectProgressIndicatorFun
agh::CExpDesign::progress_fun_stdout = progress_fun_stdout_fo();
@@@ -65,8 -65,6 +65,6 @@@ add_one( sigfile::CTypedSource&& Fmc
fabs( difftime(
(*episodes.begin()->sources.begin())().start_time(), Fmc().start_time())) /
3600 > max_hours_apart )
return AGH_EPSEQADD_TOOFAR;
- printf( "CSubject::SEpisodeSequence::add_one( \"%s\")\n",
- Fmc().filename());
episodes.emplace_back( move(Fmc), fft_params, swu_params,
mc_params);
episodes.sort();
@@@ -228,7 -226,7 +226,7 @@@ register_intree_source( sigfile::CTyped
-inline namespace {
+namespace {
size_t
__cur_edf_file;
@@@ -285,7 -283,7 +283,7 @@@ avg_tm( vector<TTimePair>& tms
return pair<float, float> (avg_start / tms.size(), avg_end /
tms.size());
}
-} // inline namespace
+} // namespace
void
agh::CExpDesign::
@@@ -308,7 -306,7 +306,7 @@@ scan_tree( TMsmtCollectProgressIndicato
printf( "CExpDesign::scan_tree(): recordings collected\n");
compute_profiles(); // in an SMP fashion
- printf( "CExpDesign::scan_tree() all computed\n");
+ printf( "CExpDesign::scan_tree(): all computed\n");
// find any subjects with incomplete episode sets
list<string> complete_episode_set = enumerate_episodes();
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
