all: Added missing unit qualifiers to get() calls.

Author: levy

src/inet/common/FingerprintCalculator.cc

@@ -63,8 +63,8 @@ bool FingerprintCalculator::addEventIngredient(cEvent *event, cSingleFingerprint
                     auto packet = dynamic_cast<Packet *>(cpacket);
                     if (packet == nullptr)
                         packet = dynamic_cast<Packet *>(cpacket->getEncapsulatedPacket());
-                    if (packet != nullptr && packet->getTotalLength().get() > 0) {
-                        if (packet->getTotalLength().get() % 8 == 0) {
+                    if (packet != nullptr && packet->getTotalLength().get<b>() > 0) {
+                        if (packet->getTotalLength().get<b>() % 8 == 0) {
                             const auto& content = packet->peekAllAsBytes();
                             for (auto byte : content->getBytes())
                                 hasher_ << byte;

src/inet/common/ResultFilters.cc

@@ -131,7 +131,7 @@ void DataAgeFilter::receiveSignal(cResultFilter *prev, simtime_t_cref t, cObject
 {
     if (auto packet = dynamic_cast<Packet *>(object)) {
         for (auto& region : packet->peekData()->getAllTags<CreationTimeTag>()) {
-            WeightedHistogramRecorder::cWeight weight(region.getLength().get());
+            WeightedHistogramRecorder::cWeight weight(region.getLength().get<b>());
             fire(this, t, t - region.getTag()->getCreationTime(), &weight);
         }
     }
@@ -245,7 +245,7 @@ Register_ResultFilter("packetLength", PacketLengthFilter);
 void PacketLengthFilter::receiveSignal(cResultFilter *prev, simtime_t_cref t, cObject *object, cObject *details)
 {
     auto packet = check_and_cast<Packet *>(object);
-    fire(this, t, packet->getDataLength().get(), details);
+    fire(this, t, packet->getDataLength().get<b>(), details);
 }
 
 Register_ResultFilter("flowPacketLength", FlowPacketLengthFilter);

src/inet/common/packet/Packet.cc

@@ -136,9 +136,9 @@ void Packet::parsimPack(cCommBuffer *buffer) const
     cPacket::parsimPack(buffer);
     buffer->packObject(const_cast<Chunk *>(content.get()));
     buffer->pack(frontIterator.getIndex());
-    buffer->pack(frontIterator.getPosition().get());
+    buffer->pack(frontIterator.getPosition().get<b>());
     buffer->pack(backIterator.getIndex());
-    buffer->pack(backIterator.getPosition().get());
+    buffer->pack(backIterator.getPosition().get<b>());
     tags.parsimPack(buffer);
     regionTags.parsimPack(buffer);
 }

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

@@ -17,7 +17,7 @@ Register_Serializer(StreamBufferChunk, StreamBufferChunkSerializer);
 void StreamBufferChunkSerializer::serialize(MemoryOutputStream& stream, const Ptr<const Chunk>& chunk, b offset, b length) const
 {
     const auto& streamBufferChunk = staticPtrCast<const StreamBufferChunk>(chunk);
-    b currentStreamPosition = b((simTime() - streamBufferChunk->getStartTime()).dbl() * streamBufferChunk->getDatarate().get());
+    b currentStreamPosition = b((simTime() - streamBufferChunk->getStartTime()).dbl() * streamBufferChunk->getDatarate().get<bps>());
     if (length == b(-1))
         length = streamBufferChunk->getChunkLength() - offset;
     b copyLength = std::max(b(0), std::min(length, currentStreamPosition - offset));

src/inet/common/packet/tag/SharingRegionTagSet.cc

@@ -43,8 +43,8 @@ void SharingRegionTagSet::parsimPack(cCommBuffer *buffer) const
     buffer->pack(getNumTags());
     if (regionTags != nullptr) {
         for (auto regionTag : *regionTags) {
-            buffer->pack(regionTag.getOffset().get());
-            buffer->pack(regionTag.getLength().get());
+            buffer->pack(regionTag.getOffset().get<b>());
+            buffer->pack(regionTag.getLength().get<b>());
             buffer->packObject(const_cast<TagBase *>(regionTag.getTag().get()));
         }
     }

src/inet/linklayer/ieee80211/mac/Ieee80211Mac.cc

@@ -204,7 +204,7 @@ void Ieee80211Mac::handleUpperCommand(cMessage *msg)
             Ieee80211ConfigureRadioCommand *newConfigureCommand = check_and_cast<Ieee80211ConfigureRadioCommand *>(msg->getControlInfo());
             if (newConfigureCommand->getChannelNumber() == -1 && oldConfigureCommand->getChannelNumber() != -1)
                 newConfigureCommand->setChannelNumber(oldConfigureCommand->getChannelNumber());
-            if (std::isnan(newConfigureCommand->getBitrate().get()) && !std::isnan(oldConfigureCommand->getBitrate().get()))
+            if (std::isnan(newConfigureCommand->getBitrate().get<bps>()) && !std::isnan(oldConfigureCommand->getBitrate().get<bps>()))
                 newConfigureCommand->setBitrate(oldConfigureCommand->getBitrate());
             delete pendingRadioConfigMsg;
             pendingRadioConfigMsg = nullptr;

src/inet/linklayer/ieee80211/mac/coordinationfunction/Dcf.cc

@@ -113,7 +113,7 @@ void Dcf::transmitControlResponseFrame(Packet *responsePacket, const Ptr<const I
     else
         throw cRuntimeError("Unknown received frame type");
     RateSelection::setFrameMode(responsePacket, responseHeader, responseMode);
-    emit(IRateSelection::datarateSelectedSignal, responseMode->getDataMode()->getNetBitrate().get(), responsePacket);
+    emit(IRateSelection::datarateSelectedSignal, responseMode->getDataMode()->getNetBitrate().get<bps>(), responsePacket);
     EV_DEBUG << "Datarate for " << responsePacket->getName() << " is set to " << responseMode->getDataMode()->getNetBitrate() << ".\n";
     tx->transmitFrame(responsePacket, responseHeader, modeSet->getSifsTime(), this);
     delete responsePacket;
@@ -178,7 +178,7 @@ void Dcf::transmitFrame(Packet *packet, simtime_t ifs)
     const auto& header = packet->peekAtFront<Ieee80211MacHeader>();
     auto mode = rateSelection->computeMode(packet, header);
     RateSelection::setFrameMode(packet, header, mode);
-    emit(IRateSelection::datarateSelectedSignal, mode->getDataMode()->getNetBitrate().get(), packet);
+    emit(IRateSelection::datarateSelectedSignal, mode->getDataMode()->getNetBitrate().get<bps>(), packet);
     EV_DEBUG << "Datarate for " << packet->getName() << " is set to " << mode->getDataMode()->getNetBitrate() << ".\n";
     auto pendingPacket = channelAccess->getInProgressFrames()->getPendingFrameFor(packet);
     auto duration = originatorProtectionMechanism->computeDurationField(packet, header, pendingPacket, pendingPacket == nullptr ? nullptr : pendingPacket->peekAtFront<Ieee80211DataOrMgmtHeader>());

src/inet/linklayer/ieee80211/mac/coordinationfunction/Hcf.cc

@@ -660,7 +660,7 @@ void Hcf::transmitFrame(Packet *packet, simtime_t ifs)
         }
         auto mode = rateSelection->computeMode(packet, header, txop);
         setFrameMode(packet, header, mode);
-        emit(IRateSelection::datarateSelectedSignal, mode->getDataMode()->getNetBitrate().get(), packet);
+        emit(IRateSelection::datarateSelectedSignal, mode->getDataMode()->getNetBitrate().get<bps>(), packet);
         EV_DEBUG << "Datarate for " << packet->getName() << " is set to " << mode->getDataMode()->getNetBitrate() << ".\n";
         if (txop->getProtectionMechanism() == TxopProcedure::ProtectionMechanism::SINGLE_PROTECTION) {
             auto pendingPacket = channelOwner->getInProgressFrames()->getPendingFrameFor(packet);
@@ -695,7 +695,7 @@ void Hcf::transmitControlResponseFrame(Packet *responsePacket, const Ptr<const I
     else
         throw cRuntimeError("Unknown received frame type");
     setFrameMode(responsePacket, responseHeader, responseMode);
-    emit(IRateSelection::datarateSelectedSignal, responseMode->getDataMode()->getNetBitrate().get(), responsePacket);
+    emit(IRateSelection::datarateSelectedSignal, responseMode->getDataMode()->getNetBitrate().get<bps>(), responsePacket);
     EV_DEBUG << "Datarate for " << responsePacket->getName() << " is set to " << responseMode->getDataMode()->getNetBitrate() << ".\n";
     tx->transmitFrame(responsePacket, responseHeader, modeSet->getSifsTime(), this);
     delete responsePacket;

src/inet/linklayer/ieee80211/mac/originator/TxopProcedure.cc

@@ -72,7 +72,7 @@ void TxopProcedure::startTxop(AccessCategory ac)
         throw cRuntimeError("Txop is already running");
     if (limit == -1) {
         auto referenceMode = modeSet->getSlowestMandatoryMode();
-        limit = getTxopLimit(referenceMode, ac).get();
+        limit = getTxopLimit(referenceMode, ac).get<s>();
     }
     // The STA selects between single and multiple protection when it transmits the first frame of a TXOP.
     // All subsequent frames transmitted by the STA in the same TXOP use the same class of duration settings.

src/inet/linklayer/ieee80211/mgmt/Ieee80211MgmtSta.cc

@@ -749,7 +749,7 @@ void Ieee80211MgmtSta::storeAPInfo(Packet *packet, const Ptr<const Ieee80211Mgmt
     ap->beaconInterval = body->getBeaconInterval();
     auto signalPowerInd = packet->getTag<SignalPowerInd>();
     if (signalPowerInd != nullptr) {
-        ap->rxPower = signalPowerInd->getPower().get();
+        ap->rxPower = signalPowerInd->getPower().get<W>();
         if (ap->address == assocAP.address)
             assocAP.rxPower = ap->rxPower;
     }