The following commit has been merged in the master branch:
commit 44172f3c598df47d953a77392bc76f5287925b9b
Author: Andrei Zavada <[email protected]>
Date: Sat Nov 10 13:02:44 2012 +0200
ICM
diff --git a/src/metrics/page-metrics-base.hh b/src/metrics/page-metrics-base.hh
index 2273a3e..11f7d20 100644
--- a/src/metrics/page-metrics-base.hh
+++ b/src/metrics/page-metrics-base.hh
@@ -15,8 +15,6 @@
#define _METRICS_PAGE_METRICS_BASE_H
#include <list>
-//#include <array>
-//#include <numeric>
#include <valarray>
#include "common/lang.hh"
@@ -206,8 +204,23 @@ CPageMetrics_base::spectrum( size_t p) const
return ps;
}
+inline valarray<double>
+to_vad( valarray<double>&& rv)
+{
+ return move(rv);
+}
+inline valarray<double>
+to_vad( const valarray<float>& rv)
+{
+ valarray<double> ret;
+ ret.resize( rv.size());
+ for ( size_t i = 0; i < rv.size(); ++i )
+ ret[i] = rv[i];
+ return ret;
+}
+
-} // namespace sigfile
+} // namespace metrics
#endif // _SIGFILE_PAGE_METRICS_BASE_H
diff --git a/src/metrics/psd.cc b/src/metrics/psd.cc
index f74d660..fcdaf4e 100644
--- a/src/metrics/psd.cc
+++ b/src/metrics/psd.cc
@@ -95,23 +95,6 @@ fname_base() const
-inline namespace {
-inline valarray<double>
-to_vad( valarray<double>&& rv)
-{
- return rv;
-}
-inline valarray<double>
-to_vad( const valarray<float>& rv)
-{
- valarray<double> ret;
- ret.resize( rv.size());
- for ( size_t i = 0; i < rv.size(); ++i )
- ret[i] = rv[i];
- return ret;
-}
-}
-
int
metrics::psd::CBinnedPower::
diff --git a/src/metrics/psd.hh b/src/metrics/psd.hh
index e181796..d092784 100644
--- a/src/metrics/psd.hh
+++ b/src/metrics/psd.hh
@@ -11,15 +11,11 @@
* License: GPL
*/
-#ifndef _SIGFILE_PSD_H
-#define _SIGFILE_PSD_H
+#ifndef _METRICS_PSD_H
+#define _METRICS_PSD_H
-#include <cstring>
#include <string>
-#include <stdexcept>
#include <list>
-#include <array>
-#include <numeric>
#include <valarray>
#include "sigproc/sigproc.hh"
diff --git a/src/sigproc/sigproc.hh b/src/sigproc/sigproc.hh
index a4fb62b..441f26e 100644
--- a/src/sigproc/sigproc.hh
+++ b/src/sigproc/sigproc.hh
@@ -20,7 +20,7 @@
#include <gsl/gsl_math.h>
#include <samplerate.h>
-#include "../common/lang.hh"
+#include "common/lang.hh"
#include "exstrom.hh"
#if HAVE_CONFIG_H && !defined(VERSION)
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
