[med-svn] [SCM] aghermann branch, master, updated. 9c95ea59282c4fc6ef7eb192072500f9d0659fc3

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 7a5aaaedde92f2d77756bf2667c72f57e50b1049
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Mon Jan 7 23:12:45 2013 +0200

    ICM, whitespace and coding style

diff --git a/src/metrics/phasic-events.ii b/src/metrics/phasic-events.ii
index 8cc3c7c..2fee8b1 100644
--- a/src/metrics/phasic-events.ii
+++ b/src/metrics/phasic-events.ii
@@ -11,8 +11,6 @@
  */
 
 
-using namespace std;
-
 template <typename T>
 list<agh::alg::SSpan<double>>
 detect_spindles( const sigfile::SNamedChannel<T>&)
diff --git a/src/sigproc/exstrom.hh b/src/sigproc/exstrom.hh
index e59c92f..22dfe5f 100644
--- a/src/sigproc/exstrom.hh
+++ b/src/sigproc/exstrom.hh
@@ -641,7 +641,8 @@ template <typename T>
 valarray<T>
 band_pass( const valarray<T>& in,
 	   size_t samplerate,
-	   float lo_cutoff, float hi_cutoff, unsigned order, bool scale)
+	   float lo_cutoff, float hi_cutoff,
+	   unsigned order, bool scale)
 {
 	size_t	i, j;
 
@@ -695,7 +696,8 @@ template <typename T>
 valarray<T>
 band_stop( const valarray<T>& in,
 	   size_t samplerate,
-	   float lo_cutoff, float hi_cutoff, unsigned order, bool scale)
+	   float lo_cutoff, float hi_cutoff,
+	   unsigned order, bool scale)
 {
 	size_t	i, j;
 
@@ -760,6 +762,8 @@ extern template valarray<TFloat> band_pass( const valarray<TFloat>&, size_t, flo
 extern template valarray<TFloat> band_stop( const valarray<TFloat>&, size_t, float, float, unsigned, bool);
 
 
+
+
 }  // namespace exstrom
 
 #endif
diff --git a/src/sigproc/sigproc.hh b/src/sigproc/sigproc.hh
index 43e4c9a..7b294e2 100644
--- a/src/sigproc/sigproc.hh
+++ b/src/sigproc/sigproc.hh
@@ -17,6 +17,7 @@
 #include <vector>
 #include <valarray>
 #include <stdexcept>
+
 #include <gsl/gsl_math.h>
 #include <samplerate.h>
 
@@ -138,6 +139,8 @@ struct SPatternParamPack {
 		}
 }; // keep fields in order, or edit ctor by initializer_list
 
+
+
 template <typename T>
 class CPattern {
 	CPattern () = delete;
diff --git a/src/ui/sf/sf-phasic-events.cc b/src/ui/sf/sf-phasic-events.cc
index 1328424..09f1572 100644
--- a/src/ui/sf/sf-phasic-events.cc
+++ b/src/ui/sf/sf-phasic-events.cc
@@ -10,8 +10,22 @@
  *         License:  GPL
  */
 
-#include "metrics/phasic-events.hh"
 #include "sf.hh"
+// I'd rather have these two includes in the reverse order, except
+// that g++ takes an issue with namespace sigproc, which appears in
+// sigproc/sigproc.hh and, independently, in sigproc/winfun.hh.
+//
+// This is what I get if winfun.hh comes first:
+//
+// In file included from sf-phasic-events.cc:14:
+// sf.hh:121: error: 'SCachedLowPassCourse' in namespace 'sigproc' does not name a type
+// sf.hh:123: error: 'SCachedBandPassCourse' in namespace 'sigproc' does not name a type
+// sf.hh:125: error: 'SCachedEnvelope' in namespace 'sigproc' does not name a type
+// sf.hh:127: error: 'SCachedDzcdf' in namespace 'sigproc' does not name a type
+//
+// No idea why they, being included in this order: winfun.hh, sigproc.hh,
+// cause g++ do forget all declarations from the latter.
+#include "metrics/phasic-events.hh"
 
 using namespace std;
 

-- 
Sleep experiment manager