Update graph.hpp

tsung-wei-huang · web-flow · commit 6549710d7aff · 2019-01-03T16:58:03.000-06:00
diff --git a/taskflow/graph/graph.hpp b/taskflow/graph/graph.hpp
@@ -75,22 +75,20 @@ inline Node::Node(C&& c) : _work {std::forward<C>(c)} {
 // Destructor
 inline Node::~Node() {
   if(_subgraph.has_value()) {
-    std::vector<std::forward_list<Node>> gs; 
-    gs.emplace_back();
-    std::swap(gs[0], _subgraph.value());
+    std::list<Graph> gs; 
+    gs.push_back(std::move(*_subgraph));
     _subgraph.reset();
     size_t i=0;
     while(i<gs.size()) {
       auto n = gs[i].begin();
       while(n != gs[i].end()) {
         if(n->_subgraph.has_value()) {
-          gs.emplace_back();
-          std::swap(gs.back(), n->_subgraph.value());
+          gs.push_back(*(n->_subgraph));
           n->_subgraph.reset();
         }
-        n ++; 
+        n++; 
       }   
-      i ++; 
+      i++; 
     }   
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -75,22 +75,20 @@ inline Node::Node(C&& c) : _work {std::forward<C>(c)} {`
`75`	`75`	`// Destructor`
`76`	`76`	`inline Node::~Node() {`
`77`	`77`	`if(_subgraph.has_value()) {`
`78`		`- std::vector<std::forward_list<Node>> gs;`
`79`		`- gs.emplace_back();`
`80`		`- std::swap(gs[0], _subgraph.value());`
	`78`	`+ std::list<Graph> gs;`
	`79`	`+ gs.push_back(std::move(*_subgraph));`
`81`	`80`	`_subgraph.reset();`
`82`	`81`	`size_t i=0;`
`83`	`82`	`while(i<gs.size()) {`
`84`	`83`	`auto n = gs[i].begin();`
`85`	`84`	`while(n != gs[i].end()) {`
`86`	`85`	`if(n->_subgraph.has_value()) {`
`87`		`- gs.emplace_back();`
`88`		`- std::swap(gs.back(), n->_subgraph.value());`
	`86`	`+ gs.push_back(*(n->_subgraph));`
`89`	`87`	`n->_subgraph.reset();`
`90`	`88`	`}`
`91`		`- n ++;`
	`89`	`+ n++;`
`92`	`90`	`}`
`93`		`- i ++;`
	`91`	`+ i++;`
`94`	`92`	`}`
`95`	`93`	`}`
`96`	`94`	`}`