Commit c561f3db authored by Uwe Woessner's avatar Uwe Woessner
Browse files

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: Uwe Woessner's avatarhpcwoess <woessner@hlrs.de>
parent 8cd4fc31
...@@ -78,7 +78,7 @@ public: ...@@ -78,7 +78,7 @@ public:
} }
private: private:
const std::vector<std::string> triggeringEntityNames; std::vector<std::string> triggeringEntityNames;
}; };
class OPENPASSCOMMONEXPORT TimeToCollisionCondition : public ByEntityCondition class OPENPASSCOMMONEXPORT TimeToCollisionCondition : public ByEntityCondition
...@@ -99,9 +99,9 @@ public: ...@@ -99,9 +99,9 @@ public:
std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const; std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const;
private: private:
const std::string referenceEntityName; std::string referenceEntityName;
const double targetTTC; double targetTTC;
const Rule rule; Rule rule;
}; };
class OPENPASSCOMMONEXPORT TimeHeadwayCondition : public ByEntityCondition class OPENPASSCOMMONEXPORT TimeHeadwayCondition : public ByEntityCondition
...@@ -124,10 +124,10 @@ public: ...@@ -124,10 +124,10 @@ public:
std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const; std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const;
private: private:
const std::string referenceEntityName; std::string referenceEntityName;
const double targetTHW; double targetTHW;
const bool freeSpace; bool freeSpace;
const Rule rule; Rule rule;
}; };
class OPENPASSCOMMONEXPORT ReachPositionCondition : public ByEntityCondition class OPENPASSCOMMONEXPORT ReachPositionCondition : public ByEntityCondition
...@@ -162,8 +162,8 @@ public: ...@@ -162,8 +162,8 @@ public:
std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const; std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const;
private: private:
const double tolerance{}; double tolerance{};
const openScenario::Position position{}; openScenario::Position position{};
}; };
class OPENPASSCOMMONEXPORT RelativeSpeedCondition : public ByEntityCondition class OPENPASSCOMMONEXPORT RelativeSpeedCondition : public ByEntityCondition
...@@ -184,9 +184,9 @@ public: ...@@ -184,9 +184,9 @@ public:
std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const; std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const;
private: private:
const std::string referenceEntityName{}; std::string referenceEntityName{};
const double value{}; double value{};
const Rule rule{}; Rule rule{};
}; };
// OpenScenario ByValue Conditions // OpenScenario ByValue Conditions
...@@ -199,7 +199,7 @@ public: ...@@ -199,7 +199,7 @@ public:
ByValueCondition(const ByValueCondition&) = default; ByValueCondition(const ByValueCondition&) = default;
virtual ~ByValueCondition(); virtual ~ByValueCondition();
protected: protected:
const Rule rule; Rule rule;
}; };
class OPENPASSCOMMONEXPORT SimulationTimeCondition : public ByValueCondition class OPENPASSCOMMONEXPORT SimulationTimeCondition : public ByValueCondition
...@@ -217,7 +217,7 @@ public: ...@@ -217,7 +217,7 @@ public:
int GetTargetValue() const; int GetTargetValue() const;
private: private:
const int targetValue; int targetValue;
}; };
using Condition = std::variant<ReachPositionCondition, using Condition = std::variant<ReachPositionCondition,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment