From: Richard Whitehouse <github@richardwhiuk.com>
Date: Sun, 8 May 2011 00:47:14 +0000 (+0100)
Subject: Virtualise call to print bridge to allow for subclasses to override it
X-Git-Url: https://git.richardwhiuk.com/?a=commitdiff_plain;h=d3f873927076a3b65f4253cd874ef9578fe312cd;p=ns-moose.git

Virtualise call to print bridge to allow for subclasses to override it
---

diff --git a/src/devices/bridge/model/bridge-net-device.cc b/src/devices/bridge/model/bridge-net-device.cc
index 9331304..d42efee 100644
--- a/src/devices/bridge/model/bridge-net-device.cc
+++ b/src/devices/bridge/model/bridge-net-device.cc
@@ -450,11 +450,15 @@ Address BridgeNetDevice::GetMulticast (Ipv6Address addr) const
   return Mac48Address::GetMulticast (addr);
 }
 
-std::ostream& operator<<(std::ostream& file, BridgeNetDevice& dev){
+std::ostream& BridgeNetDevice::Print(std::ostream& file){
 	file << 1 << std::endl;
-	file << dev.m_address << std::endl;
-	file << *(dev.m_state);
+	file << m_address << std::endl;
+	file << *m_state;
 	return file;
 }
 
+std::ostream& operator<<(std::ostream& file, BridgeNetDevice& dev){
+	return dev.Print(file);
+}
+
 } // namespace ns3
diff --git a/src/devices/bridge/model/bridge-net-device.h b/src/devices/bridge/model/bridge-net-device.h
index 47e6d61..dd55ab3 100644
--- a/src/devices/bridge/model/bridge-net-device.h
+++ b/src/devices/bridge/model/bridge-net-device.h
@@ -136,6 +136,8 @@ protected:
 
   virtual Ptr<BridgePortNetDevice> CreateBridgePort(Ptr<BridgeNetDevice> bridge, Ptr<NetDevice> device, Ptr<Node> node);
 
+  virtual std::ostream& Print(std::ostream&);
+
 private:
   NetDevice::ReceiveCallback m_rxCallback;
   NetDevice::PromiscReceiveCallback m_promiscRxCallback;