From 104ce293ce6bf9d2fe219f01eabf88c5e70f1224 Mon Sep 17 00:00:00 2001 From: Federico Guerra Date: Thu, 6 Oct 2016 22:48:50 -0700 Subject: [PATCH] uan: (fixes #2007) Remove deprecation on SetRxThresholdDb --- src/uan/model/uan-phy-dual.cc | 1 - src/uan/model/uan-phy-dual.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/uan/model/uan-phy-dual.cc b/src/uan/model/uan-phy-dual.cc index d3f33711e..d2284081e 100644 --- a/src/uan/model/uan-phy-dual.cc +++ b/src/uan/model/uan-phy-dual.cc @@ -341,7 +341,6 @@ UanPhyDual::SetTxPowerDbPhy2 (double txpwr) void UanPhyDual::SetRxThresholdDb (double thresh) { - NS_LOG_WARN ("SetRxThresholdDb is deprecated and has no effect. Look at PER Functor attribute"); m_phy1->SetRxThresholdDb (thresh); m_phy2->SetRxThresholdDb (thresh); } diff --git a/src/uan/model/uan-phy-dual.h b/src/uan/model/uan-phy-dual.h index 03db45987..97a36ff41 100644 --- a/src/uan/model/uan-phy-dual.h +++ b/src/uan/model/uan-phy-dual.h @@ -114,7 +114,7 @@ public: virtual void SetReceiveErrorCallback (RxErrCallback cb); virtual void SetRxGainDb (double gain); virtual void SetTxPowerDb (double txpwr); - NS_DEPRECATED virtual void SetRxThresholdDb (double thresh); + virtual void SetRxThresholdDb (double thresh); virtual void SetCcaThresholdDb (double thresh); virtual double GetRxGainDb (void); virtual double GetTxPowerDb (void);