[med-svn] [aghermann] 12/13: move semantics here and there

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch master
in repository aghermann.

commit beca756f70e7c7d554705d049200dded6e198f7e
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Thu Aug 29 00:33:11 2013 +0300

    move semantics here and there
---
 upstream/src/libmetrics/psd.cc |   46 ++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/upstream/src/libmetrics/psd.cc b/upstream/src/libmetrics/psd.cc
index 7f8dfbe..a46b7b7 100644
--- a/upstream/src/libmetrics/psd.cc
+++ b/upstream/src/libmetrics/psd.cc
@@ -44,10 +44,10 @@ metrics::psd::TFFTWPlanType
 metrics::psd::CProfile::
 CProfile (const sigfile::CTypedSource& F, const int sig_no,
 	  const SPPack &params)
-	: metrics::CProfile (F, sig_no,
-			     params.pagesize, params.step,
-			     params.compute_n_bins( F().samplerate(sig_no))),
-	  Pp (params)
+      : metrics::CProfile (F, sig_no,
+			   params.pagesize, params.step,
+			   params.compute_n_bins( F().samplerate(sig_no))),
+	Pp (params)
 {
 	Pp.check();
 }
@@ -58,13 +58,15 @@ string
 metrics::psd::CProfile::
 fname_base() const
 {
-	return agh::str::sasprintf(
-		  "%s.%s-%lu"
-		  ":%g+%g-%g-%c%c",
-		  _using_F().filename(), _using_F().channel_by_id(_using_sig_no).name(),
-		  _using_F().dirty_signature( _using_sig_no),
-		  Pp.pagesize, Pp.step, Pp.binsize,
-		  'a'+(char)Pp.welch_window_type, 'a'+(char)Pp.plan_type);
+	return move(
+		agh::str::sasprintf(
+			"%s.%s-%lu"
+			":%g+%g-%g-%c%c",
+			_using_F().filename(), _using_F().channel_by_id(_using_sig_no).name(),
+			_using_F().dirty_signature( _using_sig_no),
+			Pp.pagesize, Pp.step, Pp.binsize,
+			'a'+(char)Pp.welch_window_type, 'a'+(char)Pp.plan_type)
+		);
 }
 
 
@@ -73,16 +75,18 @@ string
 metrics::psd::CProfile::
 mirror_fname() const
 {
-	return agh::str::sasprintf(
-		  "%s.%s-%lu"
-		  ":%g+%g-%g-%c%c@%zu"
-		  ".psd",
-		  agh::fs::make_fname_base (_using_F().filename(), "", agh::fs::TMakeFnameOption::hidden).c_str(),
-		  _using_F().channel_by_id(_using_sig_no).name(),
-		  _using_F().dirty_signature( _using_sig_no),
-		  Pp.pagesize, Pp.step, Pp.binsize,
-		  'a'+(char)Pp.welch_window_type, 'a'+(char)Pp.plan_type,
-		  sizeof(double));
+	return move(
+		agh::str::sasprintf(
+			"%s.%s-%lu"
+			":%g+%g-%g-%c%c@%zu"
+			".psd",
+			agh::fs::make_fname_base (_using_F().filename(), "", agh::fs::TMakeFnameOption::hidden).c_str(),
+			_using_F().channel_by_id(_using_sig_no).name(),
+			_using_F().dirty_signature( _using_sig_no),
+			Pp.pagesize, Pp.step, Pp.binsize,
+			'a'+(char)Pp.welch_window_type, 'a'+(char)Pp.plan_type,
+			sizeof(double))
+		);
 }
 
 

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git