diff --git a/src/node/capability.cc b/src/node/capability.cc index d134feee2..5f026832d 100644 --- a/src/node/capability.cc +++ b/src/node/capability.cc @@ -25,12 +25,10 @@ #include "node.h" #include "node-reference.h" -#define nil 0 - namespace ns3 { Capability::Capability() - : m_node(nil) + : m_node(0) { // Nothing else needed } @@ -74,7 +72,7 @@ void Capability::SetNode(Node& n) Node* Capability::GetNode() const { - if (!m_node) return nil; + if (!m_node) return 0; return m_node->GetNode(); } diff --git a/src/node/capability.h b/src/node/capability.h index b60e0b227..d0f25aaee 100644 --- a/src/node/capability.h +++ b/src/node/capability.h @@ -30,8 +30,6 @@ // The node pointer is not owned by the capability, and is not deleted // by the capability destructor. -#define nil 0 - namespace ns3 { class Node; class NodeReference; diff --git a/src/node/onoff-application.h b/src/node/onoff-application.h index 46a5bc534..e7ea44f3e 100644 --- a/src/node/onoff-application.h +++ b/src/node/onoff-application.h @@ -30,8 +30,6 @@ #include "application.h" #include "ns3/event-id.h" -#define nil 0 - namespace ns3 { class Ipv4Address;