diff --git a/patches/node/.patches b/patches/node/.patches index a253f7384c568..1daf26087733a 100644 --- a/patches/node/.patches +++ b/patches/node/.patches @@ -26,7 +26,6 @@ fix_override_createjob_in_node_platform.patch v8_api_advance_api_deprecation.patch fixup_for_error_declaration_shadows_a_local_variable.patch fixup_for_wc_98-compat-extra-semi.patch -drop_deserializerequest_move_constructor_for_c_20_compat.patch fix_parallel_test-v8-stats.patch fix_expose_the_built-in_electron_module_via_the_esm_loader.patch heap_remove_allocationspace_map_space_enum_constant.patch diff --git a/patches/node/drop_deserializerequest_move_constructor_for_c_20_compat.patch b/patches/node/drop_deserializerequest_move_constructor_for_c_20_compat.patch deleted file mode 100644 index 4625280502499..0000000000000 --- a/patches/node/drop_deserializerequest_move_constructor_for_c_20_compat.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jeremy Rose -Date: Mon, 26 Sep 2022 14:44:57 -0700 -Subject: drop DeserializeRequest move constructor for c++20 compat - -C++20 was enabled on mac in -https://chromium-review.googlesource.com/c/chromium/src/+/3914624, which caused -initialization of DeserializeRequest to fail: - -../../third_party/electron_node/src/env.cc:1835:22: error: no matching constructor for initialization of 'DeserializeRequest' - DeserializeRequest request{cb, {isolate(), holder}, index}; - ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -../../third_party/electron_node/src/env.h:944:3: note: candidate constructor not viable: requires single argument 'other', but 3 arguments were provided - DeserializeRequest(DeserializeRequest&& other) = default; - ^ -../../third_party/electron_node/src/env.h:937:8: note: candidate constructor (the implicit copy constructor) not viable: requires 1 argument, but 3 were provided -struct DeserializeRequest { - ^ - -I think (though not 100% sure) that this is because the one explicitly -specified move constructor "shadows" the implicit initializer-list constructor. -This patch seems to fix things, in any case. - -diff --git a/src/env.h b/src/env.h -index 417f0b3657cb068e7708cbeb787f8cb116501876..34c88c1addc5f64bd46332451e5b4ba8343c8818 100644 ---- a/src/env.h -+++ b/src/env.h -@@ -932,9 +932,6 @@ struct DeserializeRequest { - v8::Global holder; - int index; - InternalFieldInfo* info = nullptr; // Owned by the request -- -- // Move constructor -- DeserializeRequest(DeserializeRequest&& other) = default; - }; - - struct EnvSerializeInfo {