--- a/src/internet/model/ipv6-l3-protocol.cc	Sun May 22 21:57:24 2011 -0700
+++ b/src/internet/model/ipv6-l3-protocol.cc	Sun May 22 22:28:15 2011 -0700
@@ -90,28 +90,28 @@
   NS_LOG_FUNCTION_NOARGS ();
 
   /* clear protocol and interface list */
-  for (L4List_t::iterator it = m_protocols.begin () ; it != m_protocols.end () ; ++it)
+  for (L4List_t::iterator it = m_protocols.begin (); it != m_protocols.end (); ++it)
     {
       *it = 0;
     }
   m_protocols.clear ();
 
   /* remove interfaces */
-  for (Ipv6InterfaceList::iterator it = m_interfaces.begin () ; it != m_interfaces.end (); ++it)
+  for (Ipv6InterfaceList::iterator it = m_interfaces.begin (); it != m_interfaces.end (); ++it)
     {
       *it = 0;
     }
   m_interfaces.clear ();
 
   /* remove raw sockets */
-  for (SocketList::iterator it = m_sockets.begin () ; it != m_sockets.end () ; ++it)
+  for (SocketList::iterator it = m_sockets.begin (); it != m_sockets.end (); ++it)
     {
       *it = 0;
     }
   m_sockets.clear ();
 
   /* remove list of prefix */
-  for (Ipv6AutoconfiguredPrefixListI it = m_prefixes.begin () ; it != m_prefixes.end () ; ++it)
+  for (Ipv6AutoconfiguredPrefixListI it = m_prefixes.begin (); it != m_prefixes.end (); ++it)
     {
       (*it)->StopValidTimer ();
       (*it)->StopPreferredTimer ();
@@ -165,7 +165,7 @@
   NS_LOG_FUNCTION (this << index);
   uint32_t tmp = 0;
 
-  for (Ipv6InterfaceList::const_iterator it = m_interfaces.begin () ; it != m_interfaces.end () ; it++)
+  for (Ipv6InterfaceList::const_iterator it = m_interfaces.begin (); it != m_interfaces.end (); it++)
     {
       if (index == tmp)
         {
@@ -187,12 +187,12 @@
   NS_LOG_FUNCTION (this << address); 
   int32_t index = 0;
 
-  for (Ipv6InterfaceList::const_iterator it = m_interfaces.begin () ; it != m_interfaces.end () ; it++)
+  for (Ipv6InterfaceList::const_iterator it = m_interfaces.begin (); it != m_interfaces.end (); it++)
     {
       uint32_t j = 0;
       uint32_t max = (*it)->GetNAddresses ();
 
-      for (j = 0 ; j < max ; j++)
+      for (j = 0; j < max; j++)
         {
           if ((*it)->GetAddress (j).GetAddress () == address) 
             {
@@ -209,10 +209,10 @@
   NS_LOG_FUNCTION (this << address << mask);
   int32_t index = 0;
 
-  for (Ipv6InterfaceList::const_iterator it = m_interfaces.begin () ; it != m_interfaces.end () ; it++)
+  for (Ipv6InterfaceList::const_iterator it = m_interfaces.begin (); it != m_interfaces.end (); it++)
     {
       uint32_t j = 0;
-      for (j = 0 ; j < (*it)->GetNAddresses () ; j++)
+      for (j = 0; j < (*it)->GetNAddresses (); j++)
         {
           if ((*it)->GetAddress (j).GetAddress ().CombinePrefix (mask) == address.CombinePrefix (mask))
             {
@@ -235,7 +235,7 @@
   NS_LOG_FUNCTION (this << device);
   int32_t index = 0;
 
-  for (Ipv6InterfaceList::const_iterator it = m_interfaces.begin () ; it != m_interfaces.end () ; it++)
+  for (Ipv6InterfaceList::const_iterator it = m_interfaces.begin (); it != m_interfaces.end (); it++)
     {
       if ((*it)->GetDevice () == device)
         {
@@ -267,7 +267,7 @@
         }
 
       /* see if we have already the prefix */
-      for (Ipv6AutoconfiguredPrefixListI it = m_prefixes.begin () ; it != m_prefixes.end () ; ++it)
+      for (Ipv6AutoconfiguredPrefixListI it = m_prefixes.begin (); it != m_prefixes.end (); ++it)
         {
           if ((*it)->GetInterface () == interface && (*it)->GetPrefix () == network && (*it)->GetMask () == mask)
             {
@@ -303,7 +303,7 @@
   uint32_t i = 0;
   Ipv6Address toFound = Ipv6Address::MakeAutoconfiguredAddress (Mac48Address::ConvertFrom (addr), network);
 
-  for (i = 0 ; i < max ; i++)
+  for (i = 0; i < max; i++)
     {
       if (iface->GetAddress (i).GetAddress () == toFound) 
         {
@@ -313,7 +313,7 @@
     }
 
   /* remove from list of autoconfigured address */
-  for (Ipv6AutoconfiguredPrefixListI it = m_prefixes.begin () ; it != m_prefixes.end () ; ++it)
+  for (Ipv6AutoconfiguredPrefixListI it = m_prefixes.begin (); it != m_prefixes.end (); ++it)
     {
       if ((*it)->GetInterface () == interface && (*it)->GetPrefix () == network && (*it)->GetMask () == mask)
         {
@@ -432,7 +432,7 @@
   uint32_t i = 0;
 
   /* see if we have already an loopback NetDevice */
-  for (i = 0 ; i < m_node->GetNDevices () ; i++)
+  for (i = 0; i < m_node->GetNDevices (); i++)
     {
       if (device = DynamicCast<LoopbackNetDevice> (m_node->GetDevice (i)))
         {
@@ -482,7 +482,7 @@
   NS_LOG_FUNCTION (this << forward);
   m_ipForward = forward;
 
-  for (Ipv6InterfaceList::const_iterator it = m_interfaces.begin () ; it != m_interfaces.end (); it++)
+  for (Ipv6InterfaceList::const_iterator it = m_interfaces.begin (); it != m_interfaces.end (); it++)
     {
       (*it)->SetForwarding (forward);
     }
@@ -535,7 +535,7 @@
 {
   NS_LOG_FUNCTION (this << protocolNumber);
 
-  for (L4List_t::const_iterator i = m_protocols.begin () ; i != m_protocols.end () ; ++i)
+  for (L4List_t::const_iterator i = m_protocols.begin (); i != m_protocols.end (); ++i)
     {
       if ((*i)->GetProtocolNumber () == protocolNumber)
         {
@@ -558,7 +558,7 @@
 {
   NS_LOG_FUNCTION (this << socket);
 
-  for (SocketList::iterator it = m_sockets.begin () ; it != m_sockets.end () ; ++it)
+  for (SocketList::iterator it = m_sockets.begin (); it != m_sockets.end (); ++it)
     {
       if ((*it) == socket)
         {
@@ -669,7 +669,7 @@
   Ptr<Packet> packet = p->Copy ();
   Ptr<Ipv6Interface> ipv6Interface = 0;
 
-  for (Ipv6InterfaceList::const_iterator it = m_interfaces.begin () ; it != m_interfaces.end () ; it++)
+  for (Ipv6InterfaceList::const_iterator it = m_interfaces.begin (); it != m_interfaces.end (); it++)
     {
       ipv6Interface = *it;
 
@@ -702,7 +702,7 @@
     }
 
   /* forward up to IPv6 raw sockets */
-  for (SocketList::iterator it = m_sockets.begin () ; it != m_sockets.end () ; ++it)
+  for (SocketList::iterator it = m_sockets.begin (); it != m_sockets.end (); ++it)
     {
       Ptr<Ipv6RawSocketImpl> socket = *it;
       socket->ForwardUp (packet, hdr, device);