Skip to content
Snippets Groups Projects
Commit 8e030bd6 authored by Uwe Woessner's avatar Uwe Woessner
Browse files

MSVC does not like char[], this is interpreted as char[1] which does not match the initializer.

changed to char*
this should work with gcc and MSVC
parent 651faac7
No related branches found
No related tags found
No related merge requests found
......@@ -35,7 +35,7 @@ public:
{
}
static constexpr char TOPIC[]{"OpenSCENARIO/Position"};
static constexpr char *TOPIC{"OpenSCENARIO/Position"};
const openScenario::Position position;
};
......
......@@ -24,7 +24,7 @@ namespace openpass::events {
class ComponentStateChangeEvent : public OpenScenarioEvent
{
public:
static constexpr char TOPIC[] {"OpenSCENARIO/UserDefinedAction/CustomCommandAction/SetComponentState"};
static constexpr char *TOPIC{"OpenSCENARIO/UserDefinedAction/CustomCommandAction/SetComponentState"};
ComponentStateChangeEvent(int time, std::string eventName, std::string source,
openpass::type::TriggeringEntities triggeringAgents, openpass::type::AffectedEntities actingAgents,
......
......@@ -20,7 +20,7 @@ namespace openpass::events {
class DefaultCustomCommandActionEvent : public OpenScenarioEvent
{
public:
static constexpr char TOPIC[]{"OpenSCENARIO/UserDefinedAction/CustomCommandAction/DefaultCustomCommandAction"};
static constexpr char *TOPIC{"OpenSCENARIO/UserDefinedAction/CustomCommandAction/DefaultCustomCommandAction"};
DefaultCustomCommandActionEvent(int time, const std::string eventName, std::string source, const int agentId, std::string command) :
OpenScenarioEvent{time, eventName, source, {}, {{agentId}}},
......
......@@ -23,7 +23,7 @@ namespace openpass::events {
class LaneChangeEvent : public OpenScenarioEvent
{
public:
static constexpr char TOPIC[] {"OpenSCENARIO/PrivateAction/LateralAction/LaneChangeAction"};
static constexpr char *TOPIC{"OpenSCENARIO/PrivateAction/LateralAction/LaneChangeAction"};
LaneChangeEvent(int time, const std::string eventName, const std::string source, int agentId, const openScenario::LaneChangeParameter laneChange):
OpenScenarioEvent{time, std::move(eventName), std::move(source), {}, {{agentId}}},
......
......@@ -23,7 +23,7 @@ namespace openpass::events {
class SpeedActionEvent : public OpenScenarioEvent
{
public:
static constexpr char TOPIC[] {"openSCENARIO/LongitudinalAction/SpeedAction"};
static constexpr char *TOPIC{"openSCENARIO/LongitudinalAction/SpeedAction"};
SpeedActionEvent(int time, const std::string eventName, const std::string source, int agentId, const openScenario::SpeedAction speedAction) :
OpenScenarioEvent(time, std::move(eventName), std::move(source), {}, {{agentId}}),
......
......@@ -30,7 +30,7 @@ namespace openpass::events {
class TrajectoryEvent : public OpenScenarioEvent
{
public:
static constexpr char TOPIC[] {"OpenSCENARIO/Trajectory"};
static constexpr char *TOPIC{"OpenSCENARIO/Trajectory"};
TrajectoryEvent(int time, const std::string eventName, const std::string source, int agentId, const openScenario::Trajectory trajectory):
OpenScenarioEvent{time, std::move(eventName), std::move(source), {}, {{agentId}}},
......
......@@ -21,7 +21,7 @@
class StringSignal : public ComponentStateSignalInterface
{
public:
static constexpr char COMPONENTNAME[]{"StringSignal"};
static constexpr char *COMPONENTNAME{"StringSignal"};
StringSignal() :
payload{}
......
......@@ -41,7 +41,7 @@
class OpenScenarioActionsImplementation : public UnrestrictedEventModelInterface
{
public:
static constexpr char COMPONENTNAME[]{"OpenScenarioActions"};
static constexpr char *COMPONENTNAME{"OpenScenarioActions"};
OpenScenarioActionsImplementation(std::string componentName,
bool isInit,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment