From 40add040f92a82f58a0df2187ec07be33b07f496 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Thu, 18 Oct 2007 14:32:42 +0200 Subject: [PATCH] convert int to uint32_t --- src/devices/wifi/arf-mac-stations.cc | 16 ++++++------- src/devices/wifi/arf-mac-stations.h | 34 ++++++++++++++-------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/devices/wifi/arf-mac-stations.cc b/src/devices/wifi/arf-mac-stations.cc index 1ebfb8371..a8c913931 100644 --- a/src/devices/wifi/arf-mac-stations.cc +++ b/src/devices/wifi/arf-mac-stations.cc @@ -49,12 +49,12 @@ ArfMacStation::ArfMacStation (ArfMacStations *stations, ArfMacStation::~ArfMacStation () {} -int +uint32_t ArfMacStation::GetMaxRate (void) { return GetNSupportedModes (); } -int +uint32_t ArfMacStation::GetMinRate (void) { return 0; @@ -181,28 +181,28 @@ void ArfMacStation::ReportRecoveryFailure (void) {} void ArfMacStation::ReportFailure (void) {} -int ArfMacStation::GetMinTimerTimeout (void) +uint32_t ArfMacStation::GetMinTimerTimeout (void) { return m_minTimerTimeout; } -int ArfMacStation::GetMinSuccessThreshold (void) +uint32_t ArfMacStation::GetMinSuccessThreshold (void) { return m_minSuccessThreshold; } -int ArfMacStation::GetTimerTimeout (void) +uint32_t ArfMacStation::GetTimerTimeout (void) { return m_timerTimeout; } -int ArfMacStation::GetSuccessThreshold (void) +uint32_t ArfMacStation::GetSuccessThreshold (void) { return m_successThreshold; } -void ArfMacStation::SetTimerTimeout (int timerTimeout) +void ArfMacStation::SetTimerTimeout (uint32_t timerTimeout) { NS_ASSERT (timerTimeout >= m_minTimerTimeout); m_timerTimeout = timerTimeout; } -void ArfMacStation::SetSuccessThreshold (int successThreshold) +void ArfMacStation::SetSuccessThreshold (uint32_t successThreshold) { NS_ASSERT (successThreshold >= m_minSuccessThreshold); m_successThreshold = successThreshold; diff --git a/src/devices/wifi/arf-mac-stations.h b/src/devices/wifi/arf-mac-stations.h index ecaf81e28..b75f1cf2a 100644 --- a/src/devices/wifi/arf-mac-stations.h +++ b/src/devices/wifi/arf-mac-stations.h @@ -55,19 +55,19 @@ public: private: virtual ArfMacStations *GetStations (void) const; - int m_timer; - int m_success; - int m_failed; + uint32_t m_timer; + uint32_t m_success; + uint32_t m_failed; bool m_recovery; - int m_retry; + uint32_t m_retry; - int m_timerTimeout; - int m_successThreshold; + uint32_t m_timerTimeout; + uint32_t m_successThreshold; - int m_rate; + uint32_t m_rate; - int m_minTimerTimeout; - int m_minSuccessThreshold; + uint32_t m_minTimerTimeout; + uint32_t m_minSuccessThreshold; ArfMacStations *m_stations; @@ -76,22 +76,22 @@ private: virtual void ReportRecoveryFailure (void); virtual void ReportFailure (void); - int GetMaxRate (void); - int GetMinRate (void); + uint32_t GetMaxRate (void); + uint32_t GetMinRate (void); bool NeedRecoveryFallback (void); bool NeedNormalFallback (void); protected: // called by AarfMacStation. - int GetMinTimerTimeout (void); - int GetMinSuccessThreshold (void); + uint32_t GetMinTimerTimeout (void); + uint32_t GetMinSuccessThreshold (void); - int GetTimerTimeout (void); - int GetSuccessThreshold (void); + uint32_t GetTimerTimeout (void); + uint32_t GetSuccessThreshold (void); - void SetTimerTimeout (int timerTimeout); - void SetSuccessThreshold (int successThreshold); + void SetTimerTimeout (uint32_t timerTimeout); + void SetSuccessThreshold (uint32_t successThreshold); }; } // namespace ns3