F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove attributes, methods and symbols deprecated since ns-3.42

Browse Source
This commit is contained in:
Stefano Avallone
2025-09-12 12:38:04 +02:00
parent 79cf08ceca
commit 1781b63b6a
9 changed files with 2 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/doxygen.conf
View File

@@ -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

7
src/core/model/deprecated.h
View File

@@ -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 */

6
src/core/model/event-id.cc
View File

@@ -68,12 +68,6 @@ EventId::IsPending() const
return !IsExpired();
}
bool
EventId::IsRunning() const
{
return IsPending();
}
EventImpl*
EventId::PeekEventImpl() const
{

9
src/core/model/event-id.h
View File

@@ -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.

35
src/core/model/test.h
View File

@@ -7,7 +7,6 @@
#ifndef NS3_TEST_H
#define NS3_TEST_H
#include "deprecated.h"
#include "system-wall-clock-ms.h"
#include <fstream>
@@ -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.
*

18
src/wifi/model/eht/eht-configuration.h
View File

@@ -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.

48
src/wifi/model/txop.cc
View File

@@ -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<void (Txop::*)(uint32_t)>(&Txop::SetMinCw),
static_cast<uint32_t (Txop::*)() const>(&Txop::GetMinCw)),
MakeUintegerChecker<uint32_t>(),
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<UintegerValue>(),
MakeAttributeContainerAccessor<UintegerValue>(&Txop::SetMinCws, &Txop::GetMinCws),
MakeAttributeContainerChecker<UintegerValue>(MakeUintegerChecker<uint32_t>()))
// 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<void (Txop::*)(uint32_t)>(&Txop::SetMaxCw),
static_cast<uint32_t (Txop::*)() const>(&Txop::GetMaxCw)),
MakeUintegerChecker<uint32_t>(),
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<UintegerValue>(),
MakeAttributeContainerAccessor<UintegerValue>(&Txop::SetMaxCws, &Txop::GetMaxCws),
MakeAttributeContainerChecker<UintegerValue>(MakeUintegerChecker<uint32_t>()))
// 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<void (Txop::*)(uint8_t)>(&Txop::SetAifsn),
static_cast<uint8_t (Txop::*)() const>(&Txop::GetAifsn)),
MakeUintegerChecker<uint8_t>(),
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<UintegerValue>(),
MakeAttributeContainerAccessor<UintegerValue>(&Txop::SetAifsns, &Txop::GetAifsns),
MakeAttributeContainerChecker<UintegerValue>(MakeUintegerChecker<uint8_t>()))
// 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<void (Txop::*)(Time)>(&Txop::SetTxopLimit),
static_cast<Time (Txop::*)() const>(&Txop::GetTxopLimit)),
MakeTimeChecker(),
TypeId::SupportLevel::OBSOLETE,
"Use TxopLimits attribute instead of TxopLimit")
.AddAttribute(
"TxopLimits",
"The values of TXOP limit for all the links (sorted in increasing order "

1
src/wifi/model/wifi-mac-queue-container.h
View File

@@ -11,6 +11,7 @@
#include "wifi-mac-queue-elem.h"
#include "ns3/deprecated.h"
#include "ns3/mac48-address.h"
#include <list>

23
src/wifi/model/wifi-phy-state.h
View File

@@ -10,7 +10,6 @@
#ifndef WIFI_PHY_STATE_H
#define WIFI_PHY_STATE_H
#include "ns3/deprecated.h"
#include "ns3/fatal-error.h"
namespace ns3
@@ -86,26 +85,4 @@ operator<<(std::ostream& os, WifiPhyState state)
} // namespace ns3
/**
* Deprecated WifiPhyState enums.
*
* Use WifiPhyState class enum symbols instead.
* @{
*/
NS_DEPRECATED_3_42("Use WifiPhyState::IDLE instead")
static constexpr auto IDLE = ns3::WifiPhyState::IDLE;
NS_DEPRECATED_3_42("Use WifiPhyState::CCA_BUSY instead")
static constexpr auto CCA_BUSY = ns3::WifiPhyState::CCA_BUSY;
NS_DEPRECATED_3_42("Use WifiPhyState::TX instead")
static constexpr auto TX = ns3::WifiPhyState::TX;
NS_DEPRECATED_3_42("Use WifiPhyState::RX instead")
static constexpr auto RX = ns3::WifiPhyState::RX;
NS_DEPRECATED_3_42("Use WifiPhyState::SWITCHING instead")
static constexpr auto SWITCHING = ns3::WifiPhyState::SWITCHING;
NS_DEPRECATED_3_42("Use WifiPhyState::SLEEP instead")
static constexpr auto SLEEP = ns3::WifiPhyState::SLEEP;
NS_DEPRECATED_3_42("Use WifiPhyState::OFF instead")
static constexpr auto OFF = ns3::WifiPhyState::OFF;
/**@}*/
#endif /* WIFI_PHY_STATE_H */