merge with HEAD
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Tue, 25 Mar 2008 14:17:35 -0700
changeset 2740 45f6c609e22c
parent 2739 5234783968ff (current diff)
parent 2734 b9fc3b64e593 (diff)
child 2741 d310af37b67e
child 2846 7689461231ac
merge with HEAD
--- a/src/devices/point-to-point/point-to-point-channel.cc	Tue Mar 25 14:16:40 2008 -0700
+++ b/src/devices/point-to-point/point-to-point-channel.cc	Tue Mar 25 14:17:35 2008 -0700
@@ -136,7 +136,7 @@
 PointToPointChannel::GetDevice (uint32_t i) const
 {
   NS_LOG_FUNCTION;
-  return GetDevice (i);
+  return GetPointToPointDevice (i);
 }