replace \t with 8 spaces.
--- a/src/helper/csma-helper.cc Fri Oct 24 12:29:39 2008 +0200
+++ b/src/helper/csma-helper.cc Fri Oct 24 12:31:57 2008 +0200
@@ -39,10 +39,10 @@
void
CsmaHelper::SetQueue (std::string type,
- std::string n1, const AttributeValue &v1,
- std::string n2, const AttributeValue &v2,
- std::string n3, const AttributeValue &v3,
- std::string n4, const AttributeValue &v4)
+ std::string n1, const AttributeValue &v1,
+ std::string n2, const AttributeValue &v2,
+ std::string n3, const AttributeValue &v3,
+ std::string n4, const AttributeValue &v4)
{
m_queueFactory.SetTypeId (type);
m_queueFactory.Set (n1, v1);
@@ -106,9 +106,9 @@
{
Ptr<Node> node = *i;
for (uint32_t j = 0; j < node->GetNDevices (); ++j)
- {
- devs.Add (node->GetDevice (j));
- }
+ {
+ devs.Add (node->GetDevice (j));
+ }
}
EnablePcap (filename, devs);
}
@@ -153,9 +153,9 @@
{
Ptr<Node> node = *i;
for (uint32_t j = 0; j < node->GetNDevices (); ++j)
- {
- devs.Add (node->GetDevice (j));
- }
+ {
+ devs.Add (node->GetDevice (j));
+ }
}
EnableAscii (os, devs);
}
--- a/src/helper/csma-helper.h Fri Oct 24 12:29:39 2008 +0200
+++ b/src/helper/csma-helper.h Fri Oct 24 12:31:57 2008 +0200
@@ -57,10 +57,10 @@
* CsmaNetDevice created through CsmaHelper::Install.
*/
void SetQueue (std::string type,
- std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
- std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
- std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
- std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue ());
+ std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
+ std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
+ std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
+ std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue ());
/**
* \param n1 the name of the attribute to set
--- a/src/helper/mobility-helper.cc Fri Oct 24 12:29:39 2008 +0200
+++ b/src/helper/mobility-helper.cc Fri Oct 24 12:31:57 2008 +0200
@@ -47,15 +47,15 @@
}
void
MobilityHelper::SetPositionAllocator (std::string type,
- std::string n1, const AttributeValue &v1,
- std::string n2, const AttributeValue &v2,
- std::string n3, const AttributeValue &v3,
- std::string n4, const AttributeValue &v4,
- std::string n5, const AttributeValue &v5,
- std::string n6, const AttributeValue &v6,
- std::string n7, const AttributeValue &v7,
- std::string n8, const AttributeValue &v8,
- std::string n9, const AttributeValue &v9)
+ std::string n1, const AttributeValue &v1,
+ std::string n2, const AttributeValue &v2,
+ std::string n3, const AttributeValue &v3,
+ std::string n4, const AttributeValue &v4,
+ std::string n5, const AttributeValue &v5,
+ std::string n6, const AttributeValue &v6,
+ std::string n7, const AttributeValue &v7,
+ std::string n8, const AttributeValue &v8,
+ std::string n9, const AttributeValue &v9)
{
ObjectFactory pos;
pos.SetTypeId (type);
@@ -73,15 +73,15 @@
void
MobilityHelper::SetMobilityModel (std::string type,
- std::string n1, const AttributeValue &v1,
- std::string n2, const AttributeValue &v2,
- std::string n3, const AttributeValue &v3,
- std::string n4, const AttributeValue &v4,
- std::string n5, const AttributeValue &v5,
- std::string n6, const AttributeValue &v6,
- std::string n7, const AttributeValue &v7,
- std::string n8, const AttributeValue &v8,
- std::string n9, const AttributeValue &v9)
+ std::string n1, const AttributeValue &v1,
+ std::string n2, const AttributeValue &v2,
+ std::string n3, const AttributeValue &v3,
+ std::string n4, const AttributeValue &v4,
+ std::string n5, const AttributeValue &v5,
+ std::string n6, const AttributeValue &v6,
+ std::string n7, const AttributeValue &v7,
+ std::string n8, const AttributeValue &v8,
+ std::string n9, const AttributeValue &v9)
{
m_mobility.SetTypeId (type);
m_mobility.Set (n1, v1);
@@ -122,29 +122,29 @@
Ptr<Object> object = *i;
Ptr<MobilityModel> model = object->GetObject<MobilityModel> ();
if (model == 0)
- {
- model = m_mobility.Create ()->GetObject<MobilityModel> ();
- if (model == 0)
- {
- NS_FATAL_ERROR ("The requested mobility model is not a mobility model: \""<<
- m_mobility.GetTypeId ().GetName ()<<"\"");
- }
- if (m_mobilityStack.empty ())
- {
- NS_LOG_DEBUG ("node="<<object<<", mob="<<model);
- object->AggregateObject (model);
- }
- else
- {
- // we need to setup a hierarchical mobility model
- Ptr<MobilityModel> parent = m_mobilityStack.back ();
- Ptr<MobilityModel> hierarchical =
- CreateObject<HierarchicalMobilityModel> ("Child", PointerValue (model),
- "Parent", PointerValue (parent));
- object->AggregateObject (hierarchical);
- NS_LOG_DEBUG ("node="<<object<<", mob="<<hierarchical);
- }
- }
+ {
+ model = m_mobility.Create ()->GetObject<MobilityModel> ();
+ if (model == 0)
+ {
+ NS_FATAL_ERROR ("The requested mobility model is not a mobility model: \""<<
+ m_mobility.GetTypeId ().GetName ()<<"\"");
+ }
+ if (m_mobilityStack.empty ())
+ {
+ NS_LOG_DEBUG ("node="<<object<<", mob="<<model);
+ object->AggregateObject (model);
+ }
+ else
+ {
+ // we need to setup a hierarchical mobility model
+ Ptr<MobilityModel> parent = m_mobilityStack.back ();
+ Ptr<MobilityModel> hierarchical =
+ CreateObject<HierarchicalMobilityModel> ("Child", PointerValue (model),
+ "Parent", PointerValue (parent));
+ object->AggregateObject (hierarchical);
+ NS_LOG_DEBUG ("node="<<object<<", mob="<<hierarchical);
+ }
+ }
Vector position = m_position->GetNext ();
model->SetPosition (position);
}
--- a/src/helper/mobility-helper.h Fri Oct 24 12:29:39 2008 +0200
+++ b/src/helper/mobility-helper.h Fri Oct 24 12:31:57 2008 +0200
@@ -72,15 +72,15 @@
* \param v9 the value of the attribute to set in the mobility model.
*/
void SetPositionAllocator (std::string type,
- std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
- std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
- std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
- std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
- std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
- std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
- std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue (),
- std::string n8 = "", const AttributeValue &v8 = EmptyAttributeValue (),
- std::string n9 = "", const AttributeValue &v9 = EmptyAttributeValue ());
+ std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
+ std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
+ std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
+ std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
+ std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
+ std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
+ std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue (),
+ std::string n8 = "", const AttributeValue &v8 = EmptyAttributeValue (),
+ std::string n9 = "", const AttributeValue &v9 = EmptyAttributeValue ());
/**
* \param type the type of mobility model to use.
@@ -107,15 +107,15 @@
* mobility model for each node.
*/
void SetMobilityModel (std::string type,
- std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
- std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
- std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
- std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
- std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
- std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
- std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue (),
- std::string n8 = "", const AttributeValue &v8 = EmptyAttributeValue (),
- std::string n9 = "", const AttributeValue &v9 = EmptyAttributeValue ());
+ std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
+ std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
+ std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
+ std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
+ std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
+ std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
+ std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue (),
+ std::string n8 = "", const AttributeValue &v8 = EmptyAttributeValue (),
+ std::string n9 = "", const AttributeValue &v9 = EmptyAttributeValue ());
/**
* \param reference item to push.
--- a/src/helper/node-container.cc Fri Oct 24 12:29:39 2008 +0200
+++ b/src/helper/node-container.cc Fri Oct 24 12:31:57 2008 +0200
@@ -35,14 +35,14 @@
Add (b);
}
NodeContainer::NodeContainer (const NodeContainer &a, const NodeContainer &b,
- const NodeContainer &c)
+ const NodeContainer &c)
{
Add (a);
Add (b);
Add (c);
}
NodeContainer::NodeContainer (const NodeContainer &a, const NodeContainer &b,
- const NodeContainer &c, const NodeContainer &d)
+ const NodeContainer &c, const NodeContainer &d)
{
Add (a);
Add (b);
--- a/src/helper/ns2-mobility-helper.cc Fri Oct 24 12:29:39 2008 +0200
+++ b/src/helper/ns2-mobility-helper.cc Fri Oct 24 12:31:57 2008 +0200
@@ -75,65 +75,65 @@
if (file.is_open())
{
while (!file.eof() )
- {
- std::string line;
- getline (file, line);
- std::string::size_type startNodeId = line.find_first_of ("(");
- std::string::size_type endNodeId = line.find_first_of (")");
- if (startNodeId == std::string::npos ||
- endNodeId == std::string::npos)
- {
- continue;
- }
- Ptr<StaticSpeedMobilityModel> model = GetMobilityModel (line.substr (startNodeId + 1,
- endNodeId - startNodeId),
- store);
- if (model == 0)
- {
- continue;
- }
- if (startNodeId == 6)
- {
- double value = ReadDouble (line.substr (endNodeId + 9, std::string::npos));
- std::string coordinate = line.substr (endNodeId + 6, 1);
+ {
+ std::string line;
+ getline (file, line);
+ std::string::size_type startNodeId = line.find_first_of ("(");
+ std::string::size_type endNodeId = line.find_first_of (")");
+ if (startNodeId == std::string::npos ||
+ endNodeId == std::string::npos)
+ {
+ continue;
+ }
+ Ptr<StaticSpeedMobilityModel> model = GetMobilityModel (line.substr (startNodeId + 1,
+ endNodeId - startNodeId),
+ store);
+ if (model == 0)
+ {
+ continue;
+ }
+ if (startNodeId == 6)
+ {
+ double value = ReadDouble (line.substr (endNodeId + 9, std::string::npos));
+ std::string coordinate = line.substr (endNodeId + 6, 1);
Vector position = model->GetPosition ();
- if (coordinate == "X")
- {
+ if (coordinate == "X")
+ {
position.x = value;
- NS_LOG_DEBUG ("X=" << value);
- }
- else if (coordinate == "Y")
- {
+ NS_LOG_DEBUG ("X=" << value);
+ }
+ else if (coordinate == "Y")
+ {
position.y = value;
- NS_LOG_DEBUG ("Y=" << value);
- }
- else if (coordinate == "Z")
- {
+ NS_LOG_DEBUG ("Y=" << value);
+ }
+ else if (coordinate == "Z")
+ {
position.z = value;
- NS_LOG_DEBUG ("Z=" << value);
- }
+ NS_LOG_DEBUG ("Z=" << value);
+ }
else
{
continue;
}
model->SetPosition (position);
- }
- else
- {
+ }
+ else
+ {
std::string::size_type atEnd = line.find_first_of (" ", 8);
std::string atStr = line.substr (8, atEnd-8);
NS_LOG_DEBUG (atStr);
- double at = ReadDouble (atStr);
- std::string::size_type xSpeedEnd = line.find_first_of (" ", endNodeId + 10);
- std::string::size_type ySpeedEnd = line.find_first_of (" ", xSpeedEnd + 1);
- double xSpeed = ReadDouble (line.substr (endNodeId + 10, xSpeedEnd - endNodeId - 10));
- double ySpeed = ReadDouble (line.substr (xSpeedEnd + 1, ySpeedEnd - xSpeedEnd - 1));
- double zSpeed = ReadDouble (line.substr (ySpeedEnd + 1, std::string::npos));
- NS_LOG_DEBUG ("at=" << at << "xSpeed=" << xSpeed << ", ySpeed=" << ySpeed << ", zSpeed=" << zSpeed);
- Simulator::Schedule (Seconds (at), &StaticSpeedMobilityModel::SetVelocity, model,
- Vector (xSpeed, ySpeed, zSpeed));
- }
- }
+ double at = ReadDouble (atStr);
+ std::string::size_type xSpeedEnd = line.find_first_of (" ", endNodeId + 10);
+ std::string::size_type ySpeedEnd = line.find_first_of (" ", xSpeedEnd + 1);
+ double xSpeed = ReadDouble (line.substr (endNodeId + 10, xSpeedEnd - endNodeId - 10));
+ double ySpeed = ReadDouble (line.substr (xSpeedEnd + 1, ySpeedEnd - xSpeedEnd - 1));
+ double zSpeed = ReadDouble (line.substr (ySpeedEnd + 1, std::string::npos));
+ NS_LOG_DEBUG ("at=" << at << "xSpeed=" << xSpeed << ", ySpeed=" << ySpeed << ", zSpeed=" << zSpeed);
+ Simulator::Schedule (Seconds (at), &StaticSpeedMobilityModel::SetVelocity, model,
+ Vector (xSpeed, ySpeed, zSpeed));
+ }
+ }
file.close();
}
}
--- a/src/helper/ns2-mobility-helper.h Fri Oct 24 12:29:39 2008 +0200
+++ b/src/helper/ns2-mobility-helper.h Fri Oct 24 12:31:57 2008 +0200
@@ -90,14 +90,14 @@
MyObjectStore (T begin, T end)
: m_begin (begin),
m_end (end)
- {}
+ {}
virtual Ptr<Object> Get (uint32_t i) const {
T iterator = m_begin;
iterator += i;
if (iterator >= m_end)
- {
- return 0;
- }
+ {
+ return 0;
+ }
return *iterator;
}
private:
--- a/src/helper/olsr-helper.cc Fri Oct 24 12:29:39 2008 +0200
+++ b/src/helper/olsr-helper.cc Fri Oct 24 12:31:57 2008 +0200
@@ -30,14 +30,14 @@
void
OlsrHelper::SetAgent (std::string tid,
- std::string n0, const AttributeValue &v0,
- std::string n1, const AttributeValue &v1,
- std::string n2, const AttributeValue &v2,
- std::string n3, const AttributeValue &v3,
- std::string n4, const AttributeValue &v4,
- std::string n5, const AttributeValue &v5,
- std::string n6, const AttributeValue &v6,
- std::string n7, const AttributeValue &v7)
+ std::string n0, const AttributeValue &v0,
+ std::string n1, const AttributeValue &v1,
+ std::string n2, const AttributeValue &v2,
+ std::string n3, const AttributeValue &v3,
+ std::string n4, const AttributeValue &v4,
+ std::string n5, const AttributeValue &v5,
+ std::string n6, const AttributeValue &v6,
+ std::string n7, const AttributeValue &v7)
{
m_agentFactory.SetTypeId (tid);
m_agentFactory.Set (n0, v0);
--- a/src/helper/olsr-helper.h Fri Oct 24 12:29:39 2008 +0200
+++ b/src/helper/olsr-helper.h Fri Oct 24 12:31:57 2008 +0200
@@ -38,14 +38,14 @@
* \brief Set default OLSR routing agent attributes
*/
void SetAgent (std::string tid,
- std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
- std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
- std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
- std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
- std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
- std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
- std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
- std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ());
+ std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
+ std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
+ std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
+ std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
+ std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
+ std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
+ std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
+ std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ());
/**
* \brief Enable OLSR routing for a set of nodes
--- a/src/helper/point-to-point-helper.cc Fri Oct 24 12:29:39 2008 +0200
+++ b/src/helper/point-to-point-helper.cc Fri Oct 24 12:31:57 2008 +0200
@@ -39,10 +39,10 @@
void
PointToPointHelper::SetQueue (std::string type,
- std::string n1, const AttributeValue &v1,
- std::string n2, const AttributeValue &v2,
- std::string n3, const AttributeValue &v3,
- std::string n4, const AttributeValue &v4)
+ std::string n1, const AttributeValue &v1,
+ std::string n2, const AttributeValue &v2,
+ std::string n3, const AttributeValue &v3,
+ std::string n4, const AttributeValue &v4)
{
m_queueFactory.SetTypeId (type);
m_queueFactory.Set (n1, v1);
@@ -106,9 +106,9 @@
{
Ptr<Node> node = *i;
for (uint32_t j = 0; j < node->GetNDevices (); ++j)
- {
- devs.Add (node->GetDevice (j));
- }
+ {
+ devs.Add (node->GetDevice (j));
+ }
}
EnablePcap (filename, devs);
}
@@ -153,9 +153,9 @@
{
Ptr<Node> node = *i;
for (uint32_t j = 0; j < node->GetNDevices (); ++j)
- {
- devs.Add (node->GetDevice (j));
- }
+ {
+ devs.Add (node->GetDevice (j));
+ }
}
EnableAscii (os, devs);
}
--- a/src/helper/point-to-point-helper.h Fri Oct 24 12:29:39 2008 +0200
+++ b/src/helper/point-to-point-helper.h Fri Oct 24 12:31:57 2008 +0200
@@ -57,10 +57,10 @@
* PointToPointNetDevice created through PointToPointHelper::Install.
*/
void SetQueue (std::string type,
- std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
- std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
- std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
- std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue ());
+ std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
+ std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
+ std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
+ std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue ());
/**
* \param name the name of the attribute to set
--- a/src/helper/wifi-helper.cc Fri Oct 24 12:29:39 2008 +0200
+++ b/src/helper/wifi-helper.cc Fri Oct 24 12:31:57 2008 +0200
@@ -40,30 +40,30 @@
namespace ns3 {
static void PcapPhyTxEvent (Ptr<PcapWriter> writer, Ptr<const Packet> packet,
- WifiMode mode, WifiPreamble preamble,
- uint8_t txLevel)
+ WifiMode mode, WifiPreamble preamble,
+ uint8_t txLevel)
{
writer->WritePacket (packet);
}
static void PcapPhyRxEvent (Ptr<PcapWriter> writer,
- Ptr<const Packet> packet, double snr, WifiMode mode,
- enum WifiPreamble preamble)
+ Ptr<const Packet> packet, double snr, WifiMode mode,
+ enum WifiPreamble preamble)
{
writer->WritePacket (packet);
}
static void AsciiPhyTxEvent (std::ostream *os, std::string context,
- Ptr<const Packet> packet,
- WifiMode mode, WifiPreamble preamble,
- uint8_t txLevel)
+ Ptr<const Packet> packet,
+ WifiMode mode, WifiPreamble preamble,
+ uint8_t txLevel)
{
*os << "+ " << Simulator::Now () << " " << context << " " << *packet << std::endl;
}
static void AsciiPhyRxOkEvent (std::ostream *os, std::string context,
- Ptr<const Packet> packet, double snr, WifiMode mode,
- enum WifiPreamble preamble)
+ Ptr<const Packet> packet, double snr, WifiMode mode,
+ enum WifiPreamble preamble)
{
*os << "r " << Simulator::Now () << " " << context << " " << *packet << std::endl;
}
@@ -78,14 +78,14 @@
void
WifiHelper::SetRemoteStationManager (std::string type,
- std::string n0, const AttributeValue &v0,
- std::string n1, const AttributeValue &v1,
- std::string n2, const AttributeValue &v2,
- std::string n3, const AttributeValue &v3,
- std::string n4, const AttributeValue &v4,
- std::string n5, const AttributeValue &v5,
- std::string n6, const AttributeValue &v6,
- std::string n7, const AttributeValue &v7)
+ std::string n0, const AttributeValue &v0,
+ std::string n1, const AttributeValue &v1,
+ std::string n2, const AttributeValue &v2,
+ std::string n3, const AttributeValue &v3,
+ std::string n4, const AttributeValue &v4,
+ std::string n5, const AttributeValue &v5,
+ std::string n6, const AttributeValue &v6,
+ std::string n7, const AttributeValue &v7)
{
m_stationManager = ObjectFactory ();
m_stationManager.SetTypeId (type);
@@ -101,14 +101,14 @@
void
WifiHelper::SetMac (std::string type,
- std::string n0, const AttributeValue &v0,
- std::string n1, const AttributeValue &v1,
- std::string n2, const AttributeValue &v2,
- std::string n3, const AttributeValue &v3,
- std::string n4, const AttributeValue &v4,
- std::string n5, const AttributeValue &v5,
- std::string n6, const AttributeValue &v6,
- std::string n7, const AttributeValue &v7)
+ std::string n0, const AttributeValue &v0,
+ std::string n1, const AttributeValue &v1,
+ std::string n2, const AttributeValue &v2,
+ std::string n3, const AttributeValue &v3,
+ std::string n4, const AttributeValue &v4,
+ std::string n5, const AttributeValue &v5,
+ std::string n6, const AttributeValue &v6,
+ std::string n7, const AttributeValue &v7)
{
m_mac = ObjectFactory ();
m_mac.SetTypeId (type);
@@ -124,14 +124,14 @@
void
WifiHelper::SetPhy (std::string type,
- std::string n0, const AttributeValue &v0,
- std::string n1, const AttributeValue &v1,
- std::string n2, const AttributeValue &v2,
- std::string n3, const AttributeValue &v3,
- std::string n4, const AttributeValue &v4,
- std::string n5, const AttributeValue &v5,
- std::string n6, const AttributeValue &v6,
- std::string n7, const AttributeValue &v7)
+ std::string n0, const AttributeValue &v0,
+ std::string n1, const AttributeValue &v1,
+ std::string n2, const AttributeValue &v2,
+ std::string n3, const AttributeValue &v3,
+ std::string n4, const AttributeValue &v4,
+ std::string n5, const AttributeValue &v5,
+ std::string n6, const AttributeValue &v6,
+ std::string n7, const AttributeValue &v7)
{
m_phy = ObjectFactory ();
m_phy.SetTypeId (type);
@@ -177,9 +177,9 @@
{
Ptr<Node> node = *i;
for (uint32_t j = 0; j < node->GetNDevices (); ++j)
- {
- devs.Add (node->GetDevice (j));
- }
+ {
+ devs.Add (node->GetDevice (j));
+ }
}
EnablePcap (filename, devs);
}
@@ -218,9 +218,9 @@
{
Ptr<Node> node = *i;
for (uint32_t j = 0; j < node->GetNDevices (); ++j)
- {
- devs.Add (node->GetDevice (j));
- }
+ {
+ devs.Add (node->GetDevice (j));
+ }
}
EnableAscii (os, devs);
}
--- a/src/helper/wifi-helper.h Fri Oct 24 12:29:39 2008 +0200
+++ b/src/helper/wifi-helper.h Fri Oct 24 12:31:57 2008 +0200
@@ -65,14 +65,14 @@
* in the requested station manager.
*/
void SetRemoteStationManager (std::string type,
- std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
- std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
- std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
- std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
- std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
- std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
- std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
- std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ());
+ std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
+ std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
+ std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
+ std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
+ std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
+ std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
+ std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
+ std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ());
/**
* \param type the type of ns3::WifiMac to create.
@@ -97,14 +97,14 @@
* in the requested mac.
*/
void SetMac (std::string type,
- std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
- std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
- std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
- std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
- std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
- std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
- std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
- std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ());
+ std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
+ std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
+ std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
+ std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
+ std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
+ std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
+ std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
+ std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ());
/**
* \param phyType the type of ns3::WifiPhy to create.
@@ -129,14 +129,14 @@
* in the requested phy.
*/
void SetPhy (std::string phyType,
- std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
- std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
- std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
- std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
- std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
- std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
- std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
- std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ());
+ std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
+ std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
+ std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
+ std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
+ std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
+ std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
+ std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
+ std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ());