diff --git a/src/internet/model/ipv4-l3-protocol.h b/src/internet/model/ipv4-l3-protocol.h index 5420d4560..170533b9f 100644 --- a/src/internet/model/ipv4-l3-protocol.h +++ b/src/internet/model/ipv4-l3-protocol.h @@ -245,6 +245,7 @@ class Ipv4L3Protocol : public Ipv4 * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptr in a future release. */ + // NS_DEPRECATED() - tag for future removal typedef void (*TxRxTracedCallback)(Ptr packet, Ptr ipv4, uint32_t interface); @@ -260,6 +261,7 @@ class Ipv4L3Protocol : public Ipv4 * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptr in a future release. */ + // NS_DEPRECATED() - tag for future removal typedef void (*DropTracedCallback)(const Ipv4Header& header, Ptr packet, DropReason reason, @@ -479,15 +481,18 @@ class Ipv4L3Protocol : public Ipv4 /// Trace of transmitted packets /// \deprecated The non-const \c Ptr argument is deprecated /// and will be changed to \c Ptr in a future release. + // NS_DEPRECATED() - tag for future removal TracedCallback, Ptr, uint32_t> m_txTrace; /// Trace of received packets /// \deprecated The non-const \c Ptr argument is deprecated /// and will be changed to \c Ptr in a future release. + // NS_DEPRECATED() - tag for future removal TracedCallback, Ptr, uint32_t> m_rxTrace; // (ifindex not valid if reason is DROP_NO_ROUTE) /// Trace of dropped packets /// \deprecated The non-const \c Ptr argument is deprecated /// and will be changed to \c Ptr in a future release. + // NS_DEPRECATED() - tag for future removal TracedCallback, DropReason, Ptr, uint32_t> m_dropTrace; diff --git a/src/internet/model/ipv6-l3-protocol.h b/src/internet/model/ipv6-l3-protocol.h index efc57f704..3b52c3879 100644 --- a/src/internet/model/ipv6-l3-protocol.h +++ b/src/internet/model/ipv6-l3-protocol.h @@ -394,6 +394,7 @@ class Ipv6L3Protocol : public Ipv6 * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptr in a future release. */ + // NS_DEPRECATED() - tag for future removal typedef void (*TxRxTracedCallback)(Ptr packet, Ptr ipv6, uint32_t interface); @@ -409,6 +410,7 @@ class Ipv6L3Protocol : public Ipv6 * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptr in a future release. */ + // NS_DEPRECATED() - tag for future removal typedef void (*DropTracedCallback)(const Ipv6Header& header, Ptr packet, DropReason reason, @@ -557,6 +559,7 @@ class Ipv6L3Protocol : public Ipv6 * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptr in a future release. */ + // NS_DEPRECATED() - tag for future removal TracedCallback, Ptr, uint32_t> m_txTrace; /** @@ -564,6 +567,7 @@ class Ipv6L3Protocol : public Ipv6 * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptr in a future release. */ + // NS_DEPRECATED() - tag for future removal TracedCallback, Ptr, uint32_t> m_rxTrace; /** @@ -571,6 +575,7 @@ class Ipv6L3Protocol : public Ipv6 * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptr in a future release. */ + // NS_DEPRECATED() - tag for future removal TracedCallback, DropReason, Ptr, uint32_t> m_dropTrace; diff --git a/src/lr-wpan/model/lr-wpan-mac.h b/src/lr-wpan/model/lr-wpan-mac.h index 19201084e..a894d0287 100644 --- a/src/lr-wpan/model/lr-wpan-mac.h +++ b/src/lr-wpan/model/lr-wpan-mac.h @@ -728,6 +728,7 @@ class LrWpanMac : public LrWpanMacBase * TracedValue \c MacStateValue. The \c MacState TracedCallback will * be removed in a future release. */ + // NS_DEPRECATED() - tag for future removal typedef void (*StateTracedCallback)(MacState oldState, MacState newState); protected: @@ -1127,6 +1128,7 @@ class LrWpanMac : public LrWpanMacBase * removed in a future release, Instead, use the \c MacStateValue * TracedValue. */ + // NS_DEPRECATED() - tag for future removal TracedCallback m_macStateLogger; /** diff --git a/src/lr-wpan/model/lr-wpan-phy.h b/src/lr-wpan/model/lr-wpan-phy.h index db36061ac..3d6cfaf0d 100644 --- a/src/lr-wpan/model/lr-wpan-phy.h +++ b/src/lr-wpan/model/lr-wpan-phy.h @@ -556,6 +556,7 @@ class LrWpanPhy : public SpectrumPhy * TracedValue \c TrxStateValue. The \c TrxState TracedCallback will * be removed in a future release. */ + // NS_DEPRECATED() - tag for future removal typedef void (*StateTracedCallback)(Time time, PhyEnumeration oldState, PhyEnumeration newState); @@ -738,6 +739,7 @@ class LrWpanPhy : public SpectrumPhy * TracedValue \c TrxStateValue. This TracedCallback will * be removed in a future release. */ + // NS_DEPRECATED() - tag for future removal TracedCallback m_trxStateLogger; /** diff --git a/src/lte/model/lte-enb-phy.h b/src/lte/model/lte-enb-phy.h index ac6fd2241..08e517d07 100644 --- a/src/lte/model/lte-enb-phy.h +++ b/src/lte/model/lte-enb-phy.h @@ -303,6 +303,7 @@ class LteEnbPhy : public LtePhy * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptr in a future release. */ + // NS_DEPRECATED() - tag for future removal typedef void (*ReportInterferenceTracedCallback)(uint16_t cellId, Ptr spectrumValue); @@ -486,6 +487,7 @@ class LteEnbPhy : public LtePhy * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptr in a future release. */ + // NS_DEPRECATED() - tag for future removal TracedCallback> m_reportInterferenceTrace; /** * The `InterferenceSamplePeriod` attribute. The sampling period for diff --git a/src/point-to-point/model/point-to-point-channel.h b/src/point-to-point/model/point-to-point-channel.h index c0658b0b9..ba896af93 100644 --- a/src/point-to-point/model/point-to-point-channel.h +++ b/src/point-to-point/model/point-to-point-channel.h @@ -130,6 +130,7 @@ class PointToPointChannel : public Channel * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptr in a future release. */ + // NS_DEPRECATED() - tag for future removal typedef void (*TxRxAnimationCallback)(Ptr packet, Ptr txDevice, Ptr rxDevice, @@ -154,6 +155,7 @@ class PointToPointChannel : public Channel * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptr in a future release. */ + // NS_DEPRECATED() - tag for future removal TracedCallback, // Packet being transmitted Ptr, // Transmitting NetDevice Ptr, // Receiving NetDevice diff --git a/src/sixlowpan/model/sixlowpan-net-device.h b/src/sixlowpan/model/sixlowpan-net-device.h index 5ed10aacc..ffe0543ee 100644 --- a/src/sixlowpan/model/sixlowpan-net-device.h +++ b/src/sixlowpan/model/sixlowpan-net-device.h @@ -167,6 +167,7 @@ class SixLowPanNetDevice : public NetDevice * is deprecated and will be changed to \c Ptr * in a future release. */ + // NS_DEPRECATED() - tag for future removal typedef void (*RxTxTracedCallback)(Ptr packet, Ptr sixNetDevice, uint32_t ifindex); @@ -182,6 +183,7 @@ class SixLowPanNetDevice : public NetDevice * is deprecated and will be changed to \c Ptr * in a future release. */ + // NS_DEPRECATED() - tag for future removal typedef void (*DropTracedCallback)(DropReason reason, Ptr packet, Ptr sixNetDevice, @@ -309,6 +311,7 @@ class SixLowPanNetDevice : public NetDevice * is deprecated and will be changed to \c Ptr * in a future release. */ + // NS_DEPRECATED() - tag for future removal TracedCallback, Ptr, uint32_t> m_txTrace; /** @@ -322,6 +325,7 @@ class SixLowPanNetDevice : public NetDevice * is deprecated and will be changed to \c Ptr * in a future release. */ + // NS_DEPRECATED() - tag for future removal TracedCallback, Ptr, uint32_t> m_rxTrace; /** @@ -336,6 +340,7 @@ class SixLowPanNetDevice : public NetDevice * is deprecated and will be changed to \c Ptr * in a future release. */ + // NS_DEPRECATED() - tag for future removal TracedCallback, Ptr, uint32_t> m_dropTrace; /** diff --git a/src/spectrum/model/spectrum-value.h b/src/spectrum/model/spectrum-value.h index 1f3e4f1fb..2c9630c51 100644 --- a/src/spectrum/model/spectrum-value.h +++ b/src/spectrum/model/spectrum-value.h @@ -558,6 +558,7 @@ class SpectrumValue : public SimpleRefCount * is deprecated and will be changed to \c Ptr * in a future release. */ + // NS_DEPRECATED() - tag for future removal typedef void (*TracedCallback)(Ptr value); private: diff --git a/src/spectrum/model/three-gpp-channel-model.h b/src/spectrum/model/three-gpp-channel-model.h index 759e256ea..5f0cebe28 100644 --- a/src/spectrum/model/three-gpp-channel-model.h +++ b/src/spectrum/model/three-gpp-channel-model.h @@ -240,8 +240,6 @@ class ThreeGppChannelModel : public MatrixBasedChannelModel * \param hUT the height of the UT * \param distance2D the 2D distance between tx and rx * \return the parameters table - * \deprecated Use GetThreeGppTable(const Ptr aMob, const Ptr bMob, Ptr channelCondition) instead */ NS_DEPRECATED_3_41("Use GetThreeGppTable(const Ptr, const Ptr, Ptr) instead") diff --git a/src/uan/model/uan-phy.h b/src/uan/model/uan-phy.h index 5b349555d..8c06844b8 100644 --- a/src/uan/model/uan-phy.h +++ b/src/uan/model/uan-phy.h @@ -271,6 +271,7 @@ class UanPhy : public Object * * \param thresh Threshold SINR for proper reception in dB re 1 uPa. */ + // NS_DEPRECATED() - tag for future removal virtual void SetRxThresholdDb(double thresh) = 0; /** diff --git a/src/wimax/model/simple-ofdm-wimax-phy.h b/src/wimax/model/simple-ofdm-wimax-phy.h index 691c6e959..27911873a 100644 --- a/src/wimax/model/simple-ofdm-wimax-phy.h +++ b/src/wimax/model/simple-ofdm-wimax-phy.h @@ -472,6 +472,7 @@ class SimpleOfdmWimaxPhy : public WimaxPhy * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptrc in a future release. */ + // NS_DEPRECATED() - tag for future removal TracedCallback> m_phyTxBeginTrace; /** @@ -482,6 +483,7 @@ class SimpleOfdmWimaxPhy : public WimaxPhy * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptrc in a future release. */ + // NS_DEPRECATED() - tag for future removal TracedCallback> m_phyTxEndTrace; /** @@ -492,6 +494,7 @@ class SimpleOfdmWimaxPhy : public WimaxPhy * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptrc in a future release. */ + // NS_DEPRECATED() - tag for future removal TracedCallback> m_phyTxDropTrace; /** @@ -502,6 +505,7 @@ class SimpleOfdmWimaxPhy : public WimaxPhy * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptrc in a future release. */ + // NS_DEPRECATED() - tag for future removal TracedCallback> m_phyRxBeginTrace; /** @@ -512,6 +516,7 @@ class SimpleOfdmWimaxPhy : public WimaxPhy * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptrc in a future release. */ + // NS_DEPRECATED() - tag for future removal TracedCallback> m_phyRxEndTrace; /** @@ -521,6 +526,7 @@ class SimpleOfdmWimaxPhy : public WimaxPhy * \deprecated The non-const \c Ptr argument is deprecated * and will be changed to \c Ptrc in a future release. */ + // NS_DEPRECATED() - tag for future removal TracedCallback> m_phyRxDropTrace; SNRToBlockErrorRateManager* m_snrToBlockErrorRateManager; ///< SNR to block error rate manager diff --git a/src/wimax/model/wimax-net-device.h b/src/wimax/model/wimax-net-device.h index 433c1b71d..16546bd68 100644 --- a/src/wimax/model/wimax-net-device.h +++ b/src/wimax/model/wimax-net-device.h @@ -435,6 +435,7 @@ class WimaxNetDevice : public NetDevice * The TracedCallback signature will then match \c Packet::Mac48Address * and this typedef can be removed. */ + // NS_DEPRECATED() - tag for future removal typedef void (*TxRxTracedCallback)(Ptr packet, const Mac48Address& mac); /** * \deprecated The `const Mac48Address &` argument is deprecated @@ -443,6 +444,7 @@ class WimaxNetDevice : public NetDevice * and this typedef can be removed. * \todo This member variable should be private. */ + // NS_DEPRECATED() - tag for future removal TracedCallback, const Mac48Address&> m_traceRx; /** * \deprecated The `const Mac48Address &` argument is deprecated @@ -451,6 +453,7 @@ class WimaxNetDevice : public NetDevice * and this typedef can be removed. * \todo This member variable should be private. */ + // NS_DEPRECATED() - tag for future removal TracedCallback, const Mac48Address&> m_traceTx; void DoDispose() override;