diff --git a/src/node/application-list.cc b/src/node/application-list.cc index dc254befe..ef31c0f1c 100644 --- a/src/node/application-list.cc +++ b/src/node/application-list.cc @@ -26,11 +26,6 @@ namespace ns3{ -ApplicationList::ApplicationList() - : Capability(0) -{ -} - ApplicationList::ApplicationList(Node* n) : Capability(n) { @@ -42,8 +37,7 @@ ApplicationList::~ApplicationList() ApplicationList* ApplicationList::Copy(Node * n) const { // Copy this app list - ApplicationList* r = new ApplicationList(); - r->SetNode(n); + ApplicationList* r = new ApplicationList(n); return r; } diff --git a/src/node/application-list.h b/src/node/application-list.h index 691547ca7..63286e441 100644 --- a/src/node/application-list.h +++ b/src/node/application-list.h @@ -32,7 +32,6 @@ namespace ns3 { class ApplicationList : public Capability { public: - ApplicationList(); ApplicationList(Node*); // Copy constructor not needed, default one is correct ~ApplicationList(); diff --git a/src/node/capability.cc b/src/node/capability.cc index 2c93db6f0..4fc41ebdb 100644 --- a/src/node/capability.cc +++ b/src/node/capability.cc @@ -25,11 +25,6 @@ #include "node.h" namespace ns3 { - -Capability::Capability() - : m_node(0) -{ // Nothing else needed -} Capability::Capability(Node* n) : m_node (n) diff --git a/src/node/capability.h b/src/node/capability.h index c987682ba..80dffe909 100644 --- a/src/node/capability.h +++ b/src/node/capability.h @@ -37,7 +37,6 @@ class NodeReference; class Capability { public: - Capability(); Capability(Node* n); Capability(const Capability&); // Copy constructor virtual Capability& operator=(const Capability&); // Assignment operator diff --git a/src/node/internet-node.cc b/src/node/internet-node.cc index 4922811f6..8f36941df 100644 --- a/src/node/internet-node.cc +++ b/src/node/internet-node.cc @@ -38,7 +38,7 @@ namespace ns3 { InternetNode::InternetNode() { // Instantiate the capabilities - m_applicationList = new ApplicationList(); + m_applicationList = new ApplicationList(this); m_l3Demux = new L3Demux(this); m_ipv4L4Demux = new Ipv4L4Demux(this); m_l3Demux->Insert (Ipv4 (this));