Merge branch 'master' into sh_merge_master

rwgk · rwgk · commit 2a93b3414545 · 2022-03-18T11:16:24.000-07:00
diff --git a/include/pybind11/stl.h b/include/pybind11/stl.h
@@ -372,7 +372,7 @@ struct variant_caster<V<Ts...>> {
     bool load_alternative(handle src, bool convert, type_list<U, Us...>) {
         auto caster = make_caster<U>();
         if (caster.load(src, convert)) {
-            value = cast_op<U>(caster);
+            value = cast_op<U>(std::move(caster));
             return true;
         }
         return load_alternative(src, convert, type_list<Us...>{});

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ struct variant_caster<V<Ts...>> {`
`372`	`372`	`bool load_alternative(handle src, bool convert, type_list<U, Us...>) {`
`373`	`373`	`auto caster = make_caster<U>();`
`374`	`374`	`if (caster.load(src, convert)) {`
`375`		`- value = cast_op<U>(caster);`
	`375`	`+ value = cast_op<U>(std::move(caster));`
`376`	`376`	`return true;`
`377`	`377`	`}`
`378`	`378`	`return load_alternative(src, convert, type_list<Us...>{});`