--- a/src/internet-node/ipv4-l4-demux.cc	Fri May 25 10:52:58 2007 +0200
+++ b/src/internet-node/ipv4-l4-demux.cc	Fri May 25 10:56:03 2007 +0200
@@ -30,12 +30,13 @@
 
 namespace ns3 {
 
-const InterfaceId Ipv4L4Demux::iid ("Ipv4L4Demux");
+const InterfaceId Ipv4L4Demux::iid = MakeInterfaceId ("Ipv4L4Demux", Object::iid);
 
 Ipv4L4Demux::Ipv4L4Demux (Ptr<INode> node)
-  : Interface (Ipv4L4Demux::iid),
-    m_node (node)
-{}
+  : m_node (node)
+{
+  SetInterfaceId (Ipv4L4Demux::iid);
+}
 
 Ipv4L4Demux::~Ipv4L4Demux()
 {}
@@ -50,7 +51,7 @@
     }
   m_protocols.clear ();
   m_node = 0;
-  Interface::DoDispose ();
+  Object::DoDispose ();
 }
 
 TraceResolver *