# HG changeset patch # User Mathieu Lacage # Date 1215659525 25200 # Node ID ac82ff1f6736843ce1a5c3dccf32da3bc86c08b2 # Parent 39f44473e4cbb7cdc6078b4cab38ea3b180f48bb use NS_DEPRECATED for bug 232. diff -r 39f44473e4cb -r ac82ff1f6736 src/helper/csma-helper.cc --- a/src/helper/csma-helper.cc Wed Jul 09 20:11:16 2008 -0700 +++ b/src/helper/csma-helper.cc Wed Jul 09 20:12:05 2008 -0700 @@ -64,6 +64,17 @@ } void +CsmaHelper::SetDeviceParameter (std::string n1, const AttributeValue &v1) +{ + SetDeviceAttribute (n1, v1); +} +void +CsmaHelper::SetChannelParameter (std::string n1, const AttributeValue &v1) +{ + SetChannelAttribute (n1, v1); +} + +void CsmaHelper::EnablePcap (std::string filename, uint32_t nodeid, uint32_t deviceid) { std::ostringstream oss; diff -r 39f44473e4cb -r ac82ff1f6736 src/helper/csma-helper.h --- a/src/helper/csma-helper.h Wed Jul 09 20:11:16 2008 -0700 +++ b/src/helper/csma-helper.h Wed Jul 09 20:12:05 2008 -0700 @@ -27,6 +27,7 @@ #include "ns3/net-device-container.h" #include "ns3/node-container.h" #include "ns3/csma-channel.h" +#include "ns3/deprecated.h" namespace ns3 { @@ -79,6 +80,9 @@ */ void SetChannelAttribute (std::string n1, const AttributeValue &v1); + void SetDeviceParameter (std::string n1, const AttributeValue &v1) NS_DEPRECATED; + void SetChannelParameter (std::string n1, const AttributeValue &v1) NS_DEPRECATED; + /** * \param filename filename prefix to use for pcap files. * \param nodeid the id of the node to generate pcap output for. diff -r 39f44473e4cb -r ac82ff1f6736 src/helper/point-to-point-helper.cc --- a/src/helper/point-to-point-helper.cc Wed Jul 09 20:11:16 2008 -0700 +++ b/src/helper/point-to-point-helper.cc Wed Jul 09 20:12:05 2008 -0700 @@ -64,6 +64,17 @@ } void +PointToPointHelper::SetDeviceParameter (std::string name, const AttributeValue &value) +{ + SetDeviceAttribute (name, value); +} +void +PointToPointHelper::SetChannelParameter (std::string name, const AttributeValue &value) +{ + SetChannelAttribute (name, value); +} + +void PointToPointHelper::EnablePcap (std::string filename, uint32_t nodeid, uint32_t deviceid) { std::ostringstream oss; diff -r 39f44473e4cb -r ac82ff1f6736 src/helper/point-to-point-helper.h --- a/src/helper/point-to-point-helper.h Wed Jul 09 20:11:16 2008 -0700 +++ b/src/helper/point-to-point-helper.h Wed Jul 09 20:12:05 2008 -0700 @@ -23,6 +23,7 @@ #include "ns3/object-factory.h" #include "ns3/net-device-container.h" #include "ns3/node-container.h" +#include "ns3/deprecated.h" #include namespace ns3 { @@ -78,6 +79,9 @@ */ void SetChannelAttribute (std::string name, const AttributeValue &value); + void SetDeviceParameter (std::string name, const AttributeValue &value) NS_DEPRECATED; + void SetChannelParameter (std::string name, const AttributeValue &value) NS_DEPRECATED; + /** * \param filename filename prefix to use for pcap files. * \param nodeid the id of the node to generate pcap output for.