[med-svn] [aghermann] 33/85: use return move() where appropriate
andrei zavada
hmmr-guest at alioth.debian.org
Thu Sep 26 23:46:27 UTC 2013
This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch master
in repository aghermann.
commit b6f83066e6695932e6a3aef328bd212d7284813f
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Sun Sep 15 02:21:58 2013 +0300
use return move() where appropriate
---
upstream/src/aghermann/expdesign/expdesign.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/upstream/src/aghermann/expdesign/expdesign.cc b/upstream/src/aghermann/expdesign/expdesign.cc
index 7295f05..b62033a 100644
--- a/upstream/src/aghermann/expdesign/expdesign.cc
+++ b/upstream/src/aghermann/expdesign/expdesign.cc
@@ -214,7 +214,7 @@ make_dirname( TExpDirLevel level, const SExpDirLevelId& level_id) const
const CSubject& J = subject_by_x(level_id.j, &Gi);
if ( level_id.g != Gi->first || !J.have_session(level_id.d) )
throw invalid_argument ("bad group/subject/session");
- return str::sasprintf( "%s/%s/%s/%s", _session_dir.c_str(), Gi->first.c_str(), J.id.c_str(), level_id.d.c_str());
+ return move(str::sasprintf( "%s/%s/%s/%s", _session_dir.c_str(), Gi->first.c_str(), J.id.c_str(), level_id.d.c_str()));
}
case TExpDirLevel::subject:
@@ -223,13 +223,13 @@ make_dirname( TExpDirLevel level, const SExpDirLevelId& level_id) const
const CSubject& J = subject_by_x(level_id.j, &Gi);
if ( level_id.g != Gi->first )
throw invalid_argument ("bad group/subject");
- return str::sasprintf( "%s/%s/%s", _session_dir.c_str(), Gi->first.c_str(), J.id.c_str());
+ return move(str::sasprintf( "%s/%s/%s", _session_dir.c_str(), Gi->first.c_str(), J.id.c_str()));
}
case TExpDirLevel::group:
if ( not have_group( level_id.g) )
throw invalid_argument ("bad group");
- return str::sasprintf( "%s/%s", _session_dir.c_str(), level_id.g.c_str());
+ return move(str::sasprintf( "%s/%s", _session_dir.c_str(), level_id.g.c_str()));
case TExpDirLevel::experiment:
return make_dirname();
--
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git
More information about the debian-med-commit
mailing list