diff --git a/bindings/python/ns3_module_wifi.py b/bindings/python/ns3_module_wifi.py index 29dc22b03..fb851c258 100644 --- a/bindings/python/ns3_module_wifi.py +++ b/bindings/python/ns3_module_wifi.py @@ -1042,8 +1042,6 @@ def register_Ns3RandomPropagationDelayModel_methods(root_module, cls): return def register_Ns3RandomPropagationLossModel_methods(root_module, cls): - ## propagation-loss-model.h: ns3::RandomPropagationLossModel::RandomPropagationLossModel(ns3::RandomPropagationLossModel const & arg0) [copy constructor] - cls.add_constructor([param('ns3::RandomPropagationLossModel const &', 'arg0')]) ## propagation-loss-model.h: static ns3::TypeId ns3::RandomPropagationLossModel::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', @@ -2031,8 +2029,6 @@ def register_Ns3ConstantSpeedPropagationDelayModel_methods(root_module, cls): return def register_Ns3FriisPropagationLossModel_methods(root_module, cls): - ## propagation-loss-model.h: ns3::FriisPropagationLossModel::FriisPropagationLossModel(ns3::FriisPropagationLossModel const & arg0) [copy constructor] - cls.add_constructor([param('ns3::FriisPropagationLossModel const &', 'arg0')]) ## propagation-loss-model.h: static ns3::TypeId ns3::FriisPropagationLossModel::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', @@ -2110,8 +2106,6 @@ def register_Ns3IdealWifiManager_methods(root_module, cls): return def register_Ns3JakesPropagationLossModel_methods(root_module, cls): - ## jakes-propagation-loss-model.h: ns3::JakesPropagationLossModel::JakesPropagationLossModel(ns3::JakesPropagationLossModel const & arg0) [copy constructor] - cls.add_constructor([param('ns3::JakesPropagationLossModel const &', 'arg0')]) ## jakes-propagation-loss-model.h: static ns3::TypeId ns3::JakesPropagationLossModel::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', @@ -2135,8 +2129,6 @@ def register_Ns3JakesPropagationLossModel_methods(root_module, cls): return def register_Ns3LogDistancePropagationLossModel_methods(root_module, cls): - ## propagation-loss-model.h: ns3::LogDistancePropagationLossModel::LogDistancePropagationLossModel(ns3::LogDistancePropagationLossModel const & arg0) [copy constructor] - cls.add_constructor([param('ns3::LogDistancePropagationLossModel const &', 'arg0')]) ## propagation-loss-model.h: static ns3::TypeId ns3::LogDistancePropagationLossModel::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', diff --git a/src/devices/wifi/jakes-propagation-loss-model.h b/src/devices/wifi/jakes-propagation-loss-model.h index ee46d0620..7b1c37830 100644 --- a/src/devices/wifi/jakes-propagation-loss-model.h +++ b/src/devices/wifi/jakes-propagation-loss-model.h @@ -97,6 +97,8 @@ public: void SetNOscillators (uint8_t nOscillators); private: + JakesPropagationLossModel (const JakesPropagationLossModel &o); + JakesPropagationLossModel & operator = (const JakesPropagationLossModel &o); void DoConstruct (void); virtual double DoGetLoss (Ptr a, Ptr b) const; diff --git a/src/devices/wifi/propagation-loss-model.cc b/src/devices/wifi/propagation-loss-model.cc index 7069d4970..2cd265e40 100644 --- a/src/devices/wifi/propagation-loss-model.cc +++ b/src/devices/wifi/propagation-loss-model.cc @@ -79,6 +79,7 @@ RandomPropagationLossModel::GetTypeId (void) return tid; } RandomPropagationLossModel::RandomPropagationLossModel () + : PropagationLossModel () {} RandomPropagationLossModel::~RandomPropagationLossModel () @@ -86,7 +87,7 @@ RandomPropagationLossModel::~RandomPropagationLossModel () double RandomPropagationLossModel::DoGetLoss (Ptr a, - Ptr b) const + Ptr b) const { double rxc = -m_variable.GetValue (); NS_LOG_DEBUG ("attenuation coefficent="< a, - Ptr b) const; + Ptr b) const; RandomVariable m_variable; }; @@ -159,6 +161,8 @@ public: double GetSystemLoss (void) const; private: + FriisPropagationLossModel (const FriisPropagationLossModel &o); + FriisPropagationLossModel & operator = (const FriisPropagationLossModel &o); virtual double DoGetLoss (Ptr a, Ptr b) const; double DbmToW (double dbm) const; @@ -212,6 +216,8 @@ public: void SetReferenceDistance (double referenceDistance); private: + LogDistancePropagationLossModel (const LogDistancePropagationLossModel &o); + LogDistancePropagationLossModel & operator = (const LogDistancePropagationLossModel &o); virtual double DoGetLoss (Ptr a, Ptr b) const; static Ptr CreateDefaultReference (void);