From a2a20c0287e88d415d5c47e40512a7ac5563f1a7 Mon Sep 17 00:00:00 2001
From: Shota Minami <shouth373@gmail.com>
Date: Thu, 6 Mar 2025 04:37:45 +0000
Subject: [PATCH] Update args for `choice`

---
 .../src/syntax/global_action.cpp                       | 10 +++++-----
 .../src/syntax/time_to_collision_condition_target.cpp  |  7 ++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/openscenario/openscenario_interpreter/src/syntax/global_action.cpp b/openscenario/openscenario_interpreter/src/syntax/global_action.cpp
index 676460e2e57..710bbaea778 100644
--- a/openscenario/openscenario_interpreter/src/syntax/global_action.cpp
+++ b/openscenario/openscenario_interpreter/src/syntax/global_action.cpp
@@ -23,11 +23,11 @@ GlobalAction::GlobalAction(const pugi::xml_node & node, Scope & scope)
 // clang-format off
 : ComplexType(
     choice(node, {
-      {   "EnvironmentAction", [&](auto && node) { return make<   EnvironmentAction>(std::forward<decltype(node)>(node), scope); } },
-      {        "EntityAction", [&](auto && node) { return make<        EntityAction>(std::forward<decltype(node)>(node), scope); } },
-      {     "ParameterAction", [&](auto && node) { return make<     ParameterAction>(std::forward<decltype(node)>(node), scope); } },
-      {"InfrastructureAction", [&](auto && node) { return make<InfrastructureAction>(std::forward<decltype(node)>(node), scope); } },
-      {       "TrafficAction", [&](auto && node) { throw UNSUPPORTED_ELEMENT_SPECIFIED(node.name()); return unspecified;         } },
+      {   "EnvironmentAction", [&](auto && node) { return make<   EnvironmentAction>(node, scope);                       } },
+      {        "EntityAction", [&](auto && node) { return make<        EntityAction>(node, scope);                       } },
+      {     "ParameterAction", [&](auto && node) { return make<     ParameterAction>(node, scope);                       } },
+      {"InfrastructureAction", [&](auto && node) { return make<InfrastructureAction>(node, scope);                       } },
+      {       "TrafficAction", [&](auto && node) { throw UNSUPPORTED_ELEMENT_SPECIFIED(node.name()); return unspecified; } },
     }))
 // clang-format on
 {
diff --git a/openscenario/openscenario_interpreter/src/syntax/time_to_collision_condition_target.cpp b/openscenario/openscenario_interpreter/src/syntax/time_to_collision_condition_target.cpp
index 829793c7a54..247de314e12 100644
--- a/openscenario/openscenario_interpreter/src/syntax/time_to_collision_condition_target.cpp
+++ b/openscenario/openscenario_interpreter/src/syntax/time_to_collision_condition_target.cpp
@@ -25,9 +25,10 @@ inline namespace syntax
 TimeToCollisionConditionTarget::TimeToCollisionConditionTarget(
   const pugi::xml_node & node, Scope & scope)
 // clang-format off
-: ComplexType(choice(node,
-    std::make_pair( "Position", [&](auto && node) { return make<Position>(std::forward<decltype(node)>(node), scope); }),
-    std::make_pair("EntityRef", [&](auto && node) { return make<  Entity>(std::forward<decltype(node)>(node), scope); })))
+: ComplexType(choice(node, {
+    {  "Position", [&](auto && node) { return make<Position>(node, scope); } },
+    { "EntityRef", [&](auto && node) { return make<  Entity>(node, scope); } },
+  }))
 // clang-format on
 {
   if (is<EntitySelection>()) {