summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Pigott <charlespigott@googlemail.com>2019-06-29 20:12:29 +0100
committerCharles Pigott <charlespigott@googlemail.com>2019-09-30 14:00:06 +0100
commit150884a93fa3bf73ad41002d92a9733e0ad8182f (patch)
tree547b147ee2fac26d6eeb68e6e4b22f95e916f930 /src
parent73a2cee779857fe5762931306d896239f98c7c76 (diff)
downloadopenttd-150884a93fa3bf73ad41002d92a9733e0ad8182f.tar.xz
Fix: Remove workaround for clang-3.8, now that GCC9 warns about it
Diffstat (limited to 'src')
-rw-r--r--src/gfx_layout.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp
index 4f8b3b621..502eccbbc 100644
--- a/src/gfx_layout.cpp
+++ b/src/gfx_layout.cpp
@@ -512,7 +512,7 @@ std::unique_ptr<const ParagraphLayouter::Line> FallbackParagraphLayout::NextLine
/* Only a newline. */
this->buffer = nullptr;
l->emplace_back(this->runs.front().second, this->buffer, 0, 0);
- return std::move(l); // Not supposed to be needed, but clang-3.8 barfs otherwise.
+ return l;
}
int offset = this->buffer - this->buffer_begin;
@@ -562,7 +562,7 @@ std::unique_ptr<const ParagraphLayouter::Line> FallbackParagraphLayout::NextLine
/* The character is wider than allowed width; don't know
* what to do with this case... bail out! */
this->buffer = nullptr;
- return std::move(l); // Not supposed to be needed, but clang-3.8 barfs otherwise.
+ return l;
}
if (last_space == nullptr) {
@@ -589,7 +589,7 @@ std::unique_ptr<const ParagraphLayouter::Line> FallbackParagraphLayout::NextLine
int w = l->GetWidth();
l->emplace_back(iter->second, begin, last_char - begin, w);
}
- return std::move(l); // Not supposed to be needed, but clang-3.8 barfs otherwise.
+ return l;
}
/**