From 49befbc216e97c0cfa9b0b3029b543ea3584ac57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Sun, 27 Nov 2022 17:29:42 +0100 Subject: [PATCH] wifi: Cleanup destructors in WifiPpdu child classes --- src/wifi/model/eht/eht-ppdu.cc | 5 ----- src/wifi/model/eht/eht-ppdu.h | 4 ---- src/wifi/model/he/he-ppdu.cc | 8 -------- src/wifi/model/he/he-ppdu.h | 5 ----- src/wifi/model/ht/ht-ppdu.cc | 8 -------- src/wifi/model/ht/ht-ppdu.h | 5 ----- src/wifi/model/non-ht/dsss-ppdu.cc | 8 -------- src/wifi/model/non-ht/dsss-ppdu.h | 5 ----- src/wifi/model/non-ht/erp-ofdm-ppdu.cc | 4 ---- src/wifi/model/non-ht/erp-ofdm-ppdu.h | 4 ---- src/wifi/model/non-ht/ofdm-ppdu.cc | 8 -------- src/wifi/model/non-ht/ofdm-ppdu.h | 5 ----- src/wifi/model/vht/vht-ppdu.cc | 8 -------- src/wifi/model/vht/vht-ppdu.h | 5 ----- 14 files changed, 82 deletions(-) diff --git a/src/wifi/model/eht/eht-ppdu.cc b/src/wifi/model/eht/eht-ppdu.cc index ca3a37b5a..9ed849d39 100644 --- a/src/wifi/model/eht/eht-ppdu.cc +++ b/src/wifi/model/eht/eht-ppdu.cc @@ -55,11 +55,6 @@ EhtPpdu::EhtPpdu(const WifiConstPsduMap& psdus, } } -EhtPpdu::~EhtPpdu() -{ - NS_LOG_FUNCTION(this); -} - WifiPpduType EhtPpdu::GetType() const { diff --git a/src/wifi/model/eht/eht-ppdu.h b/src/wifi/model/eht/eht-ppdu.h index 167cf1a75..4be50bc6b 100644 --- a/src/wifi/model/eht/eht-ppdu.h +++ b/src/wifi/model/eht/eht-ppdu.h @@ -60,10 +60,6 @@ class EhtPpdu : public HePpdu WifiPhyBand band, uint64_t uid, TxPsdFlag flag); - /** - * Destructor for EhtPpdu. - */ - ~EhtPpdu() override; WifiPpduType GetType() const override; Ptr Copy() const override; diff --git a/src/wifi/model/he/he-ppdu.cc b/src/wifi/model/he/he-ppdu.cc index 3f52bc76c..a9c6ed90f 100644 --- a/src/wifi/model/he/he-ppdu.cc +++ b/src/wifi/model/he/he-ppdu.cc @@ -102,10 +102,6 @@ HePpdu::HePpdu(Ptr psdu, SetTxPsdFlag(PSD_NON_HE_PORTION); } -HePpdu::~HePpdu() -{ -} - void HePpdu::SetPhyHeaders(const WifiTxVector& txVector, Time ppduDuration) { @@ -338,10 +334,6 @@ HePpdu::HeSigHeader::HeSigHeader() { } -HePpdu::HeSigHeader::~HeSigHeader() -{ -} - TypeId HePpdu::HeSigHeader::GetTypeId() { diff --git a/src/wifi/model/he/he-ppdu.h b/src/wifi/model/he/he-ppdu.h index cd3cfa6ef..22fa58896 100644 --- a/src/wifi/model/he/he-ppdu.h +++ b/src/wifi/model/he/he-ppdu.h @@ -51,7 +51,6 @@ class HePpdu : public OfdmPpdu { public: HeSigHeader(); - ~HeSigHeader() override; /** * \brief Get the type ID. @@ -195,10 +194,6 @@ class HePpdu : public OfdmPpdu WifiPhyBand band, uint64_t uid, TxPsdFlag flag); - /** - * Destructor for HePpdu. - */ - ~HePpdu() override; Time GetTxDuration() const override; Ptr Copy() const override; diff --git a/src/wifi/model/ht/ht-ppdu.cc b/src/wifi/model/ht/ht-ppdu.cc index b61e5d880..f45c1e13a 100644 --- a/src/wifi/model/ht/ht-ppdu.cc +++ b/src/wifi/model/ht/ht-ppdu.cc @@ -66,10 +66,6 @@ HtPpdu::HtPpdu(Ptr psdu, m_htSig.SetShortGuardInterval(txVector.GetGuardInterval() == 400); } -HtPpdu::~HtPpdu() -{ -} - WifiTxVector HtPpdu::DoGetTxVector() const { @@ -107,10 +103,6 @@ HtPpdu::HtSigHeader::HtSigHeader() { } -HtPpdu::HtSigHeader::~HtSigHeader() -{ -} - TypeId HtPpdu::HtSigHeader::GetTypeId() { diff --git a/src/wifi/model/ht/ht-ppdu.h b/src/wifi/model/ht/ht-ppdu.h index 8b5d875db..a96603696 100644 --- a/src/wifi/model/ht/ht-ppdu.h +++ b/src/wifi/model/ht/ht-ppdu.h @@ -52,7 +52,6 @@ class HtPpdu : public OfdmPpdu { public: HtSigHeader(); - ~HtSigHeader() override; /** * \brief Get the type ID. @@ -151,10 +150,6 @@ class HtPpdu : public OfdmPpdu Time ppduDuration, WifiPhyBand band, uint64_t uid); - /** - * Destructor for HtPpdu. - */ - ~HtPpdu() override; Time GetTxDuration() const override; Ptr Copy() const override; diff --git a/src/wifi/model/non-ht/dsss-ppdu.cc b/src/wifi/model/non-ht/dsss-ppdu.cc index 6980e88d9..41b2abf55 100644 --- a/src/wifi/model/non-ht/dsss-ppdu.cc +++ b/src/wifi/model/non-ht/dsss-ppdu.cc @@ -45,10 +45,6 @@ DsssPpdu::DsssPpdu(Ptr psdu, m_dsssSig.SetLength(psduDuration.GetMicroSeconds()); } -DsssPpdu::~DsssPpdu() -{ -} - WifiTxVector DsssPpdu::DoGetTxVector() const { @@ -81,10 +77,6 @@ DsssPpdu::DsssSigHeader::DsssSigHeader() { } -DsssPpdu::DsssSigHeader::~DsssSigHeader() -{ -} - TypeId DsssPpdu::DsssSigHeader::GetTypeId() { diff --git a/src/wifi/model/non-ht/dsss-ppdu.h b/src/wifi/model/non-ht/dsss-ppdu.h index d1d724ae7..4d1db2a13 100644 --- a/src/wifi/model/non-ht/dsss-ppdu.h +++ b/src/wifi/model/non-ht/dsss-ppdu.h @@ -53,7 +53,6 @@ class DsssPpdu : public WifiPpdu { public: DsssSigHeader(); - ~DsssSigHeader() override; /** * \brief Get the type ID. @@ -111,10 +110,6 @@ class DsssPpdu : public WifiPpdu uint16_t txCenterFreq, Time ppduDuration, uint64_t uid); - /** - * Destructor for DsssPpdu. - */ - ~DsssPpdu() override; Time GetTxDuration() const override; Ptr Copy() const override; diff --git a/src/wifi/model/non-ht/erp-ofdm-ppdu.cc b/src/wifi/model/non-ht/erp-ofdm-ppdu.cc index b58abe55e..79a2e20e4 100644 --- a/src/wifi/model/non-ht/erp-ofdm-ppdu.cc +++ b/src/wifi/model/non-ht/erp-ofdm-ppdu.cc @@ -40,10 +40,6 @@ ErpOfdmPpdu::ErpOfdmPpdu(Ptr psdu, NS_LOG_FUNCTION(this << psdu << txVector << txCenterFreq << band << uid); } -ErpOfdmPpdu::~ErpOfdmPpdu() -{ -} - WifiTxVector ErpOfdmPpdu::DoGetTxVector() const { diff --git a/src/wifi/model/non-ht/erp-ofdm-ppdu.h b/src/wifi/model/non-ht/erp-ofdm-ppdu.h index 74d566162..fda38a8af 100644 --- a/src/wifi/model/non-ht/erp-ofdm-ppdu.h +++ b/src/wifi/model/non-ht/erp-ofdm-ppdu.h @@ -58,10 +58,6 @@ class ErpOfdmPpdu : public OfdmPpdu uint16_t txCenterFreq, WifiPhyBand band, uint64_t uid); - /** - * Destructor for ErpOfdmPpdu. - */ - ~ErpOfdmPpdu() override; Ptr Copy() const override; diff --git a/src/wifi/model/non-ht/ofdm-ppdu.cc b/src/wifi/model/non-ht/ofdm-ppdu.cc index bfdf9753b..84c2e82bc 100644 --- a/src/wifi/model/non-ht/ofdm-ppdu.cc +++ b/src/wifi/model/non-ht/ofdm-ppdu.cc @@ -50,10 +50,6 @@ OfdmPpdu::OfdmPpdu(Ptr psdu, } } -OfdmPpdu::~OfdmPpdu() -{ -} - WifiTxVector OfdmPpdu::DoGetTxVector() const { @@ -87,10 +83,6 @@ OfdmPpdu::LSigHeader::LSigHeader() { } -OfdmPpdu::LSigHeader::~LSigHeader() -{ -} - TypeId OfdmPpdu::LSigHeader::GetTypeId() { diff --git a/src/wifi/model/non-ht/ofdm-ppdu.h b/src/wifi/model/non-ht/ofdm-ppdu.h index fc14a1c9a..eada5fad5 100644 --- a/src/wifi/model/non-ht/ofdm-ppdu.h +++ b/src/wifi/model/non-ht/ofdm-ppdu.h @@ -55,7 +55,6 @@ class OfdmPpdu : public WifiPpdu { public: LSigHeader(); - ~LSigHeader() override; /** * \brief Get the type ID. @@ -118,10 +117,6 @@ class OfdmPpdu : public WifiPpdu WifiPhyBand band, uint64_t uid, bool instantiateLSig = true); - /** - * Destructor for OfdmPpdu. - */ - ~OfdmPpdu() override; Time GetTxDuration() const override; Ptr Copy() const override; diff --git a/src/wifi/model/vht/vht-ppdu.cc b/src/wifi/model/vht/vht-ppdu.cc index 2b9c6cbda..9b014a7bc 100644 --- a/src/wifi/model/vht/vht-ppdu.cc +++ b/src/wifi/model/vht/vht-ppdu.cc @@ -67,10 +67,6 @@ VhtPpdu::VhtPpdu(Ptr psdu, m_vhtSig.SetNStreams(txVector.GetNss()); } -VhtPpdu::~VhtPpdu() -{ -} - WifiTxVector VhtPpdu::DoGetTxVector() const { @@ -126,10 +122,6 @@ VhtPpdu::VhtSigHeader::VhtSigHeader() { } -VhtPpdu::VhtSigHeader::~VhtSigHeader() -{ -} - TypeId VhtPpdu::VhtSigHeader::GetTypeId() { diff --git a/src/wifi/model/vht/vht-ppdu.h b/src/wifi/model/vht/vht-ppdu.h index 96a8b7360..0790950a1 100644 --- a/src/wifi/model/vht/vht-ppdu.h +++ b/src/wifi/model/vht/vht-ppdu.h @@ -52,7 +52,6 @@ class VhtPpdu : public OfdmPpdu { public: VhtSigHeader(); - ~VhtSigHeader() override; /** * \brief Get the type ID. @@ -165,10 +164,6 @@ class VhtPpdu : public OfdmPpdu Time ppduDuration, WifiPhyBand band, uint64_t uid); - /** - * Destructor for VhtPpdu. - */ - ~VhtPpdu() override; Time GetTxDuration() const override; Ptr Copy() const override;