forked from kyamagu/skia-python
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The current gn code still has this problem, so upgrading gn isn't useful. Hence a custom patch.
- Loading branch information
Showing
2 changed files
with
36 additions
and
0 deletions.
There are no files selected for viewing
35 changes: 35 additions & 0 deletions
35
patch/0001-Fix-for-Werror-redundant-move-for-newer-g.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
From b34a4e2f812e916f806f61412dc3f70f31a32fd0 Mon Sep 17 00:00:00 2001 | ||
From: Hin-Tak Leung <htl10@users.sourceforge.net> | ||
Date: Fri, 27 Dec 2024 02:08:12 +0000 | ||
Subject: [PATCH] Fix for -Werror=redundant-move for newer g++ | ||
|
||
Signed-off-by: Hin-Tak Leung <htl10@users.sourceforge.net> | ||
--- | ||
src/gn/desc_builder.cc | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/src/gn/desc_builder.cc b/src/gn/desc_builder.cc | ||
index 444a5e02..3ef170c3 100644 | ||
--- a/src/gn/desc_builder.cc | ||
+++ b/src/gn/desc_builder.cc | ||
@@ -167,7 +167,7 @@ class BaseDescBuilder { | ||
base::ListValue res; | ||
for (const auto& v : vector) | ||
res.GetList().emplace_back(ToBaseValue(v)); | ||
- return std::move(res); | ||
+ return res; | ||
} | ||
|
||
base::Value ToBaseValue(const Scope* scope) { | ||
@@ -176,7 +176,7 @@ class BaseDescBuilder { | ||
scope->GetCurrentScopeValues(&map); | ||
for (const auto& v : map) | ||
res.SetKey(v.first, ToBaseValue(v.second)); | ||
- return std::move(res); | ||
+ return res; | ||
} | ||
|
||
base::Value ToBaseValue(const Value& val) { | ||
-- | ||
2.47.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters