Remove redundant \deprecated

This commit is contained in:
Peter D. Barnes, Jr
2024-05-06 11:43:14 -07:00
committed by Peter D. Barnes, Jr.
parent df5b0aff81
commit 756d741f7e
4 changed files with 50 additions and 29 deletions

View File

@@ -1057,16 +1057,21 @@ 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; //!< @deprecated See Duration::QUICK.
static constexpr auto QUICK = Duration::QUICK;
NS_DEPRECATED_3_42("Use Duration::EXTENSIVE instead")
static constexpr auto EXTENSIVE = Duration::EXTENSIVE; //!< @deprecated See Duration::EXTENSIVE.
static constexpr auto EXTENSIVE = Duration::EXTENSIVE;
NS_DEPRECATED_3_42("Use Duration::TAKES_FOREVER instead")
static constexpr auto TAKES_FOREVER =
Duration::TAKES_FOREVER; //!< @deprecated See Duration::TAKES_FOREVER.
static constexpr auto TAKES_FOREVER = Duration::TAKES_FOREVER;
using TestDuration NS_DEPRECATED_3_42("Use Duration instead") =
Duration; //!< @deprecated See Duration.
using TestDuration NS_DEPRECATED_3_42("Use Duration instead") = Duration;
/**@}*/
/**
* Destructor
@@ -1267,23 +1272,30 @@ class TestSuite : public TestCase
*/
enum class Type
{
ALL = 0, //!<
ALL = 0, //!< Token to represent all tests.
UNIT, //!< This test suite implements a Unit Test
SYSTEM, //!< This test suite implements a System Test
EXAMPLE, //!< This test suite implements an Example Test
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; //!< @deprecated See Type::ALL.
static constexpr auto ALL = Type::ALL;
NS_DEPRECATED_3_42("Use Type::UNIT instead")
static constexpr auto UNIT = Type::UNIT; //!< @deprecated See Type::UNIT.
static constexpr auto UNIT = Type::UNIT;
NS_DEPRECATED_3_42("Use Type::SYSTEM instead")
static constexpr auto SYSTEM = Type::SYSTEM; //!< @deprecated See Type::SYSTEM.
static constexpr auto SYSTEM = Type::SYSTEM;
NS_DEPRECATED_3_42("Use Type::EXAMPLE instead")
static constexpr auto EXAMPLE = Type::EXAMPLE; //!< @deprecated See Type::EXAMPLE.
static constexpr auto EXAMPLE = Type::EXAMPLE;
NS_DEPRECATED_3_42("Use Type::PERFORMANCE instead")
static constexpr auto PERFORMANCE = Type::PERFORMANCE; //!< @deprecated See Type::PERFORMANCE.
static constexpr auto PERFORMANCE = Type::PERFORMANCE;
/**@}*/
/**
* \brief Construct a new test suite.

View File

@@ -449,7 +449,6 @@ class Ipv4 : public Object
*
* RFC1122 term for whether host accepts datagram with a dest. address on another interface
* \returns true for Weak Es Model activated
* \deprecated Deprecated since ns-3.41. Use SetStrongEndSystemModel instead.
*/
NS_DEPRECATED_3_41("Use GetStrongEndSystemModel instead")
virtual bool GetWeakEsModel() const = 0;
@@ -459,7 +458,6 @@ class Ipv4 : public Object
*
* RFC1122 term for whether host accepts datagram with a dest. address on another interface
* \param model true for Weak Es Model
* \deprecated Deprecated since ns-3.41. Use SetStrongEndSystemModel instead.
*/
NS_DEPRECATED_3_41("Use SetStrongEndSystemModel instead")
virtual void SetWeakEsModel(bool model) = 0;

View File

@@ -40,16 +40,22 @@ 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; //!< \deprecated See WifiTidToLinkMappingNegSupport::NOT_SUPPORTED
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; //!< \deprecated See WifiTidToLinkMappingNegSupport::SAME_LINK_SET
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; //!< \deprecated See
//!< WifiTidToLinkMappingNegSupport::ANY_LINK_SET
WifiTidToLinkMappingNegSupport::ANY_LINK_SET;
/**@}*/
/**
* \brief Stream insertion operator.

View File

@@ -86,21 +86,26 @@ 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; //!< \deprecated See WifiPhyState::IDLE
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; //!< \deprecated See WifiPhyState::CCA_BUSY
static constexpr auto CCA_BUSY = ns3::WifiPhyState::CCA_BUSY;
NS_DEPRECATED_3_42("Use WifiPhyState::TX instead")
static constexpr auto TX = ns3::WifiPhyState::TX; //!< \deprecated See WifiPhyState::TX
static constexpr auto TX = ns3::WifiPhyState::TX;
NS_DEPRECATED_3_42("Use WifiPhyState::RX instead")
static constexpr auto RX = ns3::WifiPhyState::RX; //!< \deprecated See WifiPhyState::RX
static constexpr auto RX = ns3::WifiPhyState::RX;
NS_DEPRECATED_3_42("Use WifiPhyState::SWITCHING instead")
static constexpr auto SWITCHING =
ns3::WifiPhyState::SWITCHING; //!< \deprecated See WifiPhyState::SWITCHING
static constexpr auto SWITCHING = ns3::WifiPhyState::SWITCHING;
NS_DEPRECATED_3_42("Use WifiPhyState::SLEEP instead")
static constexpr auto SLEEP = ns3::WifiPhyState::SLEEP; //!< \deprecated See WifiPhyState::SLEEP
static constexpr auto SLEEP = ns3::WifiPhyState::SLEEP;
NS_DEPRECATED_3_42("Use WifiPhyState::OFF instead")
static constexpr auto OFF = ns3::WifiPhyState::OFF; //!< \deprecated See WifiPhyState::OFF
static constexpr auto OFF = ns3::WifiPhyState::OFF;
/**@}*/
#endif /* WIFI_PHY_STATE_H */