1.1 --- a/bindings/python/ns3_module_flow_monitor.py	Fri May 22 14:03:45 2009 +0100
     1.2 +++ b/bindings/python/ns3_module_flow_monitor.py	Sat May 23 17:56:10 2009 +0100
     1.3 @@ -304,21 +304,18 @@
     1.4                     'std::vector< ns3::Ptr< ns3::FlowProbe > >', 
     1.5                     [], 
     1.6                     is_const=True)
     1.7 -    ## flow-monitor.h: void ns3::FlowMonitor::SerializeToXmlStream(std::ostream & os, int indent, bool enableHistograms, bool enableProbes) const [member function]
     1.8 +    ## flow-monitor.h: void ns3::FlowMonitor::SerializeToXmlStream(std::ostream & os, int indent, bool enableHistograms, bool enableProbes) [member function]
     1.9      cls.add_method('SerializeToXmlStream', 
    1.10                     'void', 
    1.11 -                   [param('std::ostream &', 'os'), param('int', 'indent'), param('bool', 'enableHistograms'), param('bool', 'enableProbes')], 
    1.12 -                   is_const=True)
    1.13 -    ## flow-monitor.h: std::string ns3::FlowMonitor::SerializeToXmlString(int indent, bool enableHistograms, bool enableProbes) const [member function]
    1.14 +                   [param('std::ostream &', 'os'), param('int', 'indent'), param('bool', 'enableHistograms'), param('bool', 'enableProbes')])
    1.15 +    ## flow-monitor.h: std::string ns3::FlowMonitor::SerializeToXmlString(int indent, bool enableHistograms, bool enableProbes) [member function]
    1.16      cls.add_method('SerializeToXmlString', 
    1.17                     'std::string', 
    1.18 -                   [param('int', 'indent'), param('bool', 'enableHistograms'), param('bool', 'enableProbes')], 
    1.19 -                   is_const=True)
    1.20 -    ## flow-monitor.h: void ns3::FlowMonitor::SerializeToXmlFile(std::string fileName, bool enableHistograms, bool enableProbes) const [member function]
    1.21 +                   [param('int', 'indent'), param('bool', 'enableHistograms'), param('bool', 'enableProbes')])
    1.22 +    ## flow-monitor.h: void ns3::FlowMonitor::SerializeToXmlFile(std::string fileName, bool enableHistograms, bool enableProbes) [member function]
    1.23      cls.add_method('SerializeToXmlFile', 
    1.24                     'void', 
    1.25 -                   [param('std::string', 'fileName'), param('bool', 'enableHistograms'), param('bool', 'enableProbes')], 
    1.26 -                   is_const=True)
    1.27 +                   [param('std::string', 'fileName'), param('bool', 'enableHistograms'), param('bool', 'enableProbes')])
    1.28      ## flow-monitor.h: void ns3::FlowMonitor::NotifyConstructionCompleted() [member function]
    1.29      cls.add_method('NotifyConstructionCompleted', 
    1.30                     'void', 

     2.1 --- a/src/contrib/flow-monitor/flow-monitor.cc	Fri May 22 14:03:45 2009 +0100
     2.2 +++ b/src/contrib/flow-monitor/flow-monitor.cc	Sat May 23 17:56:10 2009 +0100
     2.3 @@ -366,8 +366,10 @@
     2.4  }
     2.5  
     2.6  void
     2.7 -FlowMonitor::SerializeToXmlStream (std::ostream &os, int indent, bool enableHistograms, bool enableProbes) const
     2.8 +FlowMonitor::SerializeToXmlStream (std::ostream &os, int indent, bool enableHistograms, bool enableProbes)
     2.9  {
    2.10 +  CheckForLostPackets ();
    2.11 +  
    2.12    INDENT(indent); os << "<FlowMonitor>\n";
    2.13    indent += 2;
    2.14    INDENT(indent); os << "<FlowStats>\n";
    2.15 @@ -440,7 +442,7 @@
    2.16    
    2.17  
    2.18  std::string
    2.19 -FlowMonitor::SerializeToXmlString (int indent, bool enableHistograms, bool enableProbes) const
    2.20 +FlowMonitor::SerializeToXmlString (int indent, bool enableHistograms, bool enableProbes)
    2.21  {
    2.22    std::ostringstream os;
    2.23    SerializeToXmlStream (os, indent, enableHistograms, enableProbes);
    2.24 @@ -449,7 +451,7 @@
    2.25  
    2.26  
    2.27  void
    2.28 -FlowMonitor::SerializeToXmlFile (std::string fileName, bool enableHistograms, bool enableProbes) const
    2.29 +FlowMonitor::SerializeToXmlFile (std::string fileName, bool enableHistograms, bool enableProbes)
    2.30  {
    2.31    std::ofstream os (fileName.c_str (), std::ios::out|std::ios::binary);
    2.32    os << "<?xml version=\"1.0\" ?>\n";

     3.1 --- a/src/contrib/flow-monitor/flow-monitor.h	Fri May 22 14:03:45 2009 +0100
     3.2 +++ b/src/contrib/flow-monitor/flow-monitor.h	Sat May 23 17:56:10 2009 +0100
     3.3 @@ -90,9 +90,9 @@
     3.4    std::map<FlowId, FlowStats> GetFlowStats () const;
     3.5    std::vector< Ptr<FlowProbe> > GetAllProbes () const;
     3.6  
     3.7 -  void SerializeToXmlStream (std::ostream &os, int indent, bool enableHistograms, bool enableProbes) const;
     3.8 -  std::string SerializeToXmlString (int indent, bool enableHistograms, bool enableProbes) const;
     3.9 -  void SerializeToXmlFile (std::string fileName, bool enableHistograms, bool enableProbes) const;
    3.10 +  void SerializeToXmlStream (std::ostream &os, int indent, bool enableHistograms, bool enableProbes);
    3.11 +  std::string SerializeToXmlString (int indent, bool enableHistograms, bool enableProbes);
    3.12 +  void SerializeToXmlFile (std::string fileName, bool enableHistograms, bool enableProbes);
    3.13  
    3.14  
    3.15  protected: