branch merge
authorCraig Dowell <craigdo@ee.washington.edu>
Tue, 30 Jun 2009 23:58:56 -0700
changeset 4631 bb6541caffeb
parent 4630 b72cd6ed9862 (current diff)
parent 4629 2dddadf4248c (diff)
child 4632 a600c11ff8d4
branch merge
--- a/CHANGES.html	Tue Jun 30 23:58:10 2009 -0700
+++ b/CHANGES.html	Tue Jun 30 23:58:56 2009 -0700
@@ -187,7 +187,7 @@
 +  typedef Callback&lt;void, Ptr&lt;const Packet&gt;, const Ipv4Header &, uint32_t &gt; LocalDeliverCallback;
 +  typedef Callback&lt;void, Ptr&lt;const Packet&gt;, const Ipv4Header &&gt; ErrorCallback;
 -  virtual bool RequestInterface (Ipv4Address destination, uint32_t& interface) = 0;
-+  virtual Ptr&lt;Ipv4Route&gt; RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &errno) = 0;
++  virtual Ptr&lt;Ipv4Route&gt; RouteOutput (Ptr&lt;Packet&gt; p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &errno) = 0;
 -  virtual bool RequestRoute (uint32_t interface,
 -                            const Ipv4Header &ipHeader,
 -                            Ptr&lt;Packet&gt; packet,