diff options
| author | Michael Lutz <michi@icosahedron.de> | 2020-05-17 23:31:44 +0200 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2020-05-21 20:02:34 +0200 |
| commit | f2b40f40aa7cbccaed20ec52b41d4704a45d8db1 (patch) | |
| tree | 2f8268a7292118c9e460524a139ab85766ed3425 /src/linkgraph/linkgraphjob.h | |
| parent | 7309bdec48c70499301eb579991c2db6f7ef1d99 (diff) | |
| download | openttd-f2b40f40aa7cbccaed20ec52b41d4704a45d8db1.tar.xz | |
Codechange: Replace SmallPair with std::pair.
std::pair is already the smallest possible pair, and it already handles non-POD types correctly.
Diffstat (limited to 'src/linkgraph/linkgraphjob.h')
| -rw-r--r-- | src/linkgraph/linkgraphjob.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/linkgraph/linkgraphjob.h b/src/linkgraph/linkgraphjob.h index 9344ea246..cd7ece4b1 100644 --- a/src/linkgraph/linkgraphjob.h +++ b/src/linkgraph/linkgraphjob.h @@ -160,9 +160,9 @@ public: * @return Pair of the edge currently pointed to and the ID of its * other end. */ - SmallPair<NodeID, Edge> operator*() const + std::pair<NodeID, Edge> operator*() const { - return SmallPair<NodeID, Edge>(this->current, Edge(this->base[this->current], this->base_anno[this->current])); + return std::pair<NodeID, Edge>(this->current, Edge(this->base[this->current], this->base_anno[this->current])); } /** |