constify, allow ItemList access to private methods
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Thu, 31 May 2007 13:37:05 +0200
changeset 800 dd9660f5f784
parent 799 3236b54a77a6
child 801 331f04850924
constify, allow ItemList access to private methods
src/common/packet-printer.cc
src/common/packet-printer.h
--- a/src/common/packet-printer.cc	Thu May 31 12:34:33 2007 +0200
+++ b/src/common/packet-printer.cc	Thu May 31 13:37:05 2007 +0200
@@ -78,10 +78,10 @@
                            Buffer::Iterator start, 
                            std::ostream &os, 
                            uint32_t packetUid,
-                           uint32_t size)
+                           uint32_t size) const
 {
   RegisteredChunks *registeredChunks = PacketPrinter::GetRegisteredChunks ();
-  for (PrinterList::iterator i = m_printerList.begin (); i != m_printerList.end (); i++)
+  for (PrinterList::const_iterator i = m_printerList.begin (); i != m_printerList.end (); i++)
     {
       if (i->m_chunkUid == chunkUid)
         {
@@ -103,7 +103,7 @@
                                    uint32_t packetUid,
                                    uint32_t size,
                                    uint32_t fragmentStart,
-                                   uint32_t fragmentEnd)
+                                   uint32_t fragmentEnd) const
 {
   RegisteredChunks *registeredChunks = PacketPrinter::GetRegisteredChunks ();
   DoGetNameCallback cb = (*registeredChunks)[chunkUid].second;
@@ -111,7 +111,7 @@
   struct PacketPrinter::FragmentInformation info;
   info.start = fragmentStart;
   info.end = fragmentEnd;
-  for (PrinterList::iterator i = m_printerList.begin (); i != m_printerList.end (); i++)
+  for (PrinterList::const_iterator i = m_printerList.begin (); i != m_printerList.end (); i++)
     {
       if (i->m_chunkUid == chunkUid)
         {
@@ -123,7 +123,7 @@
 }
 void 
 PacketPrinter::PrintPayload (std::ostream &os, uint32_t packetUid, uint32_t size,
-                             uint32_t fragmentStart, uint32_t fragmentEnd)
+                             uint32_t fragmentStart, uint32_t fragmentEnd) const
 {
   struct PacketPrinter::FragmentInformation info;
   info.start = fragmentStart;
--- a/src/common/packet-printer.h	Thu May 31 12:34:33 2007 +0200
+++ b/src/common/packet-printer.h	Thu May 31 13:37:05 2007 +0200
@@ -26,6 +26,10 @@
 #include "buffer.h"
 #include <vector>
 
+namespace {
+  class ItemList;
+}
+
 namespace ns3 {
 
 class Chunk;
@@ -90,6 +94,7 @@
   
 private:
   friend class PacketHistory;
+  friend class ItemList;
   struct Printer
   {
     uint32_t m_chunkUid;
@@ -143,15 +148,15 @@
 		   Buffer::Iterator i, 
 		   std::ostream &os, 
 		   uint32_t packetUid,
-		   uint32_t size);
+		   uint32_t size) const;
   void PrintChunkFragment (uint32_t uid,
 			   std::ostream &os,
 			   uint32_t packetUid,
 			   uint32_t size,
 			   uint32_t fragmentStart,
-			   uint32_t fragmentEnd);
+			   uint32_t fragmentEnd) const;
   void PrintPayload (std::ostream &os, uint32_t packetUid, uint32_t size,
-		     uint32_t fragmentStart, uint32_t fragmentEnd);
+		     uint32_t fragmentStart, uint32_t fragmentEnd) const;
 
   static PacketPrinter m_defaultPacketPrinter;
   PrinterList m_printerList;