From 14e6086488dd818a82a269a3e70aa32d5d67d362 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Tue, 4 Sep 2012 00:17:28 +0200 Subject: [PATCH] better do initialisation by ctor --- src/proc/engine/job-ticket.hpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/proc/engine/job-ticket.hpp b/src/proc/engine/job-ticket.hpp index d50efbc2f..a6e9e6e52 100644 --- a/src/proc/engine/job-ticket.hpp +++ b/src/proc/engine/job-ticket.hpp @@ -154,7 +154,15 @@ using util::isnil; SubTicketStack toExplore_; public: - // using default ctor and copy operations + ExplorationState() { } + + ExplorationState (Prerequisites& prerequisites) + { + if (!isnil (prerequisites.requiredJobs_)) + toExplore_.push (prerequisites.requiredJobs_.begin()); + } + + // using default copy operations bool @@ -190,13 +198,6 @@ using util::isnil; pushAllPrerequisites (subExploration.toExplore_); } - void - push (Prerequisites& prerequisites) - { - if (prerequisites.requiredJobs_.empty()) return; - toExplore_.push (prerequisites.requiredJobs_.begin()); - } - JobTicket* operator->() const @@ -238,9 +239,7 @@ using util::isnil; { REQUIRE (channelNr < requirement_.size()); - ExplorationState explorer; - explorer.push (requirement_[channelNr]); - return explorer; + return ExplorationState (requirement_[channelNr]); }