diff --git a/doc/doxygen.conf b/doc/doxygen.conf index 03f7c23d1..57d424ee6 100644 --- a/doc/doxygen.conf +++ b/doc/doxygen.conf @@ -2302,8 +2302,7 @@ EXPAND_AS_DEFINED = ATTRIBUTE_ACCESSOR_DEFINE \ NS_DEPRECATED_3_46 \ NS_DEPRECATED_3_45 \ NS_DEPRECATED_3_44 \ - NS_DEPRECATED_3_43 \ - NS_DEPRECATED_3_42 + NS_DEPRECATED_3_43 # 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 diff --git a/src/core/model/deprecated.h b/src/core/model/deprecated.h index 85f514209..56c984f8c 100644 --- a/src/core/model/deprecated.h +++ b/src/core/model/deprecated.h @@ -111,11 +111,4 @@ */ #define NS_DEPRECATED_3_43(msg) NS_DEPRECATED("Deprecated in ns-3.43: " msg) -/** - * @ingroup deprecation - * @def NS_DEPRECATED_3_42 - * Tag for things deprecated in version ns-3.42. - */ -#define NS_DEPRECATED_3_42(msg) NS_DEPRECATED("Deprecated in ns-3.42: " msg) - #endif /* NS3_DEPRECATED_H */ diff --git a/src/core/model/event-id.cc b/src/core/model/event-id.cc index 2dec15f0d..e00dc4a8f 100644 --- a/src/core/model/event-id.cc +++ b/src/core/model/event-id.cc @@ -68,12 +68,6 @@ EventId::IsPending() const return !IsExpired(); } -bool -EventId::IsRunning() const -{ - return IsPending(); -} - EventImpl* EventId::PeekEventImpl() const { diff --git a/src/core/model/event-id.h b/src/core/model/event-id.h index e987d1ceb..e9593dc89 100644 --- a/src/core/model/event-id.h +++ b/src/core/model/event-id.h @@ -8,7 +8,6 @@ #ifndef EVENT_ID_H #define EVENT_ID_H -#include "deprecated.h" #include "event-impl.h" #include "ptr.h" @@ -93,14 +92,6 @@ class EventId */ bool IsPending() const; - /** - * This method is syntactic sugar for !IsExpired(). - * - * @returns \c true if the event has not expired, \c false otherwise. - */ - NS_DEPRECATED_3_42("Use IsPending instead") - bool IsRunning() const; - public: /** * @name Scheduler Helpers. diff --git a/src/core/model/test.h b/src/core/model/test.h index 31b48ab42..680c79486 100644 --- a/src/core/model/test.h +++ b/src/core/model/test.h @@ -7,7 +7,6 @@ #ifndef NS3_TEST_H #define NS3_TEST_H -#include "deprecated.h" #include "system-wall-clock-ms.h" #include @@ -1057,22 +1056,6 @@ class TestCase TAKES_FOREVER = 3 //!< Very long running test. }; - /** - * Deprecated test duration simple enums. - * - * Use the `TestCase::Duration` enum class symbols instead. - * @{ - */ - NS_DEPRECATED_3_42("Use Duration::QUICK instead") - static constexpr auto QUICK = Duration::QUICK; - NS_DEPRECATED_3_42("Use Duration::EXTENSIVE instead") - static constexpr auto EXTENSIVE = Duration::EXTENSIVE; - NS_DEPRECATED_3_42("Use Duration::TAKES_FOREVER instead") - static constexpr auto TAKES_FOREVER = Duration::TAKES_FOREVER; - - using TestDuration NS_DEPRECATED_3_42("Use Duration instead") = Duration; - /**@}*/ - /** * Destructor */ @@ -1279,24 +1262,6 @@ class TestSuite : public TestCase PERFORMANCE //!< This test suite implements a Performance Test }; - /** - * Deprecated test type simple enums. - * - * Use the `TestSuite::Type` enum class symbols instead. - * @{ - */ - NS_DEPRECATED_3_42("Use Type::ALL instead") - static constexpr auto ALL = Type::ALL; - NS_DEPRECATED_3_42("Use Type::UNIT instead") - static constexpr auto UNIT = Type::UNIT; - NS_DEPRECATED_3_42("Use Type::SYSTEM instead") - static constexpr auto SYSTEM = Type::SYSTEM; - NS_DEPRECATED_3_42("Use Type::EXAMPLE instead") - static constexpr auto EXAMPLE = Type::EXAMPLE; - NS_DEPRECATED_3_42("Use Type::PERFORMANCE instead") - static constexpr auto PERFORMANCE = Type::PERFORMANCE; - /**@}*/ - /** * @brief Construct a new test suite. * diff --git a/src/wifi/model/eht/eht-configuration.h b/src/wifi/model/eht/eht-configuration.h index 328246432..a4df28138 100644 --- a/src/wifi/model/eht/eht-configuration.h +++ b/src/wifi/model/eht/eht-configuration.h @@ -10,7 +10,6 @@ #ifndef EHT_CONFIGURATION_H #define EHT_CONFIGURATION_H -#include "ns3/deprecated.h" #include "ns3/nstime.h" #include "ns3/object.h" #include "ns3/wifi-utils.h" @@ -40,23 +39,6 @@ enum class WifiTidToLinkMappingNegSupport : uint8_t ANY_LINK_SET = 3 }; -/** - * Deprecated link mapping support enums. - * - * Use `WifiTidToLinkMappingNegSupport` class enum values instead. - * @{ - */ -NS_DEPRECATED_3_42("Use WifiTidToLinkMappingNegSupport::NOT_SUPPORTED instead") -static constexpr auto WIFI_TID_TO_LINK_MAPPING_NOT_SUPPORTED = - WifiTidToLinkMappingNegSupport::NOT_SUPPORTED; -NS_DEPRECATED_3_42("Use WifiTidToLinkMappingNegSupport::SAME_LINK_SET instead") -static constexpr auto WIFI_TID_TO_LINK_MAPPING_SAME_LINK_SET = - WifiTidToLinkMappingNegSupport::SAME_LINK_SET; -NS_DEPRECATED_3_42("Use WifiTidToLinkMappingNegSupport::ANY_LINK_SET instead") -static constexpr auto WIFI_TID_TO_LINK_MAPPING_ANY_LINK_SET = - WifiTidToLinkMappingNegSupport::ANY_LINK_SET; -/**@}*/ - /** * @brief Stream insertion operator. * @param [in] os The reference to the output stream. diff --git a/src/wifi/model/txop.cc b/src/wifi/model/txop.cc index 9518a5731..f5993016a 100644 --- a/src/wifi/model/txop.cc +++ b/src/wifi/model/txop.cc @@ -65,18 +65,6 @@ Txop::GetTypeId() "AC_BEACON", AC_UNDEF, "AC_UNDEF")) - // NS_DEPRECATED_3_42 - .AddAttribute( - "MinCw", - "The minimum value of the contention window (just for the first link, " - "in case of 11be multi-link devices).", - TypeId::ATTR_GET | TypeId::ATTR_SET, // do not set at construction time - UintegerValue(15), - MakeUintegerAccessor(static_cast(&Txop::SetMinCw), - static_cast(&Txop::GetMinCw)), - MakeUintegerChecker(), - TypeId::SupportLevel::OBSOLETE, - "Use MinCws attribute instead of MinCw") .AddAttribute( "MinCws", "The minimum values of the contention window for all the links (sorted in " @@ -87,18 +75,6 @@ Txop::GetTypeId() AttributeContainerValue(), MakeAttributeContainerAccessor(&Txop::SetMinCws, &Txop::GetMinCws), MakeAttributeContainerChecker(MakeUintegerChecker())) - // NS_DEPRECATED_3_42 - .AddAttribute( - "MaxCw", - "The maximum value of the contention window (just for the first link, " - "in case of 11be multi-link devices).", - TypeId::ATTR_GET | TypeId::ATTR_SET, // do not set at construction time - UintegerValue(1023), - MakeUintegerAccessor(static_cast(&Txop::SetMaxCw), - static_cast(&Txop::GetMaxCw)), - MakeUintegerChecker(), - TypeId::SupportLevel::OBSOLETE, - "Use MaxCws attribute instead of MaxCw") .AddAttribute( "MaxCws", "The maximum values of the contention window for all the links (sorted in " @@ -109,18 +85,6 @@ Txop::GetTypeId() AttributeContainerValue(), MakeAttributeContainerAccessor(&Txop::SetMaxCws, &Txop::GetMaxCws), MakeAttributeContainerChecker(MakeUintegerChecker())) - // NS_DEPRECATED_3_42 - .AddAttribute( - "Aifsn", - "The AIFSN: the default value conforms to non-QOS (just for the first link, " - "in case of 11be multi-link devices).", - TypeId::ATTR_GET | TypeId::ATTR_SET, // do not set at construction time - UintegerValue(2), - MakeUintegerAccessor(static_cast(&Txop::SetAifsn), - static_cast(&Txop::GetAifsn)), - MakeUintegerChecker(), - TypeId::SupportLevel::OBSOLETE, - "Use Aifsns attribute instead of Aifsn") .AddAttribute( "Aifsns", "The values of AIFSN for all the links (sorted in increasing order " @@ -131,18 +95,6 @@ Txop::GetTypeId() AttributeContainerValue(), MakeAttributeContainerAccessor(&Txop::SetAifsns, &Txop::GetAifsns), MakeAttributeContainerChecker(MakeUintegerChecker())) - // NS_DEPRECATED_3_42 - .AddAttribute( - "TxopLimit", - "The TXOP limit: the default value conforms to non-QoS " - "(just for the first link, in case of 11be multi-link devices).", - TypeId::ATTR_GET | TypeId::ATTR_SET, // do not set at construction time - TimeValue(MilliSeconds(0)), - MakeTimeAccessor(static_cast(&Txop::SetTxopLimit), - static_cast