varius fix
This commit is contained in:
@@ -238,7 +238,7 @@ bool JAConditionalSignalUpdateGAM::Setup() {
|
|||||||
if (ok) {
|
if (ok) {
|
||||||
inputSignals = new void *[numberOfInputSignals];
|
inputSignals = new void *[numberOfInputSignals];
|
||||||
uint32 i;
|
uint32 i;
|
||||||
for (uint32 i = 0u; i < numberOfOutputSignals; i++) {
|
for (uint32 i = 0u; i < numberOfInputSignals; i++) {
|
||||||
inputSignals[i] = GetInputSignalMemory(i);
|
inputSignals[i] = GetInputSignalMemory(i);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -159,17 +159,17 @@ template <class T>
|
|||||||
bool JAConditionalSignalUpdateGAM::Compare(MARTe::uint32 index) {
|
bool JAConditionalSignalUpdateGAM::Compare(MARTe::uint32 index) {
|
||||||
switch (comparators[index].comparator) {
|
switch (comparators[index].comparator) {
|
||||||
case Equals:
|
case Equals:
|
||||||
return *static_cast<T *>(inputSignals[index]) == comparators[index].value;
|
return *(T*)(inputSignals[index]) == comparators[index].value;
|
||||||
case Not:
|
case Not:
|
||||||
return *static_cast<T *>(inputSignals[index]) != comparators[index].value;
|
return *(T *)(inputSignals[index]) != comparators[index].value;
|
||||||
case Greater:
|
case Greater:
|
||||||
return *static_cast<T *>(inputSignals[index]) > comparators[index].value;
|
return *(T *)(inputSignals[index]) > comparators[index].value;
|
||||||
case EqualsOrGreater:
|
case EqualsOrGreater:
|
||||||
return *static_cast<T *>(inputSignals[index]) >= comparators[index].value;
|
return *(T *)(inputSignals[index]) >= comparators[index].value;
|
||||||
case Less:
|
case Less:
|
||||||
return *static_cast<T *>(inputSignals[index]) < comparators[index].value;
|
return *(T *)(inputSignals[index]) < comparators[index].value;
|
||||||
default: // case EqualsOrLess:
|
default: // case EqualsOrLess:
|
||||||
return *static_cast<T *>(inputSignals[index]) <= comparators[index].value;
|
return *(T *)(inputSignals[index]) <= comparators[index].value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user