merge implicit conversion tree

2007-08-06 15:32:27 +02:00
parent 988d512b77 f1b9327123
commit 0db07e14d6
15 changed files with 97 additions and 40 deletions
--- a/src/internet-node/udp-socket.cc
+++ b/src/internet-node/udp-socket.cc
@@ -271,7 +271,7 @@ UdpSocket::ForwardUp (const Packet &packet, Ipv4Address ipv4, uint16_t port)
      return;
    }
  
-  Address address = InetSocketAddress (ipv4, port).ConvertTo ();
+  Address address = InetSocketAddress (ipv4, port);
  Packet p = packet;
  if (!m_dummyRxCallback.IsNull ())
    {