Skip to content

Commit d2aeda2

Browse files
committed
All: Fixed some additional warnings generated by Mac OS cross compilation.
1 parent b2ceb2a commit d2aeda2

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/inet/common/Compat.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const char *SharedDataManager::getSharedCounterName(sharedcounterhandle_t handle
7070

7171
uint64_t& SharedDataManager::getSharedCounter(sharedcounterhandle_t handle, uint64_t initialValue)
7272
{
73-
if (sharedCounters.size() <= handle)
73+
if ((int)sharedCounters.size() <= handle)
7474
throw cRuntimeError("getSharedCounter(): invalid handle %lu, or number of shared counters exhausted (you can increase table size in " __FILE__ ")", (unsigned long)handle); // fixed size to prevent array reallocation which would invalidate returned references -- increase if necessary
7575
uint64_t& counter = sharedCounters[handle];
7676
if (counter == INVALID)

src/inet/common/ResultFilters.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ void PacketRateFilter::emitPacketRate(simtime_t endInterval, cObject *details)
711711

712712
void PacketRateFilter::receiveSignal(cResultFilter *prev, simtime_t_cref t, cObject *object, cObject *details)
713713
{
714-
if (auto packet = dynamic_cast<cPacket *>(object)) {
714+
if (dynamic_cast<cPacket *>(object)) {
715715
const simtime_t now = simTime();
716716
if (lastSignalTime + interval <= now) {
717717
emitPacketRate(lastSignalTime + interval, details);

src/inet/common/packet/serializer/FieldsChunkSerializer.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ void FieldsChunkSerializer::serialize(MemoryOutputStream& stream, const Ptr<cons
2626
ChunkSerializer::totalSerializedLength += chunkStream.getLength();
2727
}
2828
else if (fieldsChunk->getSerializedBytes() != nullptr) {
29-
CHUNK_CHECK_USAGE(B(fieldsChunk->getSerializedBytes()->size()) == chunk->getChunkLength(), "serialized length is incorrect: serialized=%ld, chunk=%ld", fieldsChunk->getSerializedBytes()->size(), B(chunk->getChunkLength()).get());
29+
CHUNK_CHECK_USAGE(B(fieldsChunk->getSerializedBytes()->size()) == chunk->getChunkLength(), "serialized length is incorrect: serialized=%ld, chunk=%" PRIi64, fieldsChunk->getSerializedBytes()->size(), B(chunk->getChunkLength()).get());
3030
stream.writeBytes(*fieldsChunk->getSerializedBytes(), offset, length);
3131
}
3232
else if (offset == b(0) && length == chunk->getChunkLength()) {
@@ -38,7 +38,7 @@ void FieldsChunkSerializer::serialize(MemoryOutputStream& stream, const Ptr<cons
3838
auto serializedBytes = new std::vector<uint8_t>();
3939
stream.copyData(*serializedBytes, startPosition, serializedLength);
4040
fieldsChunk->setSerializedBytes(serializedBytes);
41-
CHUNK_CHECK_USAGE(B(serializedBytes->size()) == chunk->getChunkLength(), "serialized length is incorrect: serialized=%ld, chunk=%ld", serializedBytes->size(), B(chunk->getChunkLength()).get());
41+
CHUNK_CHECK_USAGE(B(serializedBytes->size()) == chunk->getChunkLength(), "serialized length is incorrect: serialized=%ld, chunk=%" PRIi64, serializedBytes->size(), B(chunk->getChunkLength()).get());
4242
}
4343
else {
4444
MemoryOutputStream chunkStream(fieldsChunk->getChunkLength());
@@ -48,7 +48,7 @@ void FieldsChunkSerializer::serialize(MemoryOutputStream& stream, const Ptr<cons
4848
auto serializedBytes = new std::vector<uint8_t>();
4949
chunkStream.copyData(*serializedBytes);
5050
fieldsChunk->setSerializedBytes(serializedBytes);
51-
CHUNK_CHECK_USAGE(B(serializedBytes->size()) == chunk->getChunkLength(), "serialized length is incorrect: serialized=%ld, chunk=%ld", serializedBytes->size(), B(chunk->getChunkLength()).get());
51+
CHUNK_CHECK_USAGE(B(serializedBytes->size()) == chunk->getChunkLength(), "serialized length is incorrect: serialized=%ld, chunk=%" PRIi64, serializedBytes->size(), B(chunk->getChunkLength()).get());
5252
}
5353
}
5454

@@ -63,7 +63,7 @@ const Ptr<Chunk> FieldsChunkSerializer::deserialize(MemoryInputStream& stream, c
6363
auto serializedBytes = new std::vector<uint8_t>();
6464
stream.copyData(*serializedBytes, startPosition, chunkLength);
6565
fieldsChunk->setSerializedBytes(serializedBytes);
66-
CHUNK_CHECK_USAGE(B(serializedBytes->size()) == fieldsChunk->getChunkLength(), "serialized length is incorrect: serialized=%ld, chunk=%ld", serializedBytes->size(), B(fieldsChunk->getChunkLength()).get());
66+
CHUNK_CHECK_USAGE(B(serializedBytes->size()) == fieldsChunk->getChunkLength(), "serialized length is incorrect: serialized=%ld, chunk=%" PRIi64, serializedBytes->size(), B(fieldsChunk->getChunkLength()).get());
6767
return fieldsChunk;
6868
}
6969

src/inet/networklayer/ipv4/Icmp.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ void Icmp::sendPtbMessage(Packet *packet, int mtu)
138138
if (maySendErrorMessage(packet, -1)) {
139139
// assemble a message name
140140
char msgname[80];
141-
sprintf(msgname, "ICMP-PTB-#%ld-mtu%d", ++ctr, mtu);
141+
sprintf(msgname, "ICMP-PTB-#%" PRIu64 "-mtu%d", ++ctr, mtu);
142142

143143
// debugging information
144144
EV_DETAIL << "sending ICMP PTB " << msgname << endl;
@@ -166,7 +166,7 @@ void Icmp::sendErrorMessage(Packet *packet, int inputInterfaceId, IcmpType type,
166166
if (maySendErrorMessage(packet, inputInterfaceId)) {
167167
// assemble a message name
168168
char msgname[80];
169-
sprintf(msgname, "ICMP-error-#%ld-type%d-code%d", ++ctr, type, code);
169+
sprintf(msgname, "ICMP-error-#%" PRIu64 "-type%d-code%d", ++ctr, type, code);
170170

171171
// debugging information
172172
EV_DETAIL << "sending ICMP error " << msgname << endl;

0 commit comments

Comments
 (0)