Skip to content

Commit 34a4e2c

Browse files
LeStarchLeStarch
authored
NUM_PORTS -> FwIndexType (nasa#3239)
1 parent 1308b29 commit 34a4e2c

File tree

10 files changed

+40
-37
lines changed

10 files changed

+40
-37
lines changed

‎Fw/Port/InputPortBase.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace Fw {
2424
void init() override;
2525

2626
PassiveComponentBase* m_comp; // !< pointer to containing component
27-
NATIVE_INT_TYPE m_portNum; // !< port number in containing object
27+
FwIndexType m_portNum; // !< port number in containing object
2828
#if FW_OBJECT_TO_STRING == 1
2929
const char* getToStringFormatString() override; //!< Get format string for toString call
3030
#endif

‎Svc/ActiveRateGroup/ActiveRateGroup.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Svc {
3030

3131
class ActiveRateGroup : public ActiveRateGroupComponentBase {
3232
public:
33-
static constexpr NATIVE_INT_TYPE CONNECTION_COUNT_MAX = NUM_RATEGROUPMEMBEROUT_OUTPUT_PORTS;
33+
static constexpr FwIndexType CONNECTION_COUNT_MAX = NUM_RATEGROUPMEMBEROUT_OUTPUT_PORTS;
3434

3535
//! \brief ActiveRateGroup constructor
3636
//!

‎Svc/ComQueue/ComQueue.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ComQueue ::ComQueue(const char* const compName)
2828
m_allocator(nullptr),
2929
m_allocation(nullptr) {
3030
// Initialize throttles to "off"
31-
for (NATIVE_UINT_TYPE i = 0; i < TOTAL_PORT_COUNT; i++) {
31+
for (FwIndexType i = 0; i < TOTAL_PORT_COUNT; i++) {
3232
this->m_throttle[i] = false;
3333
}
3434
}
@@ -131,7 +131,7 @@ void ComQueue::comQueueIn_handler(const FwIndexType portNum, Fw::ComBuffer& data
131131
}
132132

133133
void ComQueue::buffQueueIn_handler(const FwIndexType portNum, Fw::Buffer& fwBuffer) {
134-
const NATIVE_INT_TYPE queueNum = portNum + COM_PORT_COUNT;
134+
const FwIndexType queueNum = portNum + COM_PORT_COUNT;
135135
// Ensure that the port number of buffQueueIn is consistent with the expectation
136136
FW_ASSERT(portNum >= 0 && portNum < BUFFER_PORT_COUNT, portNum);
137137
FW_ASSERT(queueNum < TOTAL_PORT_COUNT);

‎Svc/ComQueue/ComQueue.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <Utils/Types/Queue.hpp>
1414
#include "Fw/Types/MemAllocator.hpp"
1515
#include "Os/Mutex.hpp"
16+
#include <limits>
1617

1718
namespace Svc {
1819

@@ -28,6 +29,8 @@ class ComQueue : public ComQueueComponentBase {
2829
//!< Count of Fw::Buffer input ports and thus Fw::Buffer queues
2930
static const FwIndexType BUFFER_PORT_COUNT = ComQueueComponentBase::NUM_BUFFQUEUEIN_INPUT_PORTS;
3031

32+
static_assert((COM_PORT_COUNT + BUFFER_PORT_COUNT) <= std::numeric_limits<FwIndexType>::max(),
33+
"FwIndexType not large enough to hold com and buffer ports");
3134
//!< Total count of input buffer ports and thus total queues
3235
static const FwIndexType TOTAL_PORT_COUNT = COM_PORT_COUNT + BUFFER_PORT_COUNT;
3336

‎Svc/ComQueue/test/ut/ComQueueTester.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void ComQueueTester ::dispatchAll() {
3434

3535
void ComQueueTester ::configure() {
3636
ComQueue::QueueConfigurationTable configurationTable;
37-
for (NATIVE_UINT_TYPE i = 0; i < ComQueue::TOTAL_PORT_COUNT; i++){
37+
for (FwIndexType i = 0; i < ComQueue::TOTAL_PORT_COUNT; i++){
3838
configurationTable.entries[i].priority = i;
3939
configurationTable.entries[i].depth = 3;
4040
}
@@ -135,7 +135,7 @@ void ComQueueTester ::testPrioritySend() {
135135

136136
ComQueue::QueueConfigurationTable configurationTable;
137137

138-
for (NATIVE_UINT_TYPE i = 0; i < ComQueue::TOTAL_PORT_COUNT; i++) {
138+
for (FwIndexType i = 0; i < ComQueue::TOTAL_PORT_COUNT; i++) {
139139
configurationTable.entries[i].priority = ComQueue::TOTAL_PORT_COUNT - i - 1;
140140
configurationTable.entries[i].depth = 3;
141141
data[i][0] = ComQueue::TOTAL_PORT_COUNT - i - 1;
@@ -162,7 +162,7 @@ void ComQueueTester ::testPrioritySend() {
162162
ASSERT_from_buffQueueSend_SIZE(0);
163163
ASSERT_from_comQueueSend_SIZE(0);
164164

165-
for (NATIVE_INT_TYPE index = 0; index < ComQueue::TOTAL_PORT_COUNT; index++) {
165+
for (FwIndexType index = 0; index < ComQueue::TOTAL_PORT_COUNT; index++) {
166166
U8 orderKey;
167167
U32 previousComSize = fromPortHistory_comQueueSend->size();
168168
U32 previousBufSize = fromPortHistory_buffQueueSend->size();
@@ -192,7 +192,7 @@ void ComQueueTester::testExternalQueueOverflow() {
192192
ComQueueDepth expectedComDepth;
193193
BuffQueueDepth expectedBuffDepth;
194194

195-
for (NATIVE_UINT_TYPE i = 0; i < ComQueue::TOTAL_PORT_COUNT; i++) {
195+
for (FwIndexType i = 0; i < ComQueue::TOTAL_PORT_COUNT; i++) {
196196
configurationTable.entries[i].priority = i;
197197
configurationTable.entries[i].depth = 2;
198198

@@ -209,7 +209,7 @@ void ComQueueTester::testExternalQueueOverflow() {
209209
U8 data[BUFFER_LENGTH] = {0xde, 0xad, 0xbe};
210210
Fw::Buffer buffer(&data[0], sizeof(data));
211211

212-
for (NATIVE_INT_TYPE queueNum = 0; queueNum < ComQueue::TOTAL_PORT_COUNT; queueNum++) {
212+
for (FwIndexType queueNum = 0; queueNum < ComQueue::TOTAL_PORT_COUNT; queueNum++) {
213213
QueueType overflow_type;
214214
FwIndexType portNum;
215215
// queue[portNum].depth + 2 to deliberately cause overflow and check throttle of exactly 1
@@ -263,7 +263,7 @@ void ComQueueTester::testInternalQueueOverflow() {
263263
U8 data[BUFFER_LENGTH] = {0xde, 0xad, 0xbe};
264264
Fw::Buffer buffer(data, sizeof(data));
265265

266-
const NATIVE_INT_TYPE queueNum = ComQueue::COM_PORT_COUNT;
266+
const FwIndexType queueNum = ComQueue::COM_PORT_COUNT;
267267
const FwSizeType msgCountMax = this->component.m_queue.getDepth();
268268
QueueType overflow_type;
269269
FwIndexType portNum;

‎Svc/Health/HealthComponentImpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ namespace Svc {
206206
NATIVE_INT_TYPE HealthImpl::findEntry(const Fw::CmdStringArg& entry) {
207207

208208
// walk through entries
209-
for (NATIVE_UINT_TYPE tableEntry = 0; tableEntry < NUM_PINGSEND_OUTPUT_PORTS; tableEntry++) {
209+
for (FwIndexType tableEntry = 0; tableEntry < NUM_PINGSEND_OUTPUT_PORTS; tableEntry++) {
210210
if (entry == this->m_pingTrackerEntries[tableEntry].entry.entryName) {
211211
return static_cast<NATIVE_INT_TYPE>(tableEntry);
212212
}

‎Svc/Health/test/ut/HealthTester.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ namespace Svc {
168168
QUEUE_DEPTH, INSTANCE
169169
);
170170

171-
for (NATIVE_UINT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
171+
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
172172
this->pingEntries[entry].warnCycles = Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS+entry;
173173
this->pingEntries[entry].fatalCycles = Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS*2+entry+1;
174174
this->pingEntries[entry].entryName.format("task%d",entry);
@@ -209,14 +209,14 @@ namespace Svc {
209209
ASSERT_TLM_SIZE(0);
210210
ASSERT_CMD_RESPONSE_SIZE(0);
211211

212-
for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
212+
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
213213
this->keys[port] = port;
214214
}
215215

216216
//invoke run handler same number as number of ports
217217
for (U32 i = 0; i < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; i++) {
218218
this->invoke_to_Run(0,0);
219-
for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
219+
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
220220
this->keys[port] += Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS;
221221
}
222222

@@ -248,7 +248,7 @@ namespace Svc {
248248
//invoke run handler enough times for warnings
249249
for (U32 i = 0; i < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS*2; i++) {
250250
this->invoke_to_Run(0,0);
251-
for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
251+
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
252252
ASSERT_EQ(i+1,this->component.m_pingTrackerEntries[port].cycleCount);
253253
}
254254
}
@@ -258,7 +258,7 @@ namespace Svc {
258258
ASSERT_TLM_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
259259
ASSERT_EVENTS_HLTH_PING_WARN_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
260260

261-
for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
261+
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
262262
char name[80];
263263
snprintf(name, sizeof(name), "task%d",port);
264264
ASSERT_EVENTS_HLTH_PING_WARN(port,name);
@@ -282,7 +282,7 @@ namespace Svc {
282282
//invoke run handler enough times for warnings
283283
for (U32 i = 0; i < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS*2; i++) {
284284
this->invoke_to_Run(0,0);
285-
for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
285+
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
286286
ASSERT_EQ(i+1,this->component.m_pingTrackerEntries[port].cycleCount);
287287
}
288288
}
@@ -292,7 +292,7 @@ namespace Svc {
292292
ASSERT_TLM_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
293293
ASSERT_EVENTS_HLTH_PING_WARN_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
294294

295-
for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
295+
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
296296
char name[80];
297297
snprintf(name, sizeof(name), "task%d",port);
298298
ASSERT_EVENTS_HLTH_PING_WARN(port,name);
@@ -304,7 +304,7 @@ namespace Svc {
304304
//invoke run handler enough times for FATALs
305305
for (U32 i = 0; i < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; i++) {
306306
this->invoke_to_Run(0,0);
307-
for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
307+
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
308308
ASSERT_EQ(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS*2+i+1,this->component.m_pingTrackerEntries[port].cycleCount);
309309
}
310310
}
@@ -314,7 +314,7 @@ namespace Svc {
314314
ASSERT_EVENTS_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
315315
ASSERT_EVENTS_HLTH_PING_LATE_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
316316

317-
for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
317+
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
318318
char name[80];
319319
snprintf(name, sizeof(name), "task%d",port);
320320
ASSERT_EVENTS_HLTH_PING_LATE(port,name);
@@ -337,14 +337,14 @@ namespace Svc {
337337
//invoke run handler
338338
for (U32 i = 0; i < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS*2; i++) {
339339
this->invoke_to_Run(0,0);
340-
for (NATIVE_INT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
340+
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
341341
ASSERT_EQ(i+1,this->component.m_pingTrackerEntries[entry].cycleCount);
342342
}
343343
}
344344

345345
ASSERT_EVENTS_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
346346
ASSERT_EVENTS_HLTH_PING_WARN_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
347-
for (NATIVE_INT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
347+
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
348348
char name[80];
349349
snprintf(name, sizeof(name), "task%d",entry);
350350
ASSERT_EVENTS_HLTH_PING_WARN(entry, name);
@@ -395,7 +395,7 @@ namespace Svc {
395395
// check that cycle counts increase again
396396
for (U32 i = 0; i < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; i++) {
397397
this->invoke_to_Run(0,0);
398-
for (NATIVE_INT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
398+
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
399399
ASSERT_EQ(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS*2+1+i,this->component.m_pingTrackerEntries[entry].cycleCount);
400400
}
401401
}
@@ -404,7 +404,7 @@ namespace Svc {
404404
// Should be FATAL timeouts
405405
ASSERT_EVENTS_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
406406
ASSERT_EVENTS_HLTH_PING_LATE_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
407-
for (NATIVE_INT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
407+
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
408408
char name[80];
409409
snprintf(name,sizeof(name), "task%d",entry);
410410
ASSERT_EVENTS_HLTH_PING_LATE(entry,name);
@@ -426,11 +426,11 @@ namespace Svc {
426426

427427
// disable monitoring one at a time
428428

429-
for (NATIVE_INT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
429+
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
430430
this->clearEvents();
431431
this->clearHistory();
432432
// reset cycle count
433-
for (NATIVE_INT_TYPE e2 = 0; e2 < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; e2++) {
433+
for (FwIndexType e2 = 0; e2 < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; e2++) {
434434
this->component.m_pingTrackerEntries[e2].cycleCount = 0;
435435
}
436436
// disable entry
@@ -446,13 +446,13 @@ namespace Svc {
446446
ASSERT_EVENTS_HLTH_CHECK_PING(0,Fw::Enabled::DISABLED,name);
447447

448448
// run a few cycles
449-
for (NATIVE_INT_TYPE cycle = 0; cycle < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; cycle++) {
449+
for (FwIndexType cycle = 0; cycle < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; cycle++) {
450450

451451
// run a cycle
452452
this->invoke_to_Run(0,0);
453453

454454
// verify only enable entries count up
455-
for (NATIVE_INT_TYPE e3 = 0; e3 < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; e3++) {
455+
for (FwIndexType e3 = 0; e3 < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; e3++) {
456456
if (e3 == entry) {
457457
// shouldn't be counting up
458458
ASSERT_EQ(0u,this->component.m_pingTrackerEntries[e3].cycleCount);
@@ -488,7 +488,7 @@ namespace Svc {
488488
ASSERT_TLM_SIZE(0);
489489
ASSERT_CMD_RESPONSE_SIZE(0);
490490

491-
for (NATIVE_UINT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
491+
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
492492
this->clearEvents();
493493
this->clearHistory();
494494
// verify previous value
@@ -596,7 +596,7 @@ namespace Svc {
596596
ASSERT_EVENTS_SIZE(0);
597597
ASSERT_TLM_SIZE(0);
598598

599-
for (NATIVE_INT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
599+
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
600600
this->keys[entry] = entry;
601601
}
602602

@@ -654,7 +654,7 @@ namespace Svc {
654654
//check for expected EVRs
655655
ASSERT_EVENTS_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
656656
ASSERT_EVENTS_HLTH_PING_WRONG_KEY_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
657-
for (NATIVE_INT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
657+
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
658658
char name[80];
659659
snprintf(name, sizeof(name), "task%d",port);
660660
ASSERT_EVENTS_HLTH_PING_WRONG_KEY(port,name,FLAG_KEY_VALUE);
@@ -717,7 +717,7 @@ namespace Svc {
717717
ASSERT_EVENTS_SIZE(0);
718718

719719
//set up the correct keys for all ports except last
720-
for (NATIVE_INT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS - 1; port++) {
720+
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS - 1; port++) {
721721
this->keys[port] = port;
722722
}
723723
this->keys[Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS - 1] = 9999;
@@ -735,7 +735,7 @@ namespace Svc {
735735
//invoke schedIn
736736
this->invoke_to_Run(0,0);
737737

738-
for (NATIVE_INT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS - 1; port++) {
738+
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS - 1; port++) {
739739
if (i == 0) {
740740
this->keys[port] += Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS;
741741
} else {

‎Svc/RateGroupDriver/RateGroupDriver.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace Svc {
3434

3535
public:
3636
//! Size of the divider table, provided as a constants to users passing the table in
37-
static const NATIVE_UINT_TYPE DIVIDER_SIZE = NUM_CYCLEOUT_OUTPUT_PORTS;
37+
static const FwIndexType DIVIDER_SIZE = NUM_CYCLEOUT_OUTPUT_PORTS;
3838

3939
//! \class Divider
4040
//! \brief Struct describing a divider

‎Svc/StaticMemory/test/ut/StaticMemoryTester.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ namespace Svc {
7070
{
7171

7272
// bufferDeallocate
73-
for (NATIVE_INT_TYPE i = 0; i < StaticMemoryComponentBase::NUM_BUFFERALLOCATE_INPUT_PORTS; ++i) {
73+
for (FwIndexType i = 0; i < StaticMemoryComponentBase::NUM_BUFFERALLOCATE_INPUT_PORTS; ++i) {
7474
this->connect_to_bufferDeallocate(
7575
i,
7676
this->component.get_bufferDeallocate_InputPort(i)
7777
);
7878
}
7979

8080
// bufferAllocate
81-
for (NATIVE_INT_TYPE i = 0; i < StaticMemoryComponentBase::NUM_BUFFERALLOCATE_INPUT_PORTS; ++i) {
81+
for (FwIndexType i = 0; i < StaticMemoryComponentBase::NUM_BUFFERALLOCATE_INPUT_PORTS; ++i) {
8282
this->connect_to_bufferAllocate(
8383
i,
8484
this->component.get_bufferAllocate_InputPort(i)

‎Svc/UdpReceiver/test/ut/Tester.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ namespace Svc {
129129
);
130130

131131
// Output serial ports
132-
for (NATIVE_UINT_TYPE port = 0; port < UdpReceiverComponentImpl::NUM_PORTSOUT_OUTPUT_PORTS; port++) {
132+
for (FwIndexType port = 0; port < UdpReceiverComponentImpl::NUM_PORTSOUT_OUTPUT_PORTS; port++) {
133133
this->component.set_PortsOut_OutputPort(port,this->get_from_PortsOut(port));
134134
}
135135

0 commit comments

Comments
 (0)