F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings with g++ 15.1.1 in optimized mode

Browse Source
This commit is contained in:
Stefano Avallone
2025-05-02 18:00:51 +02:00
parent 463ebb3fea
commit f4e804afe1
6 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/model/attribute-container.h
View File

@@ -180,10 +180,9 @@ class AttributeContainerValue : public AttributeValue
* @tparam ITER \deduced iterator type
* \param[in] begin Points to first item to copy
* \param[in] end Points to one after last item to copy
* @return This object with items copied.
*/
template <class ITER>
inline Ptr<AttributeContainerValue<A, Sep, C>> CopyFrom(const ITER begin, const ITER end);
inline void CopyFrom(const ITER begin, const ITER end);
container_type m_container; //!< Internal container
};
@@ -572,14 +571,13 @@ AttributeContainerValue<A, Sep, C>::end() const
template <class A, char Sep, template <class...> class C>
template <class ITER>
Ptr<AttributeContainerValue<A, Sep, C>>
void
AttributeContainerValue<A, Sep, C>::CopyFrom(const ITER begin, const ITER end)
{
for (ITER iter = begin; iter != end; ++iter)
{
m_container.push_back(Create<A>(*iter));
}
return this;
}
template <typename A, char Sep, template <typename...> class C, typename T1>

2
src/lte/model/a2-a4-rsrq-handover-algorithm.cc
View File

@@ -241,7 +241,6 @@ A2A4RsrqHandoverAlgorithm::UpdateNeighbourMeasurements(uint16_t rnti, uint16_t c
{
neighbourCellMeasures = it2->second;
neighbourCellMeasures->m_cellId = cellId;
neighbourCellMeasures->m_rsrp = 0;
neighbourCellMeasures->m_rsrq = rsrq;
}
else
@@ -249,7 +248,6 @@ A2A4RsrqHandoverAlgorithm::UpdateNeighbourMeasurements(uint16_t rnti, uint16_t c
// insert a new cell entry
neighbourCellMeasures = Create<UeMeasure>();
neighbourCellMeasures->m_cellId = cellId;
neighbourCellMeasures->m_rsrp = 0;
neighbourCellMeasures->m_rsrq = rsrq;
it1->second[cellId] = neighbourCellMeasures;
}

1
src/lte/model/a2-a4-rsrq-handover-algorithm.h
View File

@@ -139,7 +139,6 @@ class A2A4RsrqHandoverAlgorithm : public LteHandoverAlgorithm
{
public:
uint16_t m_cellId; ///< Cell ID.
uint8_t m_rsrp; ///< RSRP in quantized format. \todo Can be removed?
uint8_t m_rsrq; ///< RSRQ in quantized format.
};

2
src/lte/model/lte-rrc-sap.h
View File

@@ -669,7 +669,7 @@ class LteRrcSap
{
uint16_t physCellId; ///< Phy cell ID
bool haveCgiInfo; ///< have CGI info?
CgiInfo cgiInfo; ///< CGI info
CgiInfo cgiInfo{}; ///< CGI info
bool haveRsrpResult; ///< have RSRP result
uint8_t rsrpResult; ///< RSRP result
bool haveRsrqResult; ///< have RSRQ result?

3
src/lte/model/lte-ue-mac.cc
View File

@@ -230,11 +230,11 @@ LteUeMac::LteUeMac()
m_bsrLast(),
m_freshUlBsr(false),
m_harqProcessId(0),
m_miUlHarqProcessesPacketTimer(HARQ_PERIOD, 0),
m_rnti(0),
m_imsi(0),
m_rachConfigured(false),
m_waitingForRaResponse(false)
{
NS_LOG_FUNCTION(this);
m_miUlHarqProcessesPacket.resize(HARQ_PERIOD);
@@ -243,7 +243,6 @@ LteUeMac::LteUeMac()
Ptr<PacketBurst> pb = CreateObject<PacketBurst>();
m_miUlHarqProcessesPacket.at(i) = pb;
}
m_miUlHarqProcessesPacketTimer.resize(HARQ_PERIOD, 0);
m_macSapProvider = new UeMemberLteMacSapProvider(this);
m_cmacSapProvider = new UeMemberLteUeCmacSapProvider(this);

14
src/lte/model/tdtbfq-ff-mac-scheduler.cc
View File

@@ -694,16 +694,16 @@ TdTbfqFfMacScheduler::DoSchedDlTriggerReq(
NS_LOG_INFO(this << " Processing DLHARQ feedback");
if (nLayers == 1)
{
retx.push_back(m_dlInfoListBuffered.at(i).m_harqStatus.at(0) ==
DlInfoListElement_s::NACK);
retx.push_back(false);
retx.emplace_back(m_dlInfoListBuffered.at(i).m_harqStatus.at(0) ==
DlInfoListElement_s::NACK);
retx.emplace_back(false);
}
else
{
retx.push_back(m_dlInfoListBuffered.at(i).m_harqStatus.at(0) ==
DlInfoListElement_s::NACK);
retx.push_back(m_dlInfoListBuffered.at(i).m_harqStatus.at(1) ==
DlInfoListElement_s::NACK);
retx.emplace_back(m_dlInfoListBuffered.at(i).m_harqStatus.at(0) ==
DlInfoListElement_s::NACK);
retx.emplace_back(m_dlInfoListBuffered.at(i).m_harqStatus.at(1) ==
DlInfoListElement_s::NACK);
}
if (retx.at(0) || retx.at(1))
{