diff --git a/src/core/model/deprecated.h b/src/core/model/deprecated.h index 9c9b2c2f5..c091556f5 100644 --- a/src/core/model/deprecated.h +++ b/src/core/model/deprecated.h @@ -93,11 +93,4 @@ */ #define NS_DEPRECATED_3_35 NS_DEPRECATED("") -/** - * \ingroup core - * \def NS_DEPRECATED_3_34 - * Tag for things deprecated in version ns-3.34. - */ -#define NS_DEPRECATED_3_34 NS_DEPRECATED("") - #endif /* NS3_DEPRECATED_H */ diff --git a/src/internet/model/icmpv6-header.cc b/src/internet/model/icmpv6-header.cc index 928a95624..e119d8eb9 100644 --- a/src/internet/model/icmpv6-header.cc +++ b/src/internet/model/icmpv6-header.cc @@ -657,19 +657,6 @@ Icmpv6RA::SetFlagH(bool h) m_flagH = h; } -uint8_t -Icmpv6RA::GetFlags() const -{ - NS_LOG_FUNCTION(this); - return 0; -} - -void -Icmpv6RA::SetFlags(uint8_t f) -{ - NS_LOG_FUNCTION(this << static_cast(f)); -} - void Icmpv6RA::Print(std::ostream& os) const { diff --git a/src/internet/model/icmpv6-header.h b/src/internet/model/icmpv6-header.h index a26a31145..dfd25c57c 100644 --- a/src/internet/model/icmpv6-header.h +++ b/src/internet/model/icmpv6-header.h @@ -682,20 +682,6 @@ class Icmpv6RA : public Icmpv6Header */ void Print(std::ostream& os) const override; - /** - * \brief Getflags. - * \return the flags value - */ - NS_DEPRECATED_3_34 - uint8_t GetFlags() const; - - /** - * \brief Setflags. - * \param f the flags value - */ - NS_DEPRECATED_3_34 - void SetFlags(uint8_t f); - /** * \brief Get the serialized size. * \return serialized size diff --git a/src/olsr/model/olsr-routing-protocol.cc b/src/olsr/model/olsr-routing-protocol.cc index 5bf417f92..89adf7f6e 100644 --- a/src/olsr/model/olsr-routing-protocol.cc +++ b/src/olsr/model/olsr-routing-protocol.cc @@ -248,12 +248,6 @@ RoutingProtocol::SetIpv4(Ptr ipv4) m_hnaRoutingTable->SetIpv4(ipv4); } -Ptr -RoutingProtocol::GetIpv4() const -{ - return m_ipv4; -} - void RoutingProtocol::DoDispose() { diff --git a/src/olsr/model/olsr-routing-protocol.h b/src/olsr/model/olsr-routing-protocol.h index d99a342dc..0ee7adbc7 100644 --- a/src/olsr/model/olsr-routing-protocol.h +++ b/src/olsr/model/olsr-routing-protocol.h @@ -356,11 +356,6 @@ class RoutingProtocol : public Ipv4RoutingProtocol ErrorCallback ecb) override; void SetIpv4(Ptr ipv4) override; - /** - * \returns the ipv4 object this routing protocol is associated with - */ - NS_DEPRECATED_3_34 - virtual Ptr GetIpv4() const; void PrintRoutingTable(Ptr stream, Time::Unit unit = Time::S) const override;