Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(310)

Unified Diff: src/wifi/model/wifi-radio-energy-model.h

Issue 329860043: Refactor WifiPhy and WifiPhyStateHelper to eliminate circular declaration of classes (Closed)
Patch Set: Updates for review comments Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/wifi/model/wifi-radio-energy-model.h
===================================================================
--- a/src/wifi/model/wifi-radio-energy-model.h
+++ b/src/wifi/model/wifi-radio-energy-model.h
@@ -316,7 +316,7 @@
/**
* \returns Current state.
*/
- WifiPhy::State GetCurrentState (void) const;
+ WifiPhyState GetCurrentState (void) const;
/**
* \param callback Callback function.
@@ -404,7 +404,7 @@
* Sets current state. This function is private so that only the energy model
* can change its own state.
*/
- void SetWifiRadioState (const WifiPhy::State state);
+ void SetWifiRadioState (const WifiPhyState state);
Ptr<EnergySource> m_source; ///< energy source
@@ -421,7 +421,7 @@
TracedValue<double> m_totalEnergyConsumption;
// State variables.
- WifiPhy::State m_currentState; ///< current state the radio is in
+ WifiPhyState m_currentState; ///< current state the radio is in
Time m_lastUpdateTime; ///< time stamp of previous energy update
uint8_t m_nPendingChangeState; ///< pending state change

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b