diff --git a/src/lr-wpan/model/lr-wpan-spectrum-signal-parameters.cc b/src/lr-wpan/model/lr-wpan-spectrum-signal-parameters.cc index 8777fbc07..f3b96d61d 100644 --- a/src/lr-wpan/model/lr-wpan-spectrum-signal-parameters.cc +++ b/src/lr-wpan/model/lr-wpan-spectrum-signal-parameters.cc @@ -39,7 +39,7 @@ LrWpanSpectrumSignalParameters::LrWpanSpectrumSignalParameters (const LrWpanSpec } Ptr -LrWpanSpectrumSignalParameters::Copy (void) +LrWpanSpectrumSignalParameters::Copy (void) const { NS_LOG_FUNCTION (this); return Create (*this); diff --git a/src/lr-wpan/model/lr-wpan-spectrum-signal-parameters.h b/src/lr-wpan/model/lr-wpan-spectrum-signal-parameters.h index 19d8ff82e..a9ac40e31 100644 --- a/src/lr-wpan/model/lr-wpan-spectrum-signal-parameters.h +++ b/src/lr-wpan/model/lr-wpan-spectrum-signal-parameters.h @@ -35,9 +35,7 @@ class PacketBurst; */ struct LrWpanSpectrumSignalParameters : public SpectrumSignalParameters { - - // inherited from SpectrumSignalParameters - virtual Ptr Copy (void); + Ptr Copy (void) const override; /** * default constructor diff --git a/src/lte/model/lte-spectrum-signal-parameters.cc b/src/lte/model/lte-spectrum-signal-parameters.cc index 50bab6b9d..953bf6282 100644 --- a/src/lte/model/lte-spectrum-signal-parameters.cc +++ b/src/lte/model/lte-spectrum-signal-parameters.cc @@ -43,14 +43,12 @@ LteSpectrumSignalParameters::LteSpectrumSignalParameters (const LteSpectrumSigna } Ptr -LteSpectrumSignalParameters::Copy () +LteSpectrumSignalParameters::Copy () const { NS_LOG_FUNCTION (this); return Create (*this); } - - LteSpectrumSignalParametersDataFrame::LteSpectrumSignalParametersDataFrame () { NS_LOG_FUNCTION (this); @@ -69,7 +67,7 @@ LteSpectrumSignalParametersDataFrame::LteSpectrumSignalParametersDataFrame (cons } Ptr -LteSpectrumSignalParametersDataFrame::Copy () +LteSpectrumSignalParametersDataFrame::Copy () const { NS_LOG_FUNCTION (this); return Create (*this); @@ -92,7 +90,7 @@ LteSpectrumSignalParametersDlCtrlFrame::LteSpectrumSignalParametersDlCtrlFrame ( } Ptr -LteSpectrumSignalParametersDlCtrlFrame::Copy () +LteSpectrumSignalParametersDlCtrlFrame::Copy () const { NS_LOG_FUNCTION (this); return Create (*this); @@ -112,16 +110,10 @@ LteSpectrumSignalParametersUlSrsFrame::LteSpectrumSignalParametersUlSrsFrame (co } Ptr -LteSpectrumSignalParametersUlSrsFrame::Copy () +LteSpectrumSignalParametersUlSrsFrame::Copy () const { NS_LOG_FUNCTION (this); return Create (*this); } - - - - - - } // namespace ns3 diff --git a/src/lte/model/lte-spectrum-signal-parameters.h b/src/lte/model/lte-spectrum-signal-parameters.h index 97cddd743..ba91a210f 100644 --- a/src/lte/model/lte-spectrum-signal-parameters.h +++ b/src/lte/model/lte-spectrum-signal-parameters.h @@ -38,9 +38,7 @@ class LteControlMessage; */ struct LteSpectrumSignalParameters : public SpectrumSignalParameters { - - // inherited from SpectrumSignalParameters - virtual Ptr Copy (); + Ptr Copy () const override; /** * default constructor @@ -69,9 +67,7 @@ struct LteSpectrumSignalParameters : public SpectrumSignalParameters */ struct LteSpectrumSignalParametersDataFrame : public SpectrumSignalParameters { - - // inherited from SpectrumSignalParameters - virtual Ptr Copy (); + Ptr Copy () const override; /** * default constructor @@ -102,9 +98,7 @@ struct LteSpectrumSignalParametersDataFrame : public SpectrumSignalParameters */ struct LteSpectrumSignalParametersDlCtrlFrame : public SpectrumSignalParameters { - - // inherited from SpectrumSignalParameters - virtual Ptr Copy (); + Ptr Copy () const override; /** * default constructor @@ -133,9 +127,7 @@ struct LteSpectrumSignalParametersDlCtrlFrame : public SpectrumSignalParameters */ struct LteSpectrumSignalParametersUlSrsFrame : public SpectrumSignalParameters { - - // inherited from SpectrumSignalParameters - virtual Ptr Copy (); + Ptr Copy () const override; /** * default constructor diff --git a/src/spectrum/model/half-duplex-ideal-phy-signal-parameters.cc b/src/spectrum/model/half-duplex-ideal-phy-signal-parameters.cc index 4d64187c8..c8fbc50fb 100644 --- a/src/spectrum/model/half-duplex-ideal-phy-signal-parameters.cc +++ b/src/spectrum/model/half-duplex-ideal-phy-signal-parameters.cc @@ -40,7 +40,7 @@ HalfDuplexIdealPhySignalParameters::HalfDuplexIdealPhySignalParameters (const Ha } Ptr -HalfDuplexIdealPhySignalParameters::Copy () +HalfDuplexIdealPhySignalParameters::Copy () const { NS_LOG_FUNCTION (this); return Create (*this); diff --git a/src/spectrum/model/half-duplex-ideal-phy-signal-parameters.h b/src/spectrum/model/half-duplex-ideal-phy-signal-parameters.h index dd6a159f5..aca081aec 100644 --- a/src/spectrum/model/half-duplex-ideal-phy-signal-parameters.h +++ b/src/spectrum/model/half-duplex-ideal-phy-signal-parameters.h @@ -35,9 +35,7 @@ class Packet; */ struct HalfDuplexIdealPhySignalParameters : public SpectrumSignalParameters { - - // inherited from SpectrumSignalParameters - virtual Ptr Copy (); + Ptr Copy () const override; /** * default constructor diff --git a/src/spectrum/model/spectrum-signal-parameters.cc b/src/spectrum/model/spectrum-signal-parameters.cc index 4cee6ec04..da9699d97 100644 --- a/src/spectrum/model/spectrum-signal-parameters.cc +++ b/src/spectrum/model/spectrum-signal-parameters.cc @@ -50,7 +50,7 @@ SpectrumSignalParameters::SpectrumSignalParameters (const SpectrumSignalParamete } Ptr -SpectrumSignalParameters::Copy () +SpectrumSignalParameters::Copy () const { NS_LOG_FUNCTION (this); return Create (*this); diff --git a/src/spectrum/model/spectrum-signal-parameters.h b/src/spectrum/model/spectrum-signal-parameters.h index 1dec5e47c..06bd89b94 100644 --- a/src/spectrum/model/spectrum-signal-parameters.h +++ b/src/spectrum/model/spectrum-signal-parameters.h @@ -81,7 +81,7 @@ struct SpectrumSignalParameters : public SimpleRefCount Copy (); + virtual Ptr Copy () const; /** * The Power Spectral Density of the diff --git a/src/wifi/model/wifi-spectrum-signal-parameters.cc b/src/wifi/model/wifi-spectrum-signal-parameters.cc index 115626a68..248c37eda 100644 --- a/src/wifi/model/wifi-spectrum-signal-parameters.cc +++ b/src/wifi/model/wifi-spectrum-signal-parameters.cc @@ -42,7 +42,7 @@ WifiSpectrumSignalParameters::WifiSpectrumSignalParameters (const WifiSpectrumSi } Ptr -WifiSpectrumSignalParameters::Copy () +WifiSpectrumSignalParameters::Copy () const { NS_LOG_FUNCTION (this); // Ideally we would use: diff --git a/src/wifi/model/wifi-spectrum-signal-parameters.h b/src/wifi/model/wifi-spectrum-signal-parameters.h index 80ae0cb3d..424164fcc 100644 --- a/src/wifi/model/wifi-spectrum-signal-parameters.h +++ b/src/wifi/model/wifi-spectrum-signal-parameters.h @@ -36,7 +36,7 @@ class WifiPpdu; struct WifiSpectrumSignalParameters : public SpectrumSignalParameters { - Ptr Copy () override; + Ptr Copy () const override; /** * default constructor