doc: Use the new COMMANDLINE macro in every example

examples/energy/energy-model-example.cc

@@ -132,7 +132,7 @@ main (int argc, char *argv[])
   double startTime = 0.0;       // seconds
   double distanceToRx = 100.0;  // meters
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
   cmd.AddValue ("Prss", "Intended primary RSS (dBm)", Prss);
   cmd.AddValue ("PpacketSize", "size of application packet sent", PpacketSize);

examples/energy/energy-model-with-harvesting-example.cc

@@ -173,7 +173,7 @@ main (int argc, char *argv[])
   // Energy Harvester variables
   double harvestingUpdateInterval = 1;  // seconds
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
   cmd.AddValue ("Prss", "Intended primary RSS (dBm)", Prss);
   cmd.AddValue ("PacketSize", "size of application packet sent", PacketSize);

examples/error-model/simple-error-model.cc

@@ -70,7 +70,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // Bind()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue("errorModelType", "TypeId of the error model to use", errorModelType);
   cmd.Parse (argc, argv);
 

examples/ipv6/fragmentation-ipv6-two-MTU.cc

@@ -47,7 +47,7 @@ int main (int argc, char** argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 

examples/ipv6/fragmentation-ipv6.cc

@@ -45,7 +45,7 @@ int main (int argc, char** argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 

examples/ipv6/icmpv6-redirect.cc

@@ -57,7 +57,7 @@ int main (int argc, char **argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 

examples/ipv6/loose-routing-ipv6.cc

@@ -53,7 +53,7 @@ int main (int argc, char **argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 

examples/ipv6/ping6.cc

@@ -43,7 +43,7 @@ int main (int argc, char **argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 

examples/ipv6/radvd-two-prefix.cc

@@ -84,7 +84,7 @@ int main (int argc, char** argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 

examples/ipv6/radvd.cc

@@ -49,7 +49,7 @@ int main (int argc, char** argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 

examples/ipv6/wsn-ping6.cc

@@ -47,7 +47,7 @@ int main (int argc, char **argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 

examples/matrix-topology/matrix-topology.cc

@@ -99,7 +99,7 @@ int main (int argc, char *argv[])
   std::string adj_mat_file_name ("examples/matrix-topology/adjacency_matrix.txt");
   std::string node_coordinates_file_name ("examples/matrix-topology/node_coordinates.txt");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   // ---------- End of Simulation Variables ----------------------------------

examples/naming/object-names.cc

@@ -44,7 +44,7 @@ main (int argc, char *argv[])
   LogComponentEnable ("ObjectNamesExample", LOG_LEVEL_INFO);
 #endif
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   NodeContainer n;

examples/realtime/realtime-udp-echo.cc

@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   // Allow the user to override any of the defaults and the above Bind() at
   // run-time, via command-line arguments
   //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   //

examples/routing/dynamic-global-routing.cc

@@ -88,7 +88,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   NS_LOG_INFO ("Create nodes.");

examples/routing/global-injection-slash32.cc

@@ -50,7 +50,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // DefaultValue::Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Ptr<Node> nA = CreateObject<Node> ();

examples/routing/global-routing-multi-switch-plus-router.cc

@@ -282,7 +282,7 @@ main (int argc, char *argv[])
   // ----------------------------------------------------------------------
   // Create command line options and get them
   // ----------------------------------------------------------------------
-  CommandLine cmd;
+  COMMANDLINE (cmd);
 
   cmd.Usage    ("NOTE: valid --pcap arguments are: 't2,t3,b2,b3,trlan,trwan,brlan,brwan'");
 

examples/routing/global-routing-slash32.cc

@@ -42,7 +42,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // DefaultValue::Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Ptr<Node> nA = CreateObject<Node> ();

examples/routing/manet-routing-compare.cc

@@ -187,7 +187,7 @@ RoutingExperiment::SetupPacketReceive (Ipv4Address addr, Ptr<Node> node)
 std::string
 RoutingExperiment::CommandSetup (int argc, char **argv)
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("CSVfileName", "The name of the CSV output file name", m_CSVfileName);
   cmd.AddValue ("traceMobility", "Enable mobility tracing", m_traceMobility);
   cmd.AddValue ("protocol", "1=OLSR;2=AODV;3=DSDV;4=DSR", m_protocol);

examples/routing/mixed-global-routing.cc

@@ -55,7 +55,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   NS_LOG_INFO ("Create nodes.");

examples/routing/rip-simple-network.cc

@@ -76,7 +76,7 @@ int main (int argc, char **argv)
   bool showPings = false;
   std::string SplitHorizon ("PoisonReverse");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.AddValue ("printRoutingTables", "Print routing tables at 30, 60 and 90 seconds", printRoutingTables);
   cmd.AddValue ("showPings", "Show Ping6 reception", showPings);

examples/routing/ripng-simple-network.cc

@@ -76,7 +76,7 @@ int main (int argc, char **argv)
   bool showPings = false;
   std::string SplitHorizon ("PoisonReverse");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.AddValue ("printRoutingTables", "Print routing tables at 30, 60 and 90 seconds", printRoutingTables);
   cmd.AddValue ("showPings", "Show Ping6 reception", showPings);

examples/routing/simple-alternate-routing.cc

@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   // The below metric, if set to 3 or higher, will cause packets between
   // n1 and n3 to take the 2-hop route through n2
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   // 
   // Additionally, we plumb this metric into the default value / command 
   // line argument system as well, for exemplary purposes.  This means 

examples/routing/simple-global-routing.cc

@@ -68,7 +68,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // DefaultValue::Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   bool enableFlowMonitor = false;
   cmd.AddValue ("EnableMonitor", "Enable Flow Monitor", enableFlowMonitor);
   cmd.Parse (argc, argv);

examples/routing/simple-routing-ping6.cc

@@ -101,7 +101,7 @@ int main (int argc, char** argv)
   LogComponentEnable ("Ping6Application", LOG_LEVEL_ALL);
 #endif
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   StackHelper stackHelper;

examples/routing/static-routing-slash32.cc

@@ -42,7 +42,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // DefaultValue::Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Ptr<Node> nA = CreateObject<Node> ();

examples/socket/socket-bound-static-routing.cc

@@ -57,7 +57,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // DefaultValue::Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Ptr<Node> nSrc = CreateObject<Node> ();

examples/socket/socket-bound-tcp-static-routing.cc

@@ -67,7 +67,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // DefaultValue::Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Ptr<Node> nSrc = CreateObject<Node> ();

examples/socket/socket-options-ipv4.cc

@@ -82,7 +82,7 @@ main (int argc, char *argv[])
   uint32_t ipTtl = 0;
   bool ipRecvTtl = true;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("PacketSize", "Packet size in bytes", packetSize);
   cmd.AddValue ("PacketCount", "Number of packets to send", packetCount);
   cmd.AddValue ("Interval", "Interval between packets", packetInterval);

examples/socket/socket-options-ipv6.cc

@@ -82,7 +82,7 @@ main (int argc, char *argv[])
   uint32_t ipv6Hoplimit = 0;
   bool ipv6RecvHoplimit = true;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("PacketSize", "Packet size in bytes", packetSize);
   cmd.AddValue ("PacketCount", "Number of packets to send", packetCount);
   cmd.AddValue ("Interval", "Interval between packets", packetInterval);

examples/stats/wifi-example-sim.cc

@@ -76,7 +76,7 @@ int main (int argc, char *argv[]) {
   }
 
   // Set up command line parameters used to control the experiment.
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("distance", "Distance apart to place nodes (in meters).",
                 distance);
   cmd.AddValue ("format", "Format to use for data output.",

examples/tcp/dctcp-example.cc

@@ -275,7 +275,7 @@ int main (int argc, char *argv[])
   bool enableSwitchEcn = true;
   Time progressInterval = MilliSeconds (100);
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("tcpTypeId", "ns-3 TCP TypeId", tcpTypeId);
   cmd.AddValue ("flowStartupWindow", "startup time window (TCP staggered starts)", flowStartupWindow);
   cmd.AddValue ("convergenceTime", "convergence time", convergenceTime);

examples/tcp/star.cc

@@ -56,7 +56,7 @@ main (int argc, char *argv[])
   //
   uint32_t nSpokes = 8;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nSpokes", "Number of nodes to place in the star", nSpokes);
   cmd.Parse (argc, argv);
 

examples/tcp/tcp-bulk-send.cc

@@ -48,7 +48,7 @@ main (int argc, char *argv[])
 // Allow the user to override any of the defaults at
 // run-time, via command-line arguments
 //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("tracing", "Flag to enable/disable tracing", tracing);
   cmd.AddValue ("maxBytes",
                 "Total number of bytes for application to send", maxBytes);

examples/tcp/tcp-large-transfer.cc

@@ -75,7 +75,7 @@ int main (int argc, char *argv[])
   //  LogComponentEnable("PacketSink", LOG_LEVEL_ALL);
   //  LogComponentEnable("TcpLargeTransfer", LOG_LEVEL_ALL);
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   // initialize the tx buffer.

examples/tcp/tcp-nsc-comparison.cc

@@ -57,7 +57,7 @@ main (int argc, char *argv[])
   Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1448));
   Config::SetDefault ("ns3::TcpSocket::DelAckCount", UintegerValue (1));
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("stack", "choose network stack", m_stack);
   cmd.AddValue ("seed", "randomize seed", m_seed);
   cmd.AddValue ("nNodes", "the number of source and sink nodes", m_nNodes);

examples/tcp/tcp-nsc-lfn.cc

@@ -57,7 +57,7 @@ int main (int argc, char *argv[])
   // the name of the NSC stack library that should be used
   std::string nscStack = "liblinux2.6.26.so";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   // Here, we define additional command line options.
   // This allows a user to override the defaults set above from the command line.
   cmd.AddValue ("TCP_CONGESTION", "Linux 2.6.26 Tcp Congestion control algorithm to use", tcpCong);

examples/tcp/tcp-nsc-zoo.cc

@@ -49,7 +49,7 @@ int main (int argc, char *argv[])
 
   Config::SetDefault ("ns3::OnOffApplication::PacketSize", UintegerValue (2048));
   Config::SetDefault ("ns3::OnOffApplication::DataRate", StringValue ("8kbps"));
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   // this allows the user to raise the number of nodes using --nodes=X command-line argument.
   cmd.AddValue ("nodes", "Number of nodes in the network (must be > 1)", MaxNodes);
   cmd.AddValue ("runtime", "How long the applications should send data (default 3 seconds)", runtime);

examples/tcp/tcp-pacing.cc

@@ -52,7 +52,7 @@ main (int argc, char *argv[])
   bool isSack = false;
   uint32_t maxPackets = 0;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("tracing", "Flag to enable/disable tracing", tracing);
   cmd.AddValue ("maxBytes",
                 "Total number of bytes for application to send", maxBytes);

examples/tcp/tcp-pcap-nanosec-example.cc

@@ -63,7 +63,7 @@ main (int argc, char *argv[])
 // Allow the user to override any of the defaults at
 // run-time, via command-line arguments
 //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("tracing", "Flag to enable tracing", tracing);
   cmd.AddValue ("nanosec",  "Flag to use nanosecond timestamps for pcap as default", nanosec);
   cmd.AddValue ("maxBytes",

examples/tcp/tcp-star-server.cc

@@ -77,7 +77,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // Config::SetDefault()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nNodes", "Number of nodes to place in the star", N);
   cmd.Parse (argc, argv);
 

examples/tcp/tcp-variants-comparison.cc

@@ -226,7 +226,7 @@ int main (int argc, char *argv[])
   std::string recovery = "ns3::TcpClassicRecovery";
 
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("transport_prot", "Transport protocol to use: TcpNewReno, "
                 "TcpHybla, TcpHighSpeed, TcpHtcp, TcpVegas, TcpScalable, TcpVeno, "
                 "TcpBic, TcpYeah, TcpIllinois, TcpWestwood, TcpWestwoodPlus, TcpLedbat, "

examples/traffic-control/queue-discs-benchmark.cc

@@ -109,7 +109,7 @@ int main (int argc, char *argv[])
   float simDuration = 60;
   float samplingPeriod = 1;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("bandwidth", "Bottleneck bandwidth", bandwidth);
   cmd.AddValue ("delay", "Bottleneck delay", delay);
   cmd.AddValue ("queueDiscType", "Bottleneck queue disc type in {PfifoFast, ARED, CoDel, FqCoDel, PIE, prio}", queueDiscType);

examples/traffic-control/red-vs-fengadaptive.cc

@@ -48,7 +48,7 @@ int main (int argc, char *argv[])
   std::string bottleNeckLinkBw = "1Mbps";
   std::string bottleNeckLinkDelay = "50ms";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nLeaf", "Number of left and right side leaf nodes", nLeaf);
   cmd.AddValue ("maxPackets","Max Packets allowed in the device queue", maxPackets);
   cmd.AddValue ("queueDiscLimitPackets","Max Packets allowed in the queue disc", queueDiscLimitPackets);

examples/traffic-control/red-vs-nlred.cc

@@ -50,7 +50,7 @@ int main (int argc, char *argv[])
   std::string bottleNeckLinkBw = "1Mbps";
   std::string bottleNeckLinkDelay = "50ms";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nLeaf",     "Number of left and right side leaf nodes", nLeaf);
   cmd.AddValue ("maxPackets","Max Packets allowed in the device queue", maxPackets);
   cmd.AddValue ("queueDiscLimitPackets","Max Packets allowed in the queue disc", queueDiscLimitPackets);

examples/traffic-control/tbf-example.cc

@@ -73,7 +73,7 @@ main (int argc, char *argv[])
   DataRate rate = DataRate ("1Mbps");
   DataRate peakRate = DataRate ("0bps");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("burst", "Size of first bucket in bytes", burst);
   cmd.AddValue ("mtu", "Size of second bucket in bytes", mtu);
   cmd.AddValue ("rate", "Rate of tokens arriving in first bucket", rate);

examples/traffic-control/traffic-control.cc

@@ -91,7 +91,7 @@ main (int argc, char *argv[])
   std::string transportProt = "Tcp";
   std::string socketType;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("transportProt", "Transport protocol to use: Tcp, Udp", transportProt);
   cmd.Parse (argc, argv);
 

examples/tutorial/fifth.cc

@@ -175,7 +175,7 @@ RxDrop (Ptr<const Packet> p)
 int 
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   NodeContainer nodes;

examples/tutorial/first.cc

@@ -34,7 +34,7 @@ NS_LOG_COMPONENT_DEFINE ("FirstScriptExample");
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   Time::SetResolution (Time::NS);

examples/tutorial/second.cc

@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   bool verbose = true;
   uint32_t nCsma = 3;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nCsma", "Number of \"extra\" CSMA nodes/devices", nCsma);
   cmd.AddValue ("verbose", "Tell echo applications to log if true", verbose);
 

examples/tutorial/seventh.cc

@@ -202,7 +202,7 @@ main (int argc, char *argv[])
 {
   bool useV6 = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("useIpv6", "Use Ipv6", useV6);
   cmd.Parse (argc, argv);
 

examples/tutorial/sixth.cc

@@ -192,7 +192,7 @@ RxDrop (Ptr<PcapFileWrapper> file, Ptr<const Packet> p)
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   NodeContainer nodes;

examples/tutorial/third.cc

@@ -47,7 +47,7 @@ main (int argc, char *argv[])
   uint32_t nWifi = 3;
   bool tracing = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nCsma", "Number of \"extra\" CSMA nodes/devices", nCsma);
   cmd.AddValue ("nWifi", "Number of wifi STA devices", nWifi);
   cmd.AddValue ("verbose", "Tell echo applications to log if true", verbose);

examples/udp-client-server/udp-client-server.cc

@@ -45,7 +45,7 @@ main (int argc, char *argv[])
   bool useV6 = false;
   Address serverAddress;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("useIpv6", "Use Ipv6", useV6);
   cmd.Parse (argc, argv);
 

examples/udp-client-server/udp-trace-client-server.cc

@@ -45,7 +45,7 @@ main (int argc, char *argv[])
   bool useV6 = false;
   Address serverAddress;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("useIpv6", "Use Ipv6", useV6);
   cmd.Parse (argc, argv);
 

examples/udp/udp-echo.cc

@@ -54,7 +54,7 @@ main (int argc, char *argv[])
   bool useV6 = false;
   Address serverAddress;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("useIpv6", "Use Ipv6", useV6);
   cmd.Parse (argc, argv);
 //

examples/wireless/mixed-wired-wireless.cc

@@ -116,7 +116,7 @@ main (int argc, char *argv[])
   // system so that they can be overridden with flags such as
   // "--backboneNodes=20"
   //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("backboneNodes", "number of backbone nodes", backboneNodes);
   cmd.AddValue ("infraNodes", "number of leaf nodes", infraNodes);
   cmd.AddValue ("lanNodes", "number of LAN nodes", lanNodes);

examples/wireless/wifi-80211e-txop.cc

@@ -91,7 +91,7 @@ int main (int argc, char *argv[])
   bool enablePcap = 0;
   bool verifyResults = 0; //used for regression
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
   cmd.AddValue ("distance", "Distance in meters between the station and the access point", distance);

examples/wireless/wifi-80211n-mimo.cc

@@ -97,7 +97,7 @@ int main (int argc, char *argv[])
   bool shortGuardInterval = false;
   bool channelBonding = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("step", "Granularity of the results to be plotted in meters", step);
   cmd.AddValue ("simulationTime", "Simulation time per step (in seconds)", simulationTime);
   cmd.AddValue ("channelBonding", "Enable/disable channel bonding (channel width = 20 MHz if false, channel width = 40 MHz if true)", channelBonding);

examples/wireless/wifi-adhoc.cc

@@ -167,7 +167,7 @@ Experiment::Run (const WifiHelper &wifi, const YansWifiPhyHelper &wifiPhy,
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Gnuplot gnuplot = Gnuplot ("reference-rates.png");

examples/wireless/wifi-aggregation.cc

@@ -81,7 +81,7 @@ int main (int argc, char *argv[])
   bool enablePcap = 0;
   bool verifyResults = 0; //used for regression
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
   cmd.AddValue ("enableRts", "Enable or disable RTS/CTS", enableRts);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);

examples/wireless/wifi-ap.cc

@@ -115,7 +115,7 @@ AdvancePosition (Ptr<Node> node)
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "Print trace information if true", g_verbose);
   cmd.Parse (argc, argv);
 

examples/wireless/wifi-backward-compatibility.cc

@@ -104,7 +104,7 @@ int main (int argc, char *argv[])
   bool apHasTraffic = false;
   bool staHasTraffic = true;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
   cmd.AddValue ("apVersion", "The standard version used by the AP: 80211a, 80211b, 80211g, 80211_10MHZ, 80211_5MHZ, holland, 80211n_2_4GHZ, 80211n_5GHZ or 80211ac", apVersion);
   cmd.AddValue ("staVersion", "The standard version used by the station: 80211a, 80211b, 80211g, 80211_10MHZ, 80211_5MHZ, holland, 80211n_2_4GHZ, 80211n_5GHZ or 80211ac", staVersion);

examples/wireless/wifi-blockack.cc

@@ -63,7 +63,7 @@ NS_LOG_COMPONENT_DEFINE ("Test-block-ack");
 
 int main (int argc, char * argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   LogComponentEnable ("QosTxop", LOG_LEVEL_DEBUG);

examples/wireless/wifi-clear-channel-cmu.cc

@@ -175,7 +175,7 @@ int main (int argc, char *argv[])
   modes.push_back ("DsssRate5_5Mbps");
   modes.push_back ("DsssRate11Mbps");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Gnuplot gnuplot = Gnuplot ("clear-channel.eps");

examples/wireless/wifi-dsss-validation.cc

@@ -42,7 +42,7 @@ int main (int argc, char *argv[])
   modes.push_back ("DsssRate5_5Mbps");
   modes.push_back ("DsssRate11Mbps");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("FrameSize", "The frame size in bytes", FrameSize);
   cmd.Parse (argc, argv);
 

examples/wireless/wifi-he-network.cc

@@ -69,7 +69,7 @@ int main (int argc, char *argv[])
   double minExpectedThroughput = 0;
   double maxExpectedThroughput = 0;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("frequency", "Whether working in the 2.4 or 5.0 GHz band (other values gets rejected)", frequency);
   cmd.AddValue ("distance", "Distance in meters between the station and the access point", distance);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);

examples/wireless/wifi-hidden-terminal.cc

@@ -180,7 +180,7 @@ void experiment (bool enableCtsRts, std::string wifiManager)
 int main (int argc, char **argv)
 {
   std::string wifiManager ("Arf");
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("wifiManager", "Set wifi rate manager (Aarf, Aarfcd, Amrr, Arf, Cara, Ideal, Minstrel, Onoe, Rraa)", wifiManager);
   cmd.Parse (argc, argv);
 

examples/wireless/wifi-ht-network.cc

@@ -69,7 +69,7 @@ int main (int argc, char *argv[])
   double minExpectedThroughput = 0;
   double maxExpectedThroughput = 0;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("frequency", "Whether working in the 2.4 or 5.0 GHz band (other values gets rejected)", frequency);
   cmd.AddValue ("distance", "Distance in meters between the station and the access point", distance);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);

examples/wireless/wifi-mixed-network.cc

@@ -418,7 +418,7 @@ int main (int argc, char *argv[])
 
   bool verifyResults = 0; //used for regression
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("payloadSize", "Payload size in bytes", params.payloadSize);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", params.simulationTime);
   cmd.AddValue ("isUdp", "UDP if set to 1, TCP otherwise", params.isUdp);

examples/wireless/wifi-multi-tos.cc

@@ -55,7 +55,7 @@ int main (int argc, char *argv[])
   bool useShortGuardInterval = false;
   bool useRts = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nWifi", "Number of stations", nWifi);
   cmd.AddValue ("distance", "Distance in meters between the stations and the access point", distance);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);

examples/wireless/wifi-multirate.cc

@@ -554,7 +554,7 @@ bool
 Experiment::CommandSetup (int argc, char **argv)
 {
   // for commandline input
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("packetSize", "packet size", packetSize);
   cmd.AddValue ("totalTime", "simulation time", totalTime);
   // according to totalTime, select an appropriate samplingPeriod automatically.

examples/wireless/wifi-ofdm-he-validation.cc

@@ -51,7 +51,7 @@ int main (int argc, char *argv[])
   modes.push_back ("HeMcs10");
   modes.push_back ("HeMcs11");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("FrameSize", "The frame size", FrameSize);
   cmd.Parse (argc, argv);
 

examples/wireless/wifi-ofdm-ht-validation.cc

@@ -48,7 +48,7 @@ int main (int argc, char *argv[])
   modes.push_back ("HtMcs7");
 
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("FrameSize", "The frame size in bytes", FrameSize);
   cmd.Parse (argc, argv);
 

examples/wireless/wifi-ofdm-validation.cc

@@ -49,7 +49,7 @@ int main (int argc, char *argv[])
   modes.push_back ("OfdmRate48Mbps");
   modes.push_back ("OfdmRate54Mbps");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("FrameSize", "The frame size in bytes", FrameSize);
   cmd.Parse (argc, argv);
 

examples/wireless/wifi-ofdm-vht-validation.cc

@@ -49,7 +49,7 @@ int main (int argc, char *argv[])
   modes.push_back ("VhtMcs7");
   modes.push_back ("VhtMcs8");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("FrameSize", "The frame size in bytes", FrameSize);
   cmd.Parse (argc, argv);
 

examples/wireless/wifi-pcf.cc

@@ -133,7 +133,7 @@ int main (int argc, char *argv[])
   uint64_t cfpMaxDurationUs = 65536; //microseconds
   double simulationTime = 10; //seconds
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nWifi", "Number of wifi STA devices", nWifi);
   cmd.AddValue ("enablePcf", "Enable/disable PCF mode", enablePcf);
   cmd.AddValue ("withData", "Enable/disable UDP data packets generation", withData);

examples/wireless/wifi-power-adaptation-distance.cc

@@ -304,7 +304,7 @@ int main (int argc, char *argv[])
   uint32_t stepsSize = 1;
   uint32_t stepsTime = 1;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("manager", "PRC Manager", manager);
   cmd.AddValue ("rtsThreshold", "RTS threshold", rtsThreshold);
   cmd.AddValue ("outputFileName", "Output filename", outputFileName);

examples/wireless/wifi-power-adaptation-interference.cc

@@ -354,7 +354,7 @@ int main (int argc, char *argv[])
   int sta2_y = 0;
   uint32_t simuTime = 100;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("manager", "PRC Manager", manager);
   cmd.AddValue ("rtsThreshold", "RTS threshold", rtsThreshold);
   cmd.AddValue ("outputFileName", "Output filename", outputFileName);

examples/wireless/wifi-rate-adaptation-distance.cc

@@ -163,7 +163,7 @@ int main (int argc, char *argv[])
   int stepsSize = 1;
   int stepsTime = 1;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("staManager", "PRC Manager of the STA", staManager);
   cmd.AddValue ("apManager", "PRC Manager of the AP", apManager);
   cmd.AddValue ("standard", "Wifi Phy Standard", standard);

examples/wireless/wifi-simple-adhoc-grid.cc

@@ -126,7 +126,7 @@ int main (int argc, char *argv[])
   bool verbose = false;
   bool tracing = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
   cmd.AddValue ("distance", "distance (m)", distance);
   cmd.AddValue ("packetSize", "size of application packet sent", packetSize);

examples/wireless/wifi-simple-adhoc.cc

@@ -98,7 +98,7 @@ int main (int argc, char *argv[])
   double interval = 1.0; // seconds
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
   cmd.AddValue ("rss", "received signal strength", rss);
   cmd.AddValue ("packetSize", "size of application packet sent", packetSize);

examples/wireless/wifi-simple-ht-hidden-stations.cc

@@ -63,7 +63,7 @@ int main (int argc, char *argv[])
   double minExpectedThroughput = 0;
   double maxExpectedThroughput = 0;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nMpdus", "Number of aggregated MPDUs", nMpdus);
   cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
   cmd.AddValue ("enableRts", "Enable RTS/CTS", enableRts);

examples/wireless/wifi-simple-infra.cc

@@ -100,7 +100,7 @@ int main (int argc, char *argv[])
   double interval = 1.0; // seconds
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
   cmd.AddValue ("rss", "received signal strength", rss);
   cmd.AddValue ("packetSize", "size of application packet sent", packetSize);

examples/wireless/wifi-simple-interference.cc

@@ -150,7 +150,7 @@ int main (int argc, char *argv[])
 
   double offset = 91;  // This is a magic number used to set the
                        // transmit power, based on other configuration
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
   cmd.AddValue ("Prss", "Intended primary received signal strength (dBm)", Prss);
   cmd.AddValue ("Irss", "Intended interfering received signal strength (dBm)", Irss);

examples/wireless/wifi-sleep.cc

@@ -103,7 +103,7 @@ int main (int argc, char *argv[])
   double txCurrent = 0.380; // Ampere
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("dataRate", "Data rate", dataRate);
   cmd.AddValue ("packetSize", "size of application packet sent", packetSize);
   cmd.AddValue ("duration", "duration (seconds) of the experiment", duration);

examples/wireless/wifi-spatial-reuse.cc

@@ -115,7 +115,7 @@ main (int argc, char *argv[])
   bool enableObssPd = true;
   double obssPdThreshold = -72.0; // dBm
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("duration", "Duration of simulation (s)", duration);
   cmd.AddValue ("interval", "Inter packet interval (s)", interval);
   cmd.AddValue ("enableObssPd", "Enable/disable OBSS_PD", enableObssPd);

examples/wireless/wifi-spectrum-per-example.cc

@@ -122,7 +122,7 @@ int main (int argc, char *argv[])
   bool enablePcap = false;
   const uint32_t tcpPacketSize = 1448;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
   cmd.AddValue ("udp", "UDP if set to 1, TCP otherwise", udp);
   cmd.AddValue ("distance", "meters separation between nodes", distance);

examples/wireless/wifi-spectrum-per-interference.cc

@@ -149,7 +149,7 @@ int main (int argc, char *argv[])
   const uint32_t tcpPacketSize = 1448;
   double waveformPower = 0;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
   cmd.AddValue ("udp", "UDP if set to 1, TCP otherwise", udp);
   cmd.AddValue ("distance", "meters separation between nodes", distance);

examples/wireless/wifi-spectrum-saturation-example.cc

@@ -105,7 +105,7 @@ int main (int argc, char *argv[])
   std::string errorModelType = "ns3::NistErrorRateModel";
   bool enablePcap = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
   cmd.AddValue ("distance", "meters separation between nodes", distance);
   cmd.AddValue ("index", "restrict index to single value between 0 and 63", index);

examples/wireless/wifi-tcp.cc

@@ -77,7 +77,7 @@ main (int argc, char *argv[])
   bool pcapTracing = false;                          /* PCAP Tracing is enabled or not. */
 
   /* Command line argument parser setup. */
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
   cmd.AddValue ("dataRate", "Application data ate", dataRate);
   cmd.AddValue ("tcpVariant", "Transport protocol to use: TcpNewReno, "

examples/wireless/wifi-timing-attributes.cc

@@ -64,7 +64,7 @@ int main (int argc, char *argv[])
   uint32_t compressedBlockAckTimeout = 112; //Compressed BlockAck timeout duration in microseconds
   double simulationTime = 10; //simulation time in seconds
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("slot", "Slot time in microseconds", slot);
   cmd.AddValue ("sifs", "SIFS duration in microseconds", sifs);
   cmd.AddValue ("ackTimeout", "Ack timeout duration in microseconds", ackTimeout);

examples/wireless/wifi-txop-aggregation.cc

@@ -102,7 +102,7 @@ int main (int argc, char *argv[])
   bool enablePcap = 0;
   bool verifyResults = 0; //used for regression
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
   cmd.AddValue ("enableRts", "Enable or disable RTS/CTS", enableRts);
   cmd.AddValue ("txopLimit", "TXOP duration in microseconds", txopLimit);

examples/wireless/wifi-vht-network.cc

@@ -67,7 +67,7 @@ int main (int argc, char *argv[])
   double minExpectedThroughput = 0;
   double maxExpectedThroughput = 0;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("distance", "Distance in meters between the station and the access point", distance);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
   cmd.AddValue ("udp", "UDP if set to 1, TCP otherwise", udp);

examples/wireless/wifi-wired-bridging.cc

@@ -65,7 +65,7 @@ int main (int argc, char *argv[])
   bool sendIp = true;
   bool writeMobility = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nWifis", "Number of wifi networks", nWifis);
   cmd.AddValue ("nStas", "Number of stations per wifi network", nStas);
   cmd.AddValue ("SendIp", "Send Ipv4 or raw packets", sendIp);

src/aodv/examples/aodv.cc

@@ -129,7 +129,7 @@ AodvExample::Configure (int argc, char **argv)
   // LogComponentEnable("AodvRoutingProtocol", LOG_LEVEL_ALL);
 
   SeedManager::SetSeed (12345);
-  CommandLine cmd;
+  COMMANDLINE (cmd);
 
   cmd.AddValue ("pcap", "Write PCAP traces.", pcap);
   cmd.AddValue ("printRoutes", "Print routing table dumps.", printRoutes);

src/applications/examples/three-gpp-http-example.cc

@@ -98,7 +98,7 @@ int
 main (int argc, char *argv[])
 {
   double simTimeSec = 300;
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("SimulationTime", "Length of simulation in seconds.", simTimeSec);
   cmd.Parse (argc, argv);
 

src/bridge/examples/csma-bridge-one-hop.cc

@@ -101,7 +101,7 @@ main (int argc, char *argv[])
   // Allow the user to override any of the defaults and the above Bind() at
   // run-time, via command-line arguments
   //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   //

src/bridge/examples/csma-bridge.cc

@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   // Allow the user to override any of the defaults and the above Bind() at
   // run-time, via command-line arguments
   //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   //

src/brite/examples/brite-MPI-example.cc

@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   bool tracing = false;
   bool nix = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("confFile", "BRITE conf file", confFile);
   cmd.AddValue ("tracing", "Enable or disable ascii tracing", tracing);
   cmd.AddValue ("nix", "Enable or disable nix-vector routing", nix);