F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rework the refcounting framework to use the MakeNewObject function

Browse Source
This commit is contained in:
Mathieu Lacage
2007-05-11 08:59:49 +02:00
parent d82a6d11f9
commit 720fae1bbe
9 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/internet-node/internet-node.cc
View File

@@ -41,22 +41,22 @@ namespace ns3 {
InternetNode::InternetNode()
{
Ptr<Ipv4> ipv4 = new Ipv4 (this);
Ptr<Arp> arp = new Arp (this);
Ptr<Udp> udp = new Udp (this);
Ptr<Ipv4> ipv4 = MakeNewObject<Ipv4> (this);
Ptr<Arp> arp = MakeNewObject<Arp> (this);
Ptr<Udp> udp = MakeNewObject<Udp> (this);
Ptr<ApplicationList> applicationList = new ApplicationList(this);
Ptr<L3Demux> l3Demux = new L3Demux(this);
Ptr<Ipv4L4Demux> ipv4L4Demux = new Ipv4L4Demux(this);
Ptr<ApplicationList> applicationList = MakeNewObject<ApplicationList> (this);
Ptr<L3Demux> l3Demux = MakeNewObject<L3Demux> (this);
Ptr<Ipv4L4Demux> ipv4L4Demux = MakeNewObject<Ipv4L4Demux> (this);
l3Demux->Insert (ipv4);
l3Demux->Insert (arp);
ipv4L4Demux->Insert (udp);
Ptr<IUdpImpl> udpImpl = new IUdpImpl (udp);
Ptr<IArpPrivate> arpPrivate = new IArpPrivate (arp);
Ptr<IIpv4Impl> ipv4Impl = new IIpv4Impl (ipv4);
Ptr<IIpv4Private> ipv4Private = new IIpv4Private (ipv4);
Ptr<IUdpImpl> udpImpl = MakeNewObject<IUdpImpl> (udp);
Ptr<IArpPrivate> arpPrivate = MakeNewObject<IArpPrivate> (arp);
Ptr<IIpv4Impl> ipv4Impl = MakeNewObject<IIpv4Impl> (ipv4);
Ptr<IIpv4Private> ipv4Private = MakeNewObject<IIpv4Private> (ipv4);
NsUnknown::AddInterface (ipv4Private);
NsUnknown::AddInterface (ipv4Impl);

2
src/internet-node/udp.cc
View File

@@ -68,7 +68,7 @@ Udp::DoDispose (void)
Ptr<Socket>
Udp::CreateSocket (void)
{
Ptr<Socket> socket = new UdpSocket (m_node, this);
Ptr<Socket> socket = MakeNewObject<UdpSocket> (m_node, this);
return socket;
}