Remove code deprecated in ns-3.41

Author: edalm

doc/doxygen.conf

@@ -2303,8 +2303,7 @@ EXPAND_AS_DEFINED      = ATTRIBUTE_ACCESSOR_DEFINE \
                          NS_DEPRECATED_3_45 \
                          NS_DEPRECATED_3_44 \
                          NS_DEPRECATED_3_43 \
-                         NS_DEPRECATED_3_42 \
-                         NS_DEPRECATED_3_41
+                         NS_DEPRECATED_3_42
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
 # remove all references to function-like macros that are alone on a line, have

src/click/model/ipv4-l3-click-protocol.cc

@@ -273,18 +273,6 @@ Ipv4L3ClickProtocol::GetIpForward() const
     return m_ipForward;
 }
 
-void
-Ipv4L3ClickProtocol::SetWeakEsModel(bool model)
-{
-    m_strongEndSystemModel = !model;
-}
-
-bool
-Ipv4L3ClickProtocol::GetWeakEsModel() const
-{
-    return !m_strongEndSystemModel;
-}
-
 void
 Ipv4L3ClickProtocol::SetStrongEndSystemModel(bool model)
 {

src/click/model/ipv4-l3-click-protocol.h

@@ -257,13 +257,6 @@ class Ipv4L3ClickProtocol : public Ipv4
     void SetIpForward(bool forward) override;
     bool GetIpForward() const override;
 
-    /** @copydoc Ipv4::SetWeakEsModel */
-    NS_DEPRECATED_3_41("Use SetStrongEndSystemModel instead")
-    void SetWeakEsModel(bool model) override;
-    /** @copydoc Ipv4::GetWeakEsModel */
-    NS_DEPRECATED_3_41("Use GetStrongEndSystemModel instead")
-    bool GetWeakEsModel() const override;
-
     void SetStrongEndSystemModel(bool model) override;
     bool GetStrongEndSystemModel() const override;
 

src/core/model/deprecated.h

@@ -118,11 +118,4 @@
  */
 #define NS_DEPRECATED_3_42(msg) NS_DEPRECATED("Deprecated in ns-3.42: " msg)
 
-/**
- * @ingroup deprecation
- * @def NS_DEPRECATED_3_41
- * Tag for things deprecated in version ns-3.41.
- */
-#define NS_DEPRECATED_3_41(msg) NS_DEPRECATED("Deprecated in ns-3.41: " msg)
-
 #endif /* NS3_DEPRECATED_H */

src/internet/model/ipv4-l3-protocol.cc

@@ -1400,19 +1400,6 @@ Ipv4L3Protocol::GetIpForward() const
     return m_ipForward;
 }
 
-void
-Ipv4L3Protocol::SetWeakEsModel(bool model)
-{
-    NS_LOG_FUNCTION(this << model);
-    m_strongEndSystemModel = !model;
-}
-
-bool
-Ipv4L3Protocol::GetWeakEsModel() const
-{
-    return !m_strongEndSystemModel;
-}
-
 void
 Ipv4L3Protocol::SetStrongEndSystemModel(bool model)
 {

src/internet/model/ipv4-l3-protocol.h

@@ -289,13 +289,6 @@ class Ipv4L3Protocol : public Ipv4
     void SetIpForward(bool forward) override;
     bool GetIpForward() const override;
 
-    /** @copydoc Ipv4::SetWeakEsModel */
-    NS_DEPRECATED_3_41("Use SetStrongEndSystemModel instead")
-    void SetWeakEsModel(bool model) override;
-    /** @copydoc Ipv4::GetWeakEsModel */
-    NS_DEPRECATED_3_41("Use GetStrongEndSystemModel instead")
-    bool GetWeakEsModel() const override;
-
     void SetStrongEndSystemModel(bool model) override;
     bool GetStrongEndSystemModel() const override;
 

src/internet/model/ipv4.cc

@@ -35,14 +35,6 @@ Ipv4::GetTypeId()
                 BooleanValue(true),
                 MakeBooleanAccessor(&Ipv4::SetIpForward, &Ipv4::GetIpForward),
                 MakeBooleanChecker())
-            .AddAttribute("WeakEsModel",
-                          "RFC1122 term for whether host accepts datagram with a dest. address on "
-                          "another interface",
-                          BooleanValue(true),
-                          MakeBooleanAccessor(&Ipv4::SetWeakEsModel, &Ipv4::GetWeakEsModel),
-                          MakeBooleanChecker(),
-                          TypeId::SupportLevel::DEPRECATED,
-                          "DEPRECATED since ns-3.41. Use the StrongEndSystemModel attribute.")
             .AddAttribute(
                 "StrongEndSystemModel",
                 "Reject packets for an address not configured on the interface they're "

src/internet/model/ipv4.h

@@ -444,24 +444,6 @@ class Ipv4 : public Object
      */
     virtual bool GetIpForward() const = 0;
 
-    /**
-     * @brief Get the Weak Es Model status
-     *
-     * RFC1122 term for whether host accepts datagram with a dest. address on another interface
-     * @returns true for Weak Es Model activated
-     */
-    NS_DEPRECATED_3_41("Use GetStrongEndSystemModel instead")
-    virtual bool GetWeakEsModel() const = 0;
-
-    /**
-     * @brief Set or unset the Weak Es Model
-     *
-     * RFC1122 term for whether host accepts datagram with a dest. address on another interface
-     * @param model true for Weak Es Model
-     */
-    NS_DEPRECATED_3_41("Use SetStrongEndSystemModel instead")
-    virtual void SetWeakEsModel(bool model) = 0;
-
     /**
      * @brief Set or unset the Strong End System Model
      *

src/spectrum/model/three-gpp-channel-model.h

@@ -226,21 +226,6 @@ class ThreeGppChannelModel : public MatrixBasedChannelModel
                               //!< ASA, ZSD, ZSA]
     };
 
-    /**
-     * Get the parameters needed to apply the channel generation procedure
-     * @param channelCondition the channel condition
-     * @param hBS the height of the BS
-     * @param hUT the height of the UT
-     * @param distance2D the 2D distance between tx and rx
-     * @return the parameters table
-     */
-    NS_DEPRECATED_3_41("Use GetThreeGppTable(const Ptr<const MobilityModel>, const Ptr<const "
-                       "MobilityModel>, Ptr<const ChannelCondition>) instead")
-    Ptr<const ParamsTable> GetThreeGppTable(Ptr<const ChannelCondition> channelCondition,
-                                            double hBS,
-                                            double hUT,
-                                            double distance2D) const;
-
     /**
      * Get the parameters needed to apply the channel generation procedure
      * @param aMob the mobility model of node A