--- a/src/click/model/ipv4-l3-click-protocol.cc	Wed Jun 24 19:40:03 2015 -0700
+++ b/src/click/model/ipv4-l3-click-protocol.cc	Wed Jun 24 21:36:15 2015 -0700
@@ -108,7 +108,7 @@
           this->SetNode (node);
         }
     }
-  Object::NotifyNewAggregate ();
+  Ipv4::NotifyNewAggregate ();
 }
 
 void

--- a/src/dsr/model/dsr-routing.cc	Wed Jun 24 19:40:03 2015 -0700
+++ b/src/dsr/model/dsr-routing.cc	Wed Jun 24 21:36:15 2015 -0700
@@ -416,7 +416,7 @@
             }
         }
     }
-  Object::NotifyNewAggregate ();
+  IpL4Protocol::NotifyNewAggregate ();
   Simulator::ScheduleNow (&DsrRouting::Start, this);
 }
 

--- a/src/internet/model/icmpv4-l4-protocol.cc	Wed Jun 24 19:40:03 2015 -0700
+++ b/src/internet/model/icmpv4-l4-protocol.cc	Wed Jun 24 21:36:15 2015 -0700
@@ -92,7 +92,7 @@
             }
         }
     }
-  Object::NotifyNewAggregate ();
+  IpL4Protocol::NotifyNewAggregate ();
 }
 
 uint16_t 

--- a/src/internet/model/icmpv6-l4-protocol.cc	Wed Jun 24 19:40:03 2015 -0700
+++ b/src/internet/model/icmpv6-l4-protocol.cc	Wed Jun 24 21:36:15 2015 -0700
@@ -137,7 +137,7 @@
             }
         }
     }
-  Object::NotifyNewAggregate ();
+  IpL4Protocol::NotifyNewAggregate ();
 }
 
 void Icmpv6L4Protocol::SetNode (Ptr<Node> node)

--- a/src/internet/model/ipv4-l3-protocol.cc	Wed Jun 24 19:40:03 2015 -0700
+++ b/src/internet/model/ipv4-l3-protocol.cc	Wed Jun 24 21:36:15 2015 -0700
@@ -197,7 +197,7 @@
           this->SetNode (node);
         }
     }
-  Object::NotifyNewAggregate ();
+  Ipv4::NotifyNewAggregate ();
 }
 
 void 

--- a/src/internet/model/ipv6-l3-protocol.cc	Wed Jun 24 19:40:03 2015 -0700
+++ b/src/internet/model/ipv6-l3-protocol.cc	Wed Jun 24 21:36:15 2015 -0700
@@ -693,7 +693,7 @@
           this->SetNode (node);
         }
     }
-  Object::NotifyNewAggregate ();
+  Ipv6::NotifyNewAggregate ();
 }
 
 void Ipv6L3Protocol::SetNode (Ptr<Node> node)

--- a/src/internet/model/nsc-tcp-l4-protocol.cc	Wed Jun 24 19:40:03 2015 -0700
+++ b/src/internet/model/nsc-tcp-l4-protocol.cc	Wed Jun 24 21:36:15 2015 -0700
@@ -244,7 +244,7 @@
             }
         }
     }
-  Object::NotifyNewAggregate ();
+  IpL4Protocol::NotifyNewAggregate ();
 }
 
 int 

--- a/src/internet/model/tcp-l4-protocol.cc	Wed Jun 24 19:40:03 2015 -0700
+++ b/src/internet/model/tcp-l4-protocol.cc	Wed Jun 24 21:36:15 2015 -0700
@@ -143,7 +143,7 @@
       ipv6->Insert(this);
       this->SetDownTarget6(MakeCallback(&Ipv6L3Protocol::Send, ipv6));
     }
-  Object::NotifyNewAggregate ();
+  IpL4Protocol::NotifyNewAggregate ();
 }
 
 int 

--- a/src/internet/model/udp-l4-protocol.cc	Wed Jun 24 19:40:03 2015 -0700
+++ b/src/internet/model/udp-l4-protocol.cc	Wed Jun 24 21:36:15 2015 -0700
@@ -120,7 +120,7 @@
       ipv6->Insert (this);
       this->SetDownTarget6 (MakeCallback (&Ipv6L3Protocol::Send, ipv6));
     }
-  Object::NotifyNewAggregate ();
+  IpL4Protocol::NotifyNewAggregate ();
 }
 
 int