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:44:18 +02:00
parent 817876d6fe
commit ad8424e6d1
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/l3-demux.cc
View File

@ -31,12 +31,10 @@ namespace ns3 {
const Iid L3Demux::iid ("L3Demux"); const Iid L3Demux::iid ("L3Demux");
L3Demux::L3Demux (Node *node) L3Demux::L3Demux (Ptr<Node> node)
: NsUnknown (L3Demux::iid), : NsUnknown (L3Demux::iid),
m_node (node) m_node (node)
{ {}
m_node->Ref ();
}
L3Demux::~L3Demux() L3Demux::~L3Demux()
{} {}
@ -50,11 +48,7 @@ L3Demux::DoDispose (void)
i->second->Unref (); i->second->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/l3-demux.h
View File

@ -29,6 +29,7 @@
#include <map> #include <map>
#include "ns3/ns-unknown.h" #include "ns3/ns-unknown.h"
#include "ns3/ptr.h"
namespace ns3 { namespace ns3 {
@ -45,7 +46,7 @@ class L3Demux : public NsUnknown
public: public:
static const Iid iid; static const Iid iid;
typedef int ProtocolTraceType; typedef int ProtocolTraceType;
L3Demux(Node *node); L3Demux(Ptr<Node> node);
virtual ~L3Demux(); virtual ~L3Demux();
/** /**
@ -90,7 +91,7 @@ protected:
private: private:
typedef std::map<int, ns3::L3Protocol*> L3Map_t; typedef std::map<int, ns3::L3Protocol*> L3Map_t;
Node *m_node; Ptr<Node> m_node;
L3Map_t m_protocols; L3Map_t m_protocols;
}; };