--- a/src/internet-stack/ipv4-interface.cc	Sat Jun 13 14:59:35 2009 -0700
+++ b/src/internet-stack/ipv4-interface.cc	Sat Jun 13 15:57:04 2009 -0700
@@ -262,13 +262,12 @@
   return m_ifaddrs.size();
 }
 
-uint32_t
+bool
 Ipv4Interface::AddAddress (Ipv4InterfaceAddress addr)
 {
   NS_LOG_FUNCTION_NOARGS ();
-  uint32_t index = m_ifaddrs.size ();
   m_ifaddrs.push_back (addr);
-  return index;
+  return true;
 }
 
 Ipv4InterfaceAddress
@@ -292,7 +291,7 @@
   return (addr);  // quiet compiler
 }
 
-void
+Ipv4InterfaceAddress
 Ipv4Interface::RemoveAddress (uint32_t index)
 {
   NS_LOG_FUNCTION_NOARGS ();
@@ -306,12 +305,15 @@
     {
       if (tmp  == index)
         {
+          Ipv4InterfaceAddress addr = *i;
           m_ifaddrs.erase (i);
-          return;
+          return addr;
         }
        ++tmp;
     }
   NS_ASSERT_MSG (false, "Address " << index << " not found");
+  Ipv4InterfaceAddress addr;
+  return (addr);  // quiet compiler
 }
 
 }; // namespace ns3