EmaMaker
/
tc-homework2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert Node * to Ptr<Node>

Mathieu Lacage 2007-05-10 07:58:18 +02:00
parent 96e58ed708
commit 66bc2db9d1
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/internet-node/ipv4-l4-demux.cc
View File

@ -32,12 +32,10 @@ namespace ns3 {
const Iid Ipv4L4Demux::iid ("Ipv4L4Demux"); const Iid Ipv4L4Demux::iid ("Ipv4L4Demux");
Ipv4L4Demux::Ipv4L4Demux (Node *node) Ipv4L4Demux::Ipv4L4Demux (Ptr<Node> node)
: NsUnknown (Ipv4L4Demux::iid), : NsUnknown (Ipv4L4Demux::iid),
m_node (node) m_node (node)
{ {}
m_node->Ref ();
}
Ipv4L4Demux::~Ipv4L4Demux() Ipv4L4Demux::~Ipv4L4Demux()
{} {}
@ -51,11 +49,7 @@ Ipv4L4Demux::DoDispose (void)
(*i)->Unref (); (*i)->Unref ();
} }
m_protocols.clear (); m_protocols.clear ();
if (m_node != 0) m_node = 0;
{
m_node->Unref ();
m_node = 0;
}
NsUnknown::DoDispose (); NsUnknown::DoDispose ();
} }

5
src/internet-node/ipv4-l4-demux.h
View File

@ -27,6 +27,7 @@
#include <list> #include <list>
#include "ns3/ns-unknown.h" #include "ns3/ns-unknown.h"
#include "ns3/ptr.h"
namespace ns3 { namespace ns3 {
@ -43,7 +44,7 @@ class Ipv4L4Demux : public NsUnknown
public: public:
static const Iid iid; static const Iid iid;
typedef int Ipv4L4ProtocolTraceType; typedef int Ipv4L4ProtocolTraceType;
Ipv4L4Demux (Node *node); Ipv4L4Demux (Ptr<Node> node);
virtual ~Ipv4L4Demux(); virtual ~Ipv4L4Demux();
/** /**
@ -86,7 +87,7 @@ private:
virtual void DoDispose (void); virtual void DoDispose (void);
typedef std::list<Ipv4L4Protocol*> L4List_t; typedef std::list<Ipv4L4Protocol*> L4List_t;
L4List_t m_protocols; L4List_t m_protocols;
Node *m_node; Ptr<Node> m_node;
}; };
} //namespace ns3 } //namespace ns3