Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update unsigned long to uinterval_t #1

Open
wants to merge 1 commit into
base: feature/omnet6
Choose a base branch
from
Open

Update unsigned long to uinterval_t #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/fico4omnet/utilities/ResultFilters.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "fico4omnet/utilities/ResultFilters.h"

//Auto-generated messages
#include "fico4omnet/linklayer/can/messages/CanDataFrame_m.h"
#include "fico4omnet/linklayer/can/messages/ErrorFrame_m.h"
#include "fico4omnet/linklayer/flexray/messages/FRFrame_m.h"
#include "fico4omnet/linklayer/flexray/messages/FRFrame_m.h"

namespace FiCo4OMNeT {

Expand All @@ -29,22 +29,22 @@ void IDFilter::receiveSignal(cResultFilter *prev, simtime_t_cref t,
(void)prev;
#ifdef WITH_CAN_COMMON
if (CanDataFrame* dataFrame = dynamic_cast<CanDataFrame *>(object)) {
fire(this, t, static_cast<unsigned long> (dataFrame->getCanID()), details);
fire(this, t, static_cast<uintval_t> (dataFrame->getCanID()), details);
return;
}
if (ErrorFrame* errorFrame = dynamic_cast<ErrorFrame *>(object)) {
fire(this, t, static_cast<unsigned long> (errorFrame->getCanID()), details);
fire(this, t, static_cast<uintval_t> (errorFrame->getCanID()), details);
return;
}
if (ErrorFrame* errorFrame = dynamic_cast<ErrorFrame *>(object)) {
fire(this, t, static_cast<unsigned long> (errorFrame->getCanID()), details);
fire(this, t, static_cast<uintval_t> (errorFrame->getCanID()), details);
return;
}
#endif

#ifdef WITH_FR_COMMON
if (FRFrame* frFrame = dynamic_cast<FRFrame *>(object)) {
fire(this, t, static_cast<unsigned long> (frFrame->getFrameID()), details);
fire(this, t, static_cast<uintval_t> (frFrame->getFrameID()), details);
return;
}
#endif
Expand Down Expand Up @@ -81,7 +81,7 @@ bool LowHighRatioFilter::process(simtime_t& t, double& value, __attribute__((unu
}
return true;
}

Register_ResultFilter("rmNaN", RmNaNFilter);

RmNaNFilter::RmNaNFilter()
Expand All @@ -103,8 +103,8 @@ void RmNaNFilter::finish(cResultFilter * prev)
{
(void)prev;
if(!this->hadValues){
fire(this, simTime(), static_cast<unsigned long> (0), nullptr);
}
fire(this, simTime(), static_cast<uintval_t> (0), nullptr);
}
}

}