fixed casting
This commit is contained in:
@@ -126,7 +126,6 @@ private:
|
|||||||
|
|
||||||
template <class T> bool Compare(MARTe::uint32 index);
|
template <class T> bool Compare(MARTe::uint32 index);
|
||||||
|
|
||||||
|
|
||||||
// Input signals
|
// Input signals
|
||||||
void **inputSignals;
|
void **inputSignals;
|
||||||
|
|
||||||
@@ -160,23 +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]) ==
|
return *static_cast<T *>(inputSignals[index]) == comparators[index].value;
|
||||||
static_cast<T>(comparators[index].value);
|
|
||||||
case Not:
|
case Not:
|
||||||
return *static_cast<T *>(inputSignals[index]) !=
|
return *static_cast<T *>(inputSignals[index]) != comparators[index].value;
|
||||||
static_cast<T>(comparators[index].value);
|
|
||||||
case Greater:
|
case Greater:
|
||||||
return *static_cast<T *>(inputSignals[index]) >
|
return *static_cast<T *>(inputSignals[index]) > comparators[index].value;
|
||||||
static_cast<T>(comparators[index].value);
|
|
||||||
case EqualsOrGreater:
|
case EqualsOrGreater:
|
||||||
return *static_cast<T *>(inputSignals[index]) >=
|
return *static_cast<T *>(inputSignals[index]) >= comparators[index].value;
|
||||||
static_cast<T>(comparators[index].value);
|
|
||||||
case Less:
|
case Less:
|
||||||
return *static_cast<T *>(inputSignals[index]) <
|
return *static_cast<T *>(inputSignals[index]) < comparators[index].value;
|
||||||
static_cast<T>(comparators[index].value);
|
|
||||||
default: // case EqualsOrLess:
|
default: // case EqualsOrLess:
|
||||||
return *static_cast<T *>(inputSignals[index]) <=
|
return *static_cast<T *>(inputSignals[index]) <= comparators[index].value;
|
||||||
static_cast<T>(comparators[index].value);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user