remove nil macro
parent
ad230ae351
commit
b20e550e89
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -30,8 +30,6 @@
|
|||
#include "application.h"
|
||||
#include "ns3/event-id.h"
|
||||
|
||||
#define nil 0
|
||||
|
||||
namespace ns3 {
|
||||
|
||||
class Ipv4Address;
|
||||
|
|
Loading…
Reference in New Issue