# HG changeset patch
# User Charles Pigott <charlespigott@googlemail.com>
# Date 2019-06-29 19:12:29
# Node ID 6667ae16c7264427e0aeeadd93ccbdd7bebb14ac
# Parent  e3c5a6def2d7aa2e6111597452998343894d4fea

Fix: Remove workaround for clang-3.8, now that GCC9 warns about it

diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp
--- a/src/gfx_layout.cpp
+++ b/src/gfx_layout.cpp
@@ -512,7 +512,7 @@ std::unique_ptr<const ParagraphLayouter:
 		/* 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:
 					/* 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:
 		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;
 }
 
 /**