all: Replaced <some_unit>(<some_expression>).get() with <some_expression>.get<some_unit>().

The latter is much more intentional and easier to read.

Author: levy

src/inet/applications/base/ApplicationPacketSerializer.cc

@@ -18,11 +18,11 @@ void ApplicationPacketSerializer::serialize(MemoryOutputStream& stream, const Pt
 {
     auto startPosition = stream.getLength();
     const auto& applicationPacket = staticPtrCast<const ApplicationPacket>(chunk);
-    stream.writeUint32Be(B(applicationPacket->getChunkLength()).get());
+    stream.writeUint32Be(applicationPacket->getChunkLength().get<B>());
     stream.writeUint32Be(applicationPacket->getSequenceNumber());
-    int64_t remainders = B(applicationPacket->getChunkLength() - (stream.getLength() - startPosition)).get();
+    int64_t remainders = (applicationPacket->getChunkLength() - (stream.getLength() - startPosition)).get<B>();
     if (remainders < 0)
-        throw cRuntimeError("ApplicationPacket length = %d smaller than required %d bytes", (int)B(applicationPacket->getChunkLength()).get(), (int)B(stream.getLength() - startPosition).get());
+        throw cRuntimeError("ApplicationPacket length = %d smaller than required %d bytes", (int)applicationPacket->getChunkLength().get<B>(), (int)(stream.getLength() - startPosition).get<B>());
     stream.writeByteRepeatedly('?', remainders);
 }
 
@@ -34,7 +34,7 @@ const Ptr<Chunk> ApplicationPacketSerializer::deserialize(MemoryInputStream& str
     applicationPacket->setSequenceNumber(stream.readUint32Be());
     B remainders = dataLength - (stream.getPosition() - startPosition);
     ASSERT(remainders >= B(0));
-    stream.readByteRepeatedly('?', B(remainders).get());
+    stream.readByteRepeatedly('?', remainders.get<B>());
     return applicationPacket;
 }
 

src/inet/applications/clock/SimpleClockSynchronizer.cc

@@ -55,8 +55,8 @@ void SimpleClockSynchronizer::synchronizeSlaveClock()
     auto masterOscillatorBasedClock = check_and_cast<OscillatorBasedClock*>(masterClock.get());
     auto clockTime = masterClock->getClockTime() + synchronizationClockTimeErrorParameter->doubleValue();
     ppm oscillatorCompensation = unit(getCurrentRelativeTickLength(slaveClock.get()) / getCurrentRelativeTickLength(masterClock.get())
-            * (1 + unit(masterOscillatorBasedClock->getOscillatorCompensation()).get())
-            * (1 + unit(ppm(synchronizationOscillatorCompensationErrorParameter->doubleValue())).get()) - 1);
+            * (1 + masterOscillatorBasedClock->getOscillatorCompensation().get<unit>())
+            * (1 + ppm(synchronizationOscillatorCompensationErrorParameter->doubleValue()).get<unit>()) - 1);
     slaveClock->setClockTime(clockTime, oscillatorCompensation, true);
 }
 

src/inet/applications/ethernet/EtherAppPacketSerializer.cc

@@ -19,12 +19,12 @@ void EtherAppReqSerializer::serialize(MemoryOutputStream& stream, const Ptr<cons
 {
     auto startPosition = stream.getLength();
     const auto& etherAppReq = staticPtrCast<const EtherAppReq>(chunk);
-    stream.writeUint32Be(B(etherAppReq->getChunkLength()).get());
+    stream.writeUint32Be(etherAppReq->getChunkLength().get<B>());
     stream.writeUint32Be(etherAppReq->getRequestId());
     stream.writeUint32Be(etherAppReq->getResponseBytes());
-    int64_t remainders = B(etherAppReq->getChunkLength() - (stream.getLength() - startPosition)).get();
+    int64_t remainders = (etherAppReq->getChunkLength() - (stream.getLength() - startPosition)).get<B>();
     if (remainders < 0)
-        throw cRuntimeError("EtherAppReq length = %d smaller than required %d bytes", (int)B(etherAppReq->getChunkLength()).get(), (int)B(stream.getLength() - startPosition).get());
+        throw cRuntimeError("EtherAppReq length = %d smaller than required %d bytes", (int)etherAppReq->getChunkLength().get<B>(), (int)(stream.getLength() - startPosition).get<B>());
     stream.writeByteRepeatedly('?', remainders);
 }
 
@@ -38,20 +38,20 @@ const Ptr<Chunk> EtherAppReqSerializer::deserialize(MemoryInputStream& stream) c
     etherAppReq->setResponseBytes(stream.readUint32Be());
     B remainders = dataLength - (stream.getPosition() - startPosition);
     ASSERT(remainders >= B(0));
-    stream.readByteRepeatedly('?', B(remainders).get());
+    stream.readByteRepeatedly('?', remainders.get<B>());
     return etherAppReq;
 }
 
 void EtherAppRespSerializer::serialize(MemoryOutputStream& stream, const Ptr<const Chunk>& chunk) const
 {
     auto startPosition = stream.getLength();
     const auto& etherAppResp = staticPtrCast<const EtherAppResp>(chunk);
-    stream.writeUint32Be(B(etherAppResp->getChunkLength()).get());
+    stream.writeUint32Be(etherAppResp->getChunkLength().get<B>());
     stream.writeUint32Be(etherAppResp->getRequestId());
     stream.writeUint32Be(etherAppResp->getNumFrames());
-    int64_t remainders = B(etherAppResp->getChunkLength() - (stream.getLength() - startPosition)).get();
+    int64_t remainders = (etherAppResp->getChunkLength() - (stream.getLength() - startPosition)).get<B>();
     if (remainders < 0)
-        throw cRuntimeError("EtherAppResp length = %d smaller than required %d bytes", (int)B(etherAppResp->getChunkLength()).get(), (int)B(stream.getLength() - startPosition).get());
+        throw cRuntimeError("EtherAppResp length = %d smaller than required %d bytes", (int)etherAppResp->getChunkLength().get<B>(), (int)(stream.getLength() - startPosition).get<B>());
     stream.writeByteRepeatedly('?', remainders);
 }
 
@@ -65,7 +65,7 @@ const Ptr<Chunk> EtherAppRespSerializer::deserialize(MemoryInputStream& stream)
     etherAppResp->setNumFrames(stream.readUint32Be());
     B remainders = dataLength - (stream.getPosition() - startPosition);
     ASSERT(remainders >= B(0));
-    stream.readByteRepeatedly('?', B(remainders).get());
+    stream.readByteRepeatedly('?', remainders.get<B>());
     return etherAppResp;
 }
 

src/inet/applications/netperfmeter/NetPerfMeter.cc

@@ -1176,7 +1176,7 @@ void NetPerfMeter::receiveMessage(cMessage *msg)
 
         ReceiverStatistics *receiverStatistics = getReceiverStatistics(streamID);
         receiverStatistics->ReceivedMessages++;
-        receiverStatistics->ReceivedBytes += B(smsg->getChunkLength()).get();
+        receiverStatistics->ReceivedBytes += smsg->getChunkLength().get<B>();
         for (auto& region : smsg->getAllTags<CreationTimeTag>())
             receiverStatistics->ReceivedDelayHistogram.collect(simTime() - region.getTag()->getCreationTime());
     }

src/inet/applications/pingapp/PingApp.cc

@@ -478,7 +478,7 @@ void PingApp::processPingResponse(int originatorId, int seqNo, Packet *packet)
     }
 
     // update statistics
-    countPingResponse(B(pingPayload->getChunkLength()).get(), seqNo, rtt, isDup);
+    countPingResponse(pingPayload->getChunkLength().get<B>(), seqNo, rtt, isDup);
 }
 
 void PingApp::countPingResponse(int bytes, long seqNo, simtime_t rtt, bool isDup)

src/inet/applications/sctpapp/SctpNatPeer.cc

@@ -353,7 +353,7 @@ void SctpNatPeer::handleMessage(cMessage *msg)
                 id = ind->getSocketId();
                 if (rendezvous) {
                     const auto& smsg = message->peekDataAsBytes();
-                    int bufferlen = B(smsg->getChunkLength()).get();
+                    int bufferlen = smsg->getChunkLength().get<B>();
                     uint8_t *buffer = new uint8_t[bufferlen];
                     std::vector<uint8_t> vec = smsg->getBytes();
                     for (int i = 0; i < bufferlen; i++) {

src/inet/applications/sctpapp/SctpNatServer.cc

@@ -265,7 +265,7 @@ void SctpNatServer::handleMessage(cMessage *msg)
                 const auto& ind = tags.findTag<SctpRcvReq>();
                 id = ind->getSocketId();
                 const auto& smsg = message->peekDataAsBytes();
-                int bufferlen = B(smsg->getChunkLength()).get();
+                int bufferlen = smsg->getChunkLength().get<B>();
                 uint8_t *buffer = new uint8_t[bufferlen];
                 std::vector<uint8_t> vec = smsg->getBytes();
                 for (int i = 0; i < bufferlen; i++) {

src/inet/applications/sctpapp/SctpPeer.cc

@@ -383,7 +383,7 @@ void SctpPeer::handleMessage(cMessage *msg)
                     cmd->setPrValue(0);
                     cmd->setSid(lastStream);
                     cmsg->setKind(cmd->getSendUnordered() ? SCTP_C_SEND_UNORDERED : SCTP_C_SEND_ORDERED);
-                    bytesSent += B(smsg->getChunkLength()).get();
+                    bytesSent += smsg->getChunkLength().get<B>();
                     packetsSent++;
                     sendOrSchedule(cmsg);
                 }

src/inet/applications/sctpapp/SctpServer.cc

@@ -398,7 +398,7 @@ void SctpServer::handleMessage(cMessage *msg)
                     cmd->setPrValue(0);
                     cmd->setSid(lastStream);
                     cmsg->setKind(cmd->getSendUnordered() ? SCTP_C_SEND_UNORDERED : SCTP_C_SEND_ORDERED);
-                    bytesSent += B(smsg->getChunkLength()).get();
+                    bytesSent += smsg->getChunkLength().get<B>();
                     packetsSent++;
                     sendOrSchedule(cmsg);
                 }

src/inet/applications/tcpapp/GenericAppMsgSerializer.cc

@@ -18,13 +18,13 @@ void GenericAppMsgSerializer::serialize(MemoryOutputStream& stream, const Ptr<co
 {
     auto startPosition = stream.getLength();
     const auto& msg = staticPtrCast<const GenericAppMsg>(chunk);
-    stream.writeUint32Be(B(msg->getChunkLength()).get());
-    stream.writeUint32Be(B(msg->getExpectedReplyLength()).get());
+    stream.writeUint32Be(msg->getChunkLength().get<B>());
+    stream.writeUint32Be(msg->getExpectedReplyLength().get<B>());
     stream.writeUint64Be(SimTime(msg->getReplyDelay()).raw());
     stream.writeByte(msg->getServerClose());
-    int64_t remainders = B(msg->getChunkLength() - (stream.getLength() - startPosition)).get();
+    int64_t remainders = (msg->getChunkLength() - (stream.getLength() - startPosition)).get<B>();
     if (remainders < 0)
-        throw cRuntimeError("GenericAppMsg length = %d smaller than required %d bytes", (int)B(msg->getChunkLength()).get(), (int)B(stream.getLength() - startPosition).get());
+        throw cRuntimeError("GenericAppMsg length = %d smaller than required %d bytes", (int)msg->getChunkLength().get<B>(), (int)(stream.getLength() - startPosition).get<B>());
     stream.writeByteRepeatedly('?', remainders);
 }