Mercurial Mercurial > ns-3.5 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with trunk
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Tue, 28 Aug 2007 14:10:54 +0200
changeset 1381 6dd346ffeddc
parent 1380 799617173a45 (current diff)
parent 1301 440379945254 (diff)
child 1382 61584c0c60f6
merge with trunk
src/devices/csma/csma-net-device.h file | annotate | diff | comparison | revisions
src/devices/point-to-point/point-to-point-net-device.h file | annotate | diff | comparison | revisions
src/internet-node/ascii-trace.cc file | annotate | diff | comparison | revisions
src/routing/global-routing/global-route-manager-impl.cc file | annotate | diff | comparison | revisions 
--- a/src/devices/csma/csma-net-device.h	Tue Aug 28 13:14:43 2007 +0200
+++ b/src/devices/csma/csma-net-device.h	Tue Aug 28 14:10:54 2007 +0200
@@ -423,8 +423,8 @@
    * @see class CallBackTraceSource
    * @see class TraceResolver
    */
-  CallbackTraceSource<Packet &> m_rxTrace;
-  CallbackTraceSource<Packet &> m_dropTrace;
+  CallbackTraceSource<const Packet &> m_rxTrace;
+  CallbackTraceSource<const Packet &> m_dropTrace;
 
 };
 
--- a/src/devices/point-to-point/point-to-point-net-device.h	Tue Aug 28 13:14:43 2007 +0200
+++ b/src/devices/point-to-point/point-to-point-net-device.h	Tue Aug 28 14:10:54 2007 +0200
@@ -291,7 +291,7 @@
    * @see class CallBackTraceSource
    * @see class TraceResolver
    */
-  CallbackTraceSource<Packet &> m_rxTrace;
+  CallbackTraceSource<const Packet &> m_rxTrace;
   /** 
    * Default data rate.  Used for all newly created p2p net devices
    */
--- a/src/internet-node/ascii-trace.cc	Tue Aug 28 13:14:43 2007 +0200
+++ b/src/internet-node/ascii-trace.cc	Tue Aug 28 14:10:54 2007 +0200
@@ -92,7 +92,7 @@
   m_os << std::endl;
 }
 void 
-AsciiTrace::LogDevRx (TraceContext const &context, Packet &p)
+AsciiTrace::LogDevRx (TraceContext const &context, const Packet &p)
 {
   m_os << "r " << Simulator::Now ().GetSeconds () << " ";
   context.Print (m_os);
--- a/src/internet-node/ascii-trace.h	Tue Aug 28 13:14:43 2007 +0200
+++ b/src/internet-node/ascii-trace.h	Tue Aug 28 14:10:54 2007 +0200
@@ -40,7 +40,7 @@
   void LogDevQueueEnqueue (TraceContext const &context, const Packet &p);
   void LogDevQueueDequeue (TraceContext const &context, const Packet &p);
   void LogDevQueueDrop (TraceContext const &context, const Packet &p);
-  void LogDevRx (TraceContext const &context, Packet &p);
+  void LogDevRx (TraceContext const &context, const Packet &p);
   std::ofstream m_os;
 };
 
--- a/src/routing/global-routing/global-route-manager-impl.cc	Tue Aug 28 13:14:43 2007 +0200
+++ b/src/routing/global-routing/global-route-manager-impl.cc	Tue Aug 28 14:10:54 2007 +0200
@@ -337,8 +337,7 @@
 {
   NS_DEBUG ("GlobalRouteManagerImpl::SelectRouterNodes ()");
 
-  typedef std::vector < Ptr<Node> >::iterator Iterator;
-  for (Iterator i = NodeList::Begin (); i != NodeList::End (); i++)
+  for (NodeList::Iterator i = NodeList::Begin (); i != NodeList::End (); i++)
     {
       Ptr<Node> node = *i;
       NS_DEBUG ("GlobalRouteManagerImpl::SelectRouterNodes (): "
@@ -366,8 +365,7 @@
 //
 // Walk the list of nodes looking for the GlobalRouter Interface.
 //
-  typedef std::vector < Ptr<Node> >::iterator Iterator;
-  for (Iterator i = NodeList::Begin (); i != NodeList::End (); i++)
+  for (NodeList::Iterator i = NodeList::Begin (); i != NodeList::End (); i++)
     {
       Ptr<Node> node = *i;
 
@@ -448,8 +446,7 @@
 //
 // Walk the list of nodes in the system.
 //
-  typedef std::vector < Ptr<Node> >::iterator Iterator;
-  for (Iterator i = NodeList::Begin (); i != NodeList::End (); i++)
+  for (NodeList::Iterator i = NodeList::Begin (); i != NodeList::End (); i++)
     {
       Ptr<Node> node = *i;
 //
ns-3.5