Mercurial Mercurial > ns-3.5 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix build.
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Tue, 28 Oct 2008 13:24:04 +0100
changeset 3908 232d52317a18
parent 3907 56e477db65b2
child 3909 4e7e594b0b7e
fix build.
bindings/python/ns3_module_wifi.py file | annotate | diff | comparison | revisions
src/devices/wifi/jakes-propagation-loss-model.h file | annotate | diff | comparison | revisions
src/devices/wifi/propagation-loss-model.cc file | annotate | diff | comparison | revisions
src/devices/wifi/propagation-loss-model.h file | annotate | diff | comparison | revisions 
--- a/bindings/python/ns3_module_wifi.py	Tue Oct 28 13:17:17 2008 +0100
+++ b/bindings/python/ns3_module_wifi.py	Tue Oct 28 13:24:04 2008 +0100
@@ -1042,8 +1042,6 @@
     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 @@
     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 @@
     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 @@
     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', 
--- a/src/devices/wifi/jakes-propagation-loss-model.h	Tue Oct 28 13:17:17 2008 +0100
+++ b/src/devices/wifi/jakes-propagation-loss-model.h	Tue Oct 28 13:24:04 2008 +0100
@@ -97,6 +97,8 @@
   void SetNOscillators (uint8_t nOscillators);
 
 private:
+  JakesPropagationLossModel (const JakesPropagationLossModel &o);
+  JakesPropagationLossModel & operator = (const JakesPropagationLossModel &o);
   void DoConstruct (void);
   virtual double DoGetLoss (Ptr<MobilityModel> a,
 			  Ptr<MobilityModel> b) const;
--- a/src/devices/wifi/propagation-loss-model.cc	Tue Oct 28 13:17:17 2008 +0100
+++ b/src/devices/wifi/propagation-loss-model.cc	Tue Oct 28 13:24:04 2008 +0100
@@ -79,6 +79,7 @@
   return tid;
 }
 RandomPropagationLossModel::RandomPropagationLossModel ()
+  : PropagationLossModel ()
 {}
 
 RandomPropagationLossModel::~RandomPropagationLossModel ()
@@ -86,7 +87,7 @@
 
 double 
 RandomPropagationLossModel::DoGetLoss (Ptr<MobilityModel> a,
-				     Ptr<MobilityModel> b) const
+                                       Ptr<MobilityModel> b) const
 {
   double rxc = -m_variable.GetValue ();
   NS_LOG_DEBUG ("attenuation coefficent="<<rxc<<"Db");
--- a/src/devices/wifi/propagation-loss-model.h	Tue Oct 28 13:17:17 2008 +0100
+++ b/src/devices/wifi/propagation-loss-model.h	Tue Oct 28 13:24:04 2008 +0100
@@ -71,8 +71,10 @@
   virtual ~RandomPropagationLossModel ();
 
 private:
+  RandomPropagationLossModel (const RandomPropagationLossModel &o);
+  RandomPropagationLossModel & operator = (const RandomPropagationLossModel &o);
   virtual double DoGetLoss (Ptr<MobilityModel> a,
-			  Ptr<MobilityModel> b) const;
+                            Ptr<MobilityModel> b) const;
   RandomVariable m_variable;
 };
 
@@ -159,6 +161,8 @@
   double GetSystemLoss (void) const;
 
 private:
+  FriisPropagationLossModel (const FriisPropagationLossModel &o);
+  FriisPropagationLossModel & operator = (const FriisPropagationLossModel &o);
   virtual double DoGetLoss (Ptr<MobilityModel> a,
                             Ptr<MobilityModel> b) const;
   double DbmToW (double dbm) const;
@@ -212,6 +216,8 @@
   void SetReferenceDistance (double referenceDistance);
   
 private:
+  LogDistancePropagationLossModel (const LogDistancePropagationLossModel &o);
+  LogDistancePropagationLossModel & operator = (const LogDistancePropagationLossModel &o);
   virtual double DoGetLoss (Ptr<MobilityModel> a,
                             Ptr<MobilityModel> b) const;
   static Ptr<PropagationLossModel> CreateDefaultReference (void);
ns-3.5