From 0412c0bff98b4876c8d9b9f1e2ffc2e43dc18f2e Mon Sep 17 00:00:00 2001
From: Elnagdy Elnagdy <elnagdy.elnagdy@bmw.de>
Date: Tue, 11 Feb 2025 15:14:19 +0100
Subject: [PATCH] fix: Replace first_run static bool with class variable
---
engine/include/OpenScenarioEngine/OpenScenarioEngine.h | 3 ++-
engine/src/OpenScenarioEngine.cpp | 7 +++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/engine/include/OpenScenarioEngine/OpenScenarioEngine.h b/engine/include/OpenScenarioEngine/OpenScenarioEngine.h
index c25b09fa..c31735db 100644
--- a/engine/include/OpenScenarioEngine/OpenScenarioEngine.h
+++ b/engine/include/OpenScenarioEngine/OpenScenarioEngine.h
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2021-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ * Copyright (c) 2021-2025 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
* Copyright (c) 2022-2023 Ansys, Inc.
*
* This program and the accompanying materials are made available under the
@@ -184,6 +184,7 @@ private:
ScenarioDefinitionPtr scenario_definition_ptr_{nullptr};
bool finished_{false};
+ bool first_run_{true};
std::optional<unsigned int> random_seed_value_override_{std::nullopt};
};
diff --git a/engine/src/OpenScenarioEngine.cpp b/engine/src/OpenScenarioEngine.cpp
index ebc45a85..f9dd7751 100644
--- a/engine/src/OpenScenarioEngine.cpp
+++ b/engine/src/OpenScenarioEngine.cpp
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ * Copyright (c) 2021-2025 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
* Copyright (c) 2022-2023 Ansys, Inc.
*
* This program and the accompanying materials are made
@@ -133,10 +133,9 @@ void OpenScenarioEngine::ResetProbabilityService()
}
else
{
- static bool first_run{true};
- if (first_run)
+ if (first_run_)
{
- first_run = false;
+ first_run_ = false;
}
else
{
--
GitLab