From 5bd6229ac14654d5ff873f2ccfd5267d2d9fffc6 Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Thu, 10 May 2007 07:35:53 +0200
Subject: [PATCH] convert more code to use Ptr<Node> instead of Node *

---
 src/internet-node/arp-ipv4-interface.cc      | 10 +++-------
 src/internet-node/arp-ipv4-interface.h       |  5 +++--
 src/internet-node/ipv4-loopback-interface.cc | 10 +++-------
 src/internet-node/ipv4-loopback-interface.h  |  5 +++--
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/internet-node/arp-ipv4-interface.cc b/src/internet-node/arp-ipv4-interface.cc
index ee168bfd8..bf80bfe71 100644
--- a/src/internet-node/arp-ipv4-interface.cc
+++ b/src/internet-node/arp-ipv4-interface.cc
@@ -31,16 +31,12 @@
 
 namespace ns3 {
 
-ArpIpv4Interface::ArpIpv4Interface (Node *node, NetDevice *device)
+ArpIpv4Interface::ArpIpv4Interface (Ptr<Node> node, NetDevice *device)
   : Ipv4Interface (device),
     m_node (node)
-{
-  m_node->Ref ();
-}
+{}
 ArpIpv4Interface::~ArpIpv4Interface ()
-{
-  m_node->Unref ();
-}
+{}
 
 TraceResolver *
 ArpIpv4Interface::DoCreateTraceResolver (TraceContext const &context)
diff --git a/src/internet-node/arp-ipv4-interface.h b/src/internet-node/arp-ipv4-interface.h
index 7b92b2234..d75e7a491 100644
--- a/src/internet-node/arp-ipv4-interface.h
+++ b/src/internet-node/arp-ipv4-interface.h
@@ -23,6 +23,7 @@
 #define ARP_IPV4_INTERFACE_H
 
 #include "ipv4-interface.h"
+#include "ns3/ptr.h"
 
 namespace ns3 {
 
@@ -42,13 +43,13 @@ class ArpIpv4Interface : public Ipv4Interface
     NETDEVICE,
     ARP,
   };
-  ArpIpv4Interface (Node *node, NetDevice *device);
+  ArpIpv4Interface (Ptr<Node> node, NetDevice *device);
   virtual ~ArpIpv4Interface ();
 
  private:
   virtual void SendTo (Packet p, Ipv4Address dest);
   virtual TraceResolver *DoCreateTraceResolver (TraceContext const &context);
-  Node *m_node;
+  Ptr<Node> m_node;
 };
 
 }//namespace ns3
diff --git a/src/internet-node/ipv4-loopback-interface.cc b/src/internet-node/ipv4-loopback-interface.cc
index 37a4eaf37..6b68dc871 100644
--- a/src/internet-node/ipv4-loopback-interface.cc
+++ b/src/internet-node/ipv4-loopback-interface.cc
@@ -27,16 +27,12 @@
 
 namespace ns3 {
 
-Ipv4LoopbackInterface::Ipv4LoopbackInterface (Node *node)
+Ipv4LoopbackInterface::Ipv4LoopbackInterface (Ptr<Node> node)
   : Ipv4Interface (0),
     m_node (node)
-{
-  m_node->Ref ();
-}
+{}
 Ipv4LoopbackInterface::~Ipv4LoopbackInterface ()
-{
-  m_node->Unref ();
-}
+{}
 
 TraceResolver *
 Ipv4LoopbackInterface::DoCreateTraceResolver (TraceContext const &context)
diff --git a/src/internet-node/ipv4-loopback-interface.h b/src/internet-node/ipv4-loopback-interface.h
index c4dff8763..cc7609b4a 100644
--- a/src/internet-node/ipv4-loopback-interface.h
+++ b/src/internet-node/ipv4-loopback-interface.h
@@ -23,6 +23,7 @@
 #define IPV4_LOOPBACK_INTERFACE_H
 
 #include "ipv4-interface.h"
+#include "ns3/ptr.h"
 
 namespace ns3 {
 
@@ -31,14 +32,14 @@ class Node;
 class Ipv4LoopbackInterface : public Ipv4Interface 
 {
  public:
-  Ipv4LoopbackInterface (Node *node);
+  Ipv4LoopbackInterface (Ptr<Node> node);
   virtual ~Ipv4LoopbackInterface ();
 
  private:
   virtual void SendTo (Packet p, Ipv4Address dest);
   virtual TraceResolver *DoCreateTraceResolver (TraceContext const &context);
 
-  Node *m_node;
+  Ptr<Node> m_node;
 };
 
 }//namespace ns3