Aufgrund einer Störung des s3 Storage, könnten in nächster Zeit folgende GitLab Funktionen nicht zur Verfügung stehen: LFS, Container Registry, Job Artifacs, Uploads (Wiki, Bilder, Projekt-Exporte). Wir bitten um Verständnis. Es wird mit Hochdruck an der Behebung des Problems gearbeitet. Weitere Informationen zur Störung des Object Storage finden Sie hier: https://maintenance.itc.rwth-aachen.de/ticket/status/messages/59-object-storage-pilot

Commit 1f841116 authored by Alexander David Hellwig's avatar Alexander David Hellwig
Browse files

Merge branch '21-tag-parsing' into 'master'

Fix constructors of Callback classes

See merge request !10
parents 29a2b7ad d004fe6e
Pipeline #178200 passed with stage
in 1 minute and 46 seconds
......@@ -7,7 +7,7 @@
<groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-math-mqtt-generator</artifactId>
<version>1.3-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
<name>emam2mqtt</name>
......
......@@ -4,8 +4,7 @@
#include "<@m.mwIdent/>Adapter_${model.getEscapedCompName()}.h"
<@m.mwIdent/>Adapter_${model.getEscapedCompName()}::<@m.mwIdent/>Adapter_${model.getEscapedCompName()}() : public IAdapter_${model.getEscapedCompName()}
{
<@m.mwIdent/>Adapter_${model.getEscapedCompName()}::<@m.mwIdent/>Adapter_${model.getEscapedCompName()}()
}
......
......@@ -32,13 +32,11 @@ CallbackN.cpp
CallbackZ.cpp
CallbackB.cpp
MqttAdapter_${model.getEscapedCompName()}.cpp
${model.getEscapedCompName()}.cpp
CallbackQ.hpp
CallbackN.hpp
CallbackZ.hpp
CallbackB.hpp
MqttAdapter_${model.getEscapedCompName()}.h
#${model.getEscapedCompName()}.h
)
list(APPEND LIBRARIES ${model.getEscapedCompName()})
......
......@@ -5,7 +5,7 @@
#ifndef CallbackB_hpp
#define CallbackB_hpp
#include "${model.getEscapedCompName()}"
#include "${model.getEscapedCompName()}.h"
<@m.mwDefaultInclude/>
using namespace std;
using namespace <@m.smallIdent/>;
......@@ -15,7 +15,7 @@ class CallbackB : public virtual callback
client& cli_;
public:
CallbackB(client& cli, double* port);
CallbackB(client& cli, bool* port);
void connected(const string& cause);
......
......@@ -5,7 +5,7 @@
#ifndef CallbackN_hpp
#define CallbackN_hpp
#include "${model.getEscapedCompName()}"
#include "${model.getEscapedCompName()}.h"
<@m.mwDefaultInclude/>
using namespace std;
using namespace <@m.smallIdent/>;
......@@ -15,7 +15,7 @@ class CallbackN : public virtual callback
client& cli_;
public:
CallbackN(client& cli, double* port);
CallbackN(client& cli, int* port);
void connected(const string& cause);
......
......@@ -5,7 +5,7 @@
#ifndef CallbackQ_hpp
#define CallbackQ_hpp
#include "${model.getEscapedCompName()}"
#include "${model.getEscapedCompName()}.h"
<@m.mwDefaultInclude/>
using namespace std;
using namespace <@m.smallIdent/>;
......
......@@ -5,7 +5,7 @@
#ifndef CallbackZ_hpp
#define CallbackZ_hpp
#include "${model.getEscapedCompName()}"
#include "${model.getEscapedCompName()}.h"
<@m.mwDefaultInclude/>
using namespace std;
using namespace <@m.smallIdent/>;
......@@ -15,7 +15,7 @@ class CallbackZ : public virtual callback
client& cli_;
public:
CallbackZ(client& cli, double* port);
CallbackZ(client& cli, int* port);
void connected(const string& cause);
......
......@@ -30,13 +30,11 @@ CallbackN.cpp
CallbackZ.cpp
CallbackB.cpp
MqttAdapter_tests_a_compA.cpp
tests_a_compA.cpp
CallbackQ.hpp
CallbackN.hpp
CallbackZ.hpp
CallbackB.hpp
MqttAdapter_tests_a_compA.h
#tests_a_compA.h
)
list(APPEND LIBRARIES tests_a_compA)
......
......@@ -3,7 +3,7 @@
#ifndef CallbackB_hpp
#define CallbackB_hpp
#include "tests_a_compA"
#include "tests_a_compA.h"
#include "mqtt/client.h"
using namespace std;
using namespace mqtt;
......@@ -13,7 +13,7 @@ class CallbackB : public virtual callback
client& cli_;
public:
CallbackB(client& cli, double* port);
CallbackB(client& cli, bool* port);
void connected(const string& cause);
......
......@@ -3,7 +3,7 @@
#ifndef CallbackN_hpp
#define CallbackN_hpp
#include "tests_a_compA"
#include "tests_a_compA.h"
#include "mqtt/client.h"
using namespace std;
using namespace mqtt;
......@@ -13,7 +13,7 @@ class CallbackN : public virtual callback
client& cli_;
public:
CallbackN(client& cli, double* port);
CallbackN(client& cli, int* port);
void connected(const string& cause);
......
......@@ -3,7 +3,7 @@
#ifndef CallbackQ_hpp
#define CallbackQ_hpp
#include "tests_a_compA"
#include "tests_a_compA.h"
#include "mqtt/client.h"
using namespace std;
using namespace mqtt;
......
......@@ -3,7 +3,7 @@
#ifndef CallbackZ_hpp
#define CallbackZ_hpp
#include "tests_a_compA"
#include "tests_a_compA.h"
#include "mqtt/client.h"
using namespace std;
using namespace mqtt;
......@@ -13,7 +13,7 @@ class CallbackZ : public virtual callback
client& cli_;
public:
CallbackZ(client& cli, double* port);
CallbackZ(client& cli, int* port);
void connected(const string& cause);
......
......@@ -2,8 +2,7 @@
#include "MqttAdapter_tests_a_compA.h"
MqttAdapter_tests_a_compA::MqttAdapter_tests_a_compA() : public IAdapter_tests_a_compA
{
MqttAdapter_tests_a_compA::MqttAdapter_tests_a_compA()
}
......
......@@ -30,13 +30,11 @@ CallbackN.cpp
CallbackZ.cpp
CallbackB.cpp
MqttAdapter_tests_a_compA.cpp
tests_a_compA.cpp
CallbackQ.hpp
CallbackN.hpp
CallbackZ.hpp
CallbackB.hpp
MqttAdapter_tests_a_compA.h
#tests_a_compA.h
)
list(APPEND LIBRARIES tests_a_compA)
......
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