This is an automated email from the git hooks/post-receive script. hmmr-guest pushed a commit to branch master in repository aghermann.
commit 053d1c87bd106458ac6477603c3cdea1a9b49a43 Author: Andrei Zavada <[email protected]> Date: Sat Sep 21 01:05:39 2013 +0300 CStorablePPack::delete_file() is virtual fair enough --- upstream/src/aghermann/expdesign/dirlevel.cc | 9 +++++++++ upstream/src/aghermann/expdesign/dirlevel.hh | 1 + upstream/src/aghermann/patterns/patterns.cc | 9 --------- upstream/src/aghermann/patterns/patterns.hh | 2 -- upstream/src/aghermann/rk1968/rk1968-profiles.cc | 8 -------- upstream/src/aghermann/rk1968/rk1968.hh | 2 -- 6 files changed, 10 insertions(+), 21 deletions(-) diff --git a/upstream/src/aghermann/expdesign/dirlevel.cc b/upstream/src/aghermann/expdesign/dirlevel.cc index 86b76a8..d4b624d 100644 --- a/upstream/src/aghermann/expdesign/dirlevel.cc +++ b/upstream/src/aghermann/expdesign/dirlevel.cc @@ -137,6 +137,15 @@ save() } + +int +CStorablePPack:: +delete_file() const +{ + return unlink( path().c_str()); +} + + string CStorablePPack:: serialize() const diff --git a/upstream/src/aghermann/expdesign/dirlevel.hh b/upstream/src/aghermann/expdesign/dirlevel.hh index 5194821..68a3866 100644 --- a/upstream/src/aghermann/expdesign/dirlevel.hh +++ b/upstream/src/aghermann/expdesign/dirlevel.hh @@ -103,6 +103,7 @@ class CStorablePPack { virtual int load(); virtual int save(); + virtual int delete_file() const; virtual string serialize() const; void touch() { saved = false; } diff --git a/upstream/src/aghermann/patterns/patterns.cc b/upstream/src/aghermann/patterns/patterns.cc index 9ba4c07..8d4faf0 100644 --- a/upstream/src/aghermann/patterns/patterns.cc +++ b/upstream/src/aghermann/patterns/patterns.cc @@ -233,15 +233,6 @@ SPattern (const string& name_, TExpDirLevel level_, CExpDesign& ED_, const SExpD } -template <> -int -SPattern<TFloat>:: -delete_file() -{ - printf( "deleting %s\n", path().c_str()); - return unlink( path().c_str()); -} - } diff --git a/upstream/src/aghermann/patterns/patterns.hh b/upstream/src/aghermann/patterns/patterns.hh index 8edd537..590bf27 100644 --- a/upstream/src/aghermann/patterns/patterns.hh +++ b/upstream/src/aghermann/patterns/patterns.hh @@ -196,8 +196,6 @@ struct SPattern int save(); string serialize() const; - int delete_file(); - valarray<T> thing; size_t samplerate; diff --git a/upstream/src/aghermann/rk1968/rk1968-profiles.cc b/upstream/src/aghermann/rk1968/rk1968-profiles.cc index bbe98f8..b17deba 100644 --- a/upstream/src/aghermann/rk1968/rk1968-profiles.cc +++ b/upstream/src/aghermann/rk1968/rk1968-profiles.cc @@ -23,14 +23,6 @@ using namespace std; using namespace agh::rk1968; -int -CScoreAssistant:: -delete_file() -{ - return unlink( path().c_str()); -} - - // Local Variables: diff --git a/upstream/src/aghermann/rk1968/rk1968.hh b/upstream/src/aghermann/rk1968/rk1968.hh index 0c59f57..69a34e7 100644 --- a/upstream/src/aghermann/rk1968/rk1968.hh +++ b/upstream/src/aghermann/rk1968/rk1968.hh @@ -85,8 +85,6 @@ class CScoreAssistant int score( agh::SEpisode&); - int delete_file(); - SScoreAssistantPPack Pp; }; -- Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
