cpp/openttd-patchpack/source Changeset - r23843:6667ae16c726

Changeset - r23843:6667ae16c726

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Charles Pigott - 5 years ago 2019-06-29 19:12:29
charlespigott@googlemail.com

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

1 file changed with 3 insertions and 3 deletions:

src/gfx_layout.cpp

0 comments (0 inline, 0 general)

src/gfx_layout.cpp

➞

Show inline comments

@@ @@ -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;
+}
 /**

0 comments (0 inline, 0 general)