[Testing] CQ-CQ-700040-59414-xqwdb

yongjieTang · yongjieTang · commit 5dd6a14d32fd · 2025-12-07T01:08:54.000+08:00
diff --git a/base/include/fml/unique_fd.h b/base/include/fml/unique_fd.h
@@ -18,6 +18,7 @@
 #include <map>
 #include <mutex>
 #include <optional>
+#include <string>
 #else  // OS_WIN
 #include <dirent.h>
 #include <unistd.h>
diff --git a/base/include/linked_hash_map.h b/base/include/linked_hash_map.h
@@ -463,7 +463,7 @@ class LinkedHashMap {
       *this = other;
     } else {
       other.for_each(
-          [=](const Key& k, const T& v) { this->insert_or_assign(k, v); });
+          [this](const Key& k, const T& v) { this->insert_or_assign(k, v); });
     }
   }
 
diff --git a/clay/BUILD.gn b/clay/BUILD.gn
@@ -18,7 +18,7 @@ config("config") {
 
   include_dirs = [
     "..",
-    "$root_gen_dir/lynx",
+    "$root_gen_dir",
   ]
 
   if (enable_skity) {
diff --git a/clay/version/BUILD.gn b/clay/version/BUILD.gn
@@ -16,7 +16,7 @@ action("version_inc") {
 
   args = [
     "--output",
-    rebase_path("$target_gen_dir/version.inc"),
+    rebase_path("$root_gen_dir/clay/version/version.inc"),
     "--content",
     string_join("\n",
                 [
@@ -29,7 +29,7 @@ action("version_inc") {
                 ]),
   ]
 
-  outputs = [ "$target_gen_dir/version.inc" ]
+  outputs = [ "$root_gen_dir/clay/version/version.inc" ]
 }
 
 source_set("version") {

Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ class LinkedHashMap {`
`463`	`463`	`*this = other;`
`464`	`464`	`} else {`
`465`	`465`	`other.for_each(`
`466`		`- [=](const Key& k, const T& v) { this->insert_or_assign(k, v); });`
	`466`	`+ [this](const Key& k, const T& v) { this->insert_or_assign(k, v); });`
`467`	`467`	`}`
`468`	`468`	`}`
`469`	`469`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ action("version_inc") {`
`16`	`16`
`17`	`17`	`args = [`
`18`	`18`	`"--output",`
`19`		`- rebase_path("$target_gen_dir/version.inc"),`
	`19`	`+ rebase_path("$root_gen_dir/clay/version/version.inc"),`
`20`	`20`	`"--content",`
`21`	`21`	`string_join("\n",`
`22`	`22`	`[`
`@@ -29,7 +29,7 @@ action("version_inc") {`
`29`	`29`	`]),`
`30`	`30`	`]`
`31`	`31`
`32`		`- outputs = [ "$target_gen_dir/version.inc" ]`
	`32`	`+ outputs = [ "$root_gen_dir/clay/version/version.inc" ]`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`source_set("version") {`