From 150884a93fa3bf73ad41002d92a9733e0ad8182f Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Sat, 29 Jun 2019 20:12:29 +0100 Subject: Fix: Remove workaround for clang-3.8, now that GCC9 warns about it --- src/gfx_layout.cpp | 6 +++--- 1 file 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 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 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 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; } /** -- cgit v1.2.3-70-g09d2