Skip to content
Snippets Groups Projects
Commit 87c61548 authored by pre-commit-ci[bot]'s avatar pre-commit-ci[bot] Committed by Florent Lamiraux
Browse files

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
parent b0332dd2
No related branches found
No related tags found
No related merge requests found
Pipeline #29003 failed
...@@ -41,7 +41,7 @@ void exposeSignals(); ...@@ -41,7 +41,7 @@ void exposeSignals();
// Declare functions defined in other source files // Declare functions defined in other source files
namespace signalBase { namespace signalBase {
SignalBase<sigtime_t>* createSignalWrapper(const char* name, const char* type, SignalBase<sigtime_t>* createSignalWrapper(const char* name, const char* type,
bp::object object); bp::object object);
} // namespace signalBase } // namespace signalBase
namespace entity { namespace entity {
......
...@@ -66,8 +66,8 @@ MapOfEntities* getEntityMap() { ...@@ -66,8 +66,8 @@ MapOfEntities* getEntityMap() {
&dg::PoolStorage::getInstance()->getEntityMap()); &dg::PoolStorage::getInstance()->getEntityMap());
} }
dg::SignalBase<dg::sigtime_t>* getSignal(dg::Entity& e, const std::string& name) dg::SignalBase<dg::sigtime_t>* getSignal(dg::Entity& e,
{ const std::string& name) {
return &e.getSignal(name); return &e.getSignal(name);
} }
......
...@@ -130,8 +130,9 @@ void exposeSignals() { ...@@ -130,8 +130,9 @@ void exposeSignals() {
namespace signalBase { namespace signalBase {
template <class T> template <class T>
SignalWrapper<T, sigtime_t>* createSignalWrapperTpl(const char* name, bp::object o, SignalWrapper<T, sigtime_t>* createSignalWrapperTpl(const char* name,
std::string& error) { bp::object o,
std::string& error) {
typedef SignalWrapper<T, sigtime_t> SignalWrapper_t; typedef SignalWrapper<T, sigtime_t> SignalWrapper_t;
if (!SignalWrapper_t::checkCallable(o, error)) { if (!SignalWrapper_t::checkCallable(o, error)) {
return NULL; return NULL;
...@@ -155,39 +156,35 @@ PythonSignalContainer* getPythonSignalContainer() { ...@@ -155,39 +156,35 @@ PythonSignalContainer* getPythonSignalContainer() {
\brief Create an instance of SignalWrapper \brief Create an instance of SignalWrapper
*/ */
SignalBase<sigtime_t>* createSignalWrapper(const char* name, const char* type, SignalBase<sigtime_t>* createSignalWrapper(const char* name, const char* type,
bp::object object) { bp::object object) {
PythonSignalContainer* psc = getPythonSignalContainer(); PythonSignalContainer* psc = getPythonSignalContainer();
if (psc == NULL) return NULL; if (psc == NULL) return NULL;
SignalBase<sigtime_t>* obj = NULL; SignalBase<sigtime_t>* obj = NULL;
std::string error; std::string error;
if(command::Value::typeName(command::Value::BOOL).compare(type) == 0) { if (command::Value::typeName(command::Value::BOOL).compare(type) == 0) {
obj = createSignalWrapperTpl<bool>(name, object, error); obj = createSignalWrapperTpl<bool>(name, object, error);
} } else if (command::Value::typeName(command::Value::UNSIGNED).compare(type) ==
else if(command::Value::typeName(command::Value::UNSIGNED).compare(type) == 0) {
0) {
obj = createSignalWrapperTpl<unsigned int>(name, object, error); obj = createSignalWrapperTpl<unsigned int>(name, object, error);
} } else if (command::Value::typeName(command::Value::INT).compare(type) == 0) {
else if(command::Value::typeName(command::Value::INT).compare(type) == 0) {
obj = createSignalWrapperTpl<int>(name, object, error); obj = createSignalWrapperTpl<int>(name, object, error);
} } else if (command::Value::typeName(command::Value::UNSIGNEDLONGINT)
else if(command::Value::typeName(command::Value::UNSIGNEDLONGINT). .compare(type) == 0) {
compare(type) == 0){
obj = createSignalWrapperTpl<uint64_t>(name, object, error); obj = createSignalWrapperTpl<uint64_t>(name, object, error);
} } else if (command::Value::typeName(command::Value::LONGINT).compare(type) ==
else if(command::Value::typeName(command::Value::LONGINT).compare(type) == 0){ 0) {
obj = createSignalWrapperTpl<int64_t>(name, object, error); obj = createSignalWrapperTpl<int64_t>(name, object, error);
} } else if (command::Value::typeName(command::Value::FLOAT).compare(type) ==
else if(command::Value::typeName(command::Value::FLOAT).compare(type) == 0){ 0) {
obj = createSignalWrapperTpl<float>(name, object, error); obj = createSignalWrapperTpl<float>(name, object, error);
} } else if (command::Value::typeName(command::Value::DOUBLE).compare(type) ==
else if(command::Value::typeName(command::Value::DOUBLE).compare(type) == 0){ 0) {
obj = createSignalWrapperTpl<double>(name, object, error); obj = createSignalWrapperTpl<double>(name, object, error);
} } else if (command::Value::typeName(command::Value::VECTOR).compare(type) ==
else if(command::Value::typeName(command::Value::VECTOR).compare(type) == 0){ 0) {
obj = createSignalWrapperTpl<Vector>(name, object, error); obj = createSignalWrapperTpl<Vector>(name, object, error);
} } else {
else {
error = "Type not understood"; error = "Type not understood";
} }
......
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