Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-07-15 11:07:20 +02:00
parent 2a7ed52768 0f85dec259
commit 0adadc8449
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Basics/Traverser.h
View File

@ -1305,11 +1305,11 @@ namespace triagens {
} }
Path* search (VertexId& start, VertexId& end) { Path* search (VertexId& start, VertexId& end) {
Path* res = new Path(); std::unique_ptr<Path> res(new Path());
// Init // Init
if (start == end) { if (start == end) {
res->vertices.emplace_back(start); res->vertices.emplace_back(start);
return res; return res.release();
} }
_leftFound.emplace(start, nullptr); _leftFound.emplace(start, nullptr);
_rightFound.emplace(end, nullptr); _rightFound.emplace(end, nullptr);
@ -1347,7 +1347,7 @@ namespace triagens {
it = _rightFound.find(next); it = _rightFound.find(next);
} }
res->weight = res->edges.size(); res->weight = res->edges.size();
return res; return res.release();
} }
_nextClosure.emplace_back(n); _nextClosure.emplace_back(n);
} }
@ -1381,7 +1381,7 @@ namespace triagens {
it = _rightFound.find(next); it = _rightFound.find(next);
} }
res->weight = res->edges.size(); res->weight = res->edges.size();
return res; return res.release();
} }
_nextClosure.emplace_back(n); _nextClosure.emplace_back(n);
} }