From c561f3db82b897a1f521f05de2913fd9f37354e1 Mon Sep 17 00:00:00 2001
From: hpcwoess <woessner@hlrs.de>
Date: Sun, 10 Jan 2021 00:43:56 +0100
Subject: [PATCH] classes with cons members can't have move_assign operators
 and thus can't be used in vectors removing the const classifier allows to
 compile with MSVC

Signed-off-by: hpcwoess <woessner@hlrs.de>
---
 sim/src/common/eventDetectorDefinitions.h | 30 +++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/sim/src/common/eventDetectorDefinitions.h b/sim/src/common/eventDetectorDefinitions.h
index 643380335..c73a8f09b 100644
--- a/sim/src/common/eventDetectorDefinitions.h
+++ b/sim/src/common/eventDetectorDefinitions.h
@@ -78,7 +78,7 @@ public:
     }
 
 private:
-    const std::vector<std::string> triggeringEntityNames;
+    std::vector<std::string> triggeringEntityNames;
 };
 
 class OPENPASSCOMMONEXPORT TimeToCollisionCondition : public ByEntityCondition
@@ -99,9 +99,9 @@ public:
     std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const;
 
 private:
-    const std::string referenceEntityName;
-    const double targetTTC;
-    const Rule rule;
+    std::string referenceEntityName;
+    double targetTTC;
+    Rule rule;
 };
 
 class OPENPASSCOMMONEXPORT TimeHeadwayCondition : public ByEntityCondition
@@ -124,10 +124,10 @@ public:
     std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const;
 
 private:
-    const std::string referenceEntityName;
-    const double targetTHW;
-    const bool freeSpace;
-    const Rule rule;
+    std::string referenceEntityName;
+    double targetTHW;
+    bool freeSpace;
+    Rule rule;
 };
 
 class OPENPASSCOMMONEXPORT ReachPositionCondition : public ByEntityCondition
@@ -162,8 +162,8 @@ public:
     std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const;
 
 private:
-    const double tolerance{};
-    const openScenario::Position position{};
+    double tolerance{};
+    openScenario::Position position{};
 };
 
 class OPENPASSCOMMONEXPORT RelativeSpeedCondition : public ByEntityCondition
@@ -184,9 +184,9 @@ public:
     std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const;
 
 private:
-    const std::string referenceEntityName{};
-    const double value{};
-    const Rule rule{};
+    std::string referenceEntityName{};
+    double value{};
+    Rule rule{};
 };
 
 // OpenScenario ByValue Conditions
@@ -199,7 +199,7 @@ public:
     ByValueCondition(const ByValueCondition&) = default;
     virtual ~ByValueCondition();
 protected:
-    const Rule rule;
+    Rule rule;
 };
 
 class OPENPASSCOMMONEXPORT SimulationTimeCondition : public ByValueCondition
@@ -217,7 +217,7 @@ public:
     int GetTargetValue() const;
 
 private:
-    const int targetValue;
+    int targetValue;
 };
 
 using Condition = std::variant<ReachPositionCondition,
-- 
GitLab