Merge branch 'omu/update_doc_77'

[modules/yacs.git] / src / engine / Node.cxx

diff --git a/src/engine/Node.cxx b/src/engine/Node.cxx
index 31c2df78e7587272b7d0666d0085c33cd7800ff9..774e670e07f5ae76146b0f3763c355adfe3852d5 100644 (file)
--- a/src/engine/Node.cxx
+++ b/src/engine/Node.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2015  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -177,12 +177,12 @@ void Node::setName(const std::string& name)
  *  get the set of all nodes connected to the outGate
  */
 
-set<Node *> Node::getOutNodes() const
+list<Node *> Node::getOutNodes() const
 {
-  set<Node *> ret;
-  set<InGate *> inGates=_outGate.edSetInGate();
-  for(set<InGate *>::iterator iter=inGates.begin();iter!=inGates.end();iter++)
-    ret.insert((*iter)->getNode());
+  list<Node *> ret;
+  list<InGate *> inGates=_outGate.edSetInGate();
+  for(list<InGate *>::iterator iter=inGates.begin();iter!=inGates.end();iter++)
+    ret.push_back((*iter)->getNode());
   return ret;
 }
 
@@ -771,7 +771,7 @@ void Node::cleanNodes()
 void Node::resetState(int level)
 {
   DEBTRACE("Node::resetState " << getName() << "," << level << "," << _state);
-  if(_state==YACS::ERROR || _state==YACS::FAILED)
+  if(_state==YACS::ERROR || _state==YACS::FAILED || _state==YACS::ACTIVATED)
     {
       setState(YACS::READY);
       InGate* inGate = getInGate();