mirror of https://github.com/OpenTTD/OpenTTD.git
Fix: Remove workaround for clang-3.8, now that GCC9 warns about it
This commit is contained in:
parent
73a2cee779
commit
150884a93f
|
@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue