From b23be18b3b5f52096150b14526a677452f51d1e5 Mon Sep 17 00:00:00 2001 From: "Peter D. Barnes, Jr" Date: Fri, 1 May 2020 14:42:53 -0700 Subject: [PATCH] Use CommandLine cmd (__FILE__) instead of COMMANDLINE macro. This in effect replaces commit 5e624d550 --- examples/energy/energy-model-example.cc | 2 +- .../energy-model-with-harvesting-example.cc | 2 +- examples/error-model/simple-error-model.cc | 2 +- examples/ipv6/fragmentation-ipv6-two-MTU.cc | 2 +- examples/ipv6/fragmentation-ipv6.cc | 2 +- examples/ipv6/icmpv6-redirect.cc | 2 +- examples/ipv6/loose-routing-ipv6.cc | 2 +- examples/ipv6/ping6.cc | 2 +- examples/ipv6/radvd-two-prefix.cc | 2 +- examples/ipv6/radvd.cc | 2 +- examples/ipv6/wsn-ping6.cc | 2 +- examples/matrix-topology/matrix-topology.cc | 2 +- examples/naming/object-names.cc | 2 +- examples/realtime/realtime-udp-echo.cc | 2 +- examples/routing/dynamic-global-routing.cc | 2 +- examples/routing/global-injection-slash32.cc | 2 +- ...global-routing-multi-switch-plus-router.cc | 2 +- examples/routing/global-routing-slash32.cc | 2 +- examples/routing/manet-routing-compare.cc | 2 +- examples/routing/mixed-global-routing.cc | 2 +- examples/routing/rip-simple-network.cc | 2 +- examples/routing/ripng-simple-network.cc | 2 +- examples/routing/simple-alternate-routing.cc | 2 +- examples/routing/simple-global-routing.cc | 2 +- examples/routing/simple-routing-ping6.cc | 2 +- examples/routing/static-routing-slash32.cc | 2 +- .../socket/socket-bound-static-routing.cc | 2 +- .../socket/socket-bound-tcp-static-routing.cc | 2 +- examples/socket/socket-options-ipv4.cc | 2 +- examples/socket/socket-options-ipv6.cc | 2 +- examples/stats/wifi-example-sim.cc | 2 +- examples/tcp/dctcp-example.cc | 2 +- examples/tcp/star.cc | 2 +- examples/tcp/tcp-bulk-send.cc | 2 +- examples/tcp/tcp-large-transfer.cc | 2 +- examples/tcp/tcp-nsc-comparison.cc | 2 +- examples/tcp/tcp-nsc-lfn.cc | 2 +- examples/tcp/tcp-nsc-zoo.cc | 2 +- examples/tcp/tcp-pacing.cc | 2 +- examples/tcp/tcp-pcap-nanosec-example.cc | 2 +- examples/tcp/tcp-star-server.cc | 2 +- examples/tcp/tcp-variants-comparison.cc | 2 +- .../traffic-control/queue-discs-benchmark.cc | 2 +- .../traffic-control/red-vs-fengadaptive.cc | 2 +- examples/traffic-control/red-vs-nlred.cc | 2 +- examples/traffic-control/tbf-example.cc | 2 +- examples/traffic-control/traffic-control.cc | 2 +- examples/tutorial/fifth.cc | 2 +- examples/tutorial/first.cc | 2 +- examples/tutorial/second.cc | 2 +- examples/tutorial/seventh.cc | 2 +- examples/tutorial/sixth.cc | 2 +- examples/tutorial/third.cc | 2 +- .../udp-client-server/udp-client-server.cc | 2 +- .../udp-trace-client-server.cc | 2 +- examples/udp/udp-echo.cc | 2 +- examples/wireless/mixed-wired-wireless.cc | 2 +- examples/wireless/wifi-80211e-txop.cc | 2 +- examples/wireless/wifi-80211n-mimo.cc | 2 +- examples/wireless/wifi-adhoc.cc | 2 +- examples/wireless/wifi-aggregation.cc | 2 +- examples/wireless/wifi-ap.cc | 2 +- .../wireless/wifi-backward-compatibility.cc | 2 +- examples/wireless/wifi-blockack.cc | 2 +- examples/wireless/wifi-clear-channel-cmu.cc | 2 +- examples/wireless/wifi-dsss-validation.cc | 2 +- examples/wireless/wifi-he-network.cc | 2 +- examples/wireless/wifi-hidden-terminal.cc | 2 +- examples/wireless/wifi-ht-network.cc | 2 +- examples/wireless/wifi-mixed-network.cc | 2 +- examples/wireless/wifi-multi-tos.cc | 2 +- examples/wireless/wifi-multirate.cc | 2 +- examples/wireless/wifi-ofdm-he-validation.cc | 2 +- examples/wireless/wifi-ofdm-ht-validation.cc | 2 +- examples/wireless/wifi-ofdm-validation.cc | 2 +- examples/wireless/wifi-ofdm-vht-validation.cc | 2 +- examples/wireless/wifi-pcf.cc | 2 +- .../wifi-power-adaptation-distance.cc | 2 +- .../wifi-power-adaptation-interference.cc | 2 +- .../wireless/wifi-rate-adaptation-distance.cc | 2 +- examples/wireless/wifi-simple-adhoc-grid.cc | 2 +- examples/wireless/wifi-simple-adhoc.cc | 2 +- .../wifi-simple-ht-hidden-stations.cc | 2 +- examples/wireless/wifi-simple-infra.cc | 2 +- examples/wireless/wifi-simple-interference.cc | 2 +- examples/wireless/wifi-sleep.cc | 2 +- examples/wireless/wifi-spatial-reuse.cc | 2 +- .../wireless/wifi-spectrum-per-example.cc | 2 +- .../wifi-spectrum-per-interference.cc | 2 +- .../wifi-spectrum-saturation-example.cc | 2 +- examples/wireless/wifi-tcp.cc | 2 +- examples/wireless/wifi-timing-attributes.cc | 2 +- examples/wireless/wifi-txop-aggregation.cc | 2 +- examples/wireless/wifi-vht-network.cc | 2 +- examples/wireless/wifi-wired-bridging.cc | 2 +- src/aodv/examples/aodv.cc | 2 +- .../examples/three-gpp-http-example.cc | 2 +- src/bridge/examples/csma-bridge-one-hop.cc | 2 +- src/bridge/examples/csma-bridge.cc | 2 +- src/brite/examples/brite-MPI-example.cc | 2 +- src/brite/examples/brite-generic-example.cc | 2 +- .../examples/buildings-pathloss-profiler.cc | 2 +- src/click/examples/nsclick-defines.cc | 2 +- src/click/examples/nsclick-raw-wlan.cc | 2 +- src/click/examples/nsclick-routing.cc | 2 +- src/click/examples/nsclick-simple-lan.cc | 2 +- .../nsclick-udp-client-server-csma.cc | 2 +- .../nsclick-udp-client-server-wifi.cc | 2 +- .../examples/config-store-save.cc | 2 +- src/core/examples/command-line-example.cc | 2 +- src/core/examples/hash-example.cc | 2 +- src/core/examples/main-callback.cc | 2 +- src/core/examples/main-ptr.cc | 2 +- .../examples/main-random-variable-stream.cc | 2 +- src/core/examples/main-test-sync.cc | 2 +- src/core/examples/sample-log-time-format.cc | 2 +- .../examples/sample-random-variable-stream.cc | 2 +- src/core/examples/sample-random-variable.cc | 2 +- src/core/examples/sample-show-progress.cc | 2 +- src/core/examples/sample-simulator.cc | 2 +- src/core/model/command-line.cc | 2 +- src/core/model/command-line.h | 27 +++++-------------- src/create-module.py | 2 +- src/csma-layout/examples/csma-star.cc | 2 +- src/csma/examples/csma-broadcast.cc | 2 +- src/csma/examples/csma-multicast.cc | 2 +- src/csma/examples/csma-one-subnet.cc | 2 +- src/csma/examples/csma-packet-socket.cc | 2 +- src/csma/examples/csma-ping.cc | 2 +- src/csma/examples/csma-raw-ip-socket.cc | 2 +- src/dsdv/examples/dsdv-manet.cc | 2 +- src/dsr/examples/dsr.cc | 2 +- src/energy/examples/li-ion-energy-source.cc | 2 +- src/energy/examples/rv-battery-model-test.cc | 2 +- src/fd-net-device/examples/dummy-network.cc | 2 +- src/fd-net-device/examples/fd-emu-onoff.cc | 2 +- src/fd-net-device/examples/fd-emu-ping.cc | 2 +- src/fd-net-device/examples/fd-emu-udp-echo.cc | 2 +- .../examples/fd-planetlab-ping.cc | 2 +- src/fd-net-device/examples/fd-tap-ping.cc | 2 +- src/fd-net-device/examples/fd-tap-ping6.cc | 2 +- src/fd-net-device/examples/fd2fd-onoff.cc | 2 +- .../examples/realtime-dummy-network.cc | 2 +- .../examples/realtime-fd2fd-onoff.cc | 2 +- src/internet-apps/examples/dhcp-example.cc | 2 +- .../examples/traceroute-example.cc | 2 +- src/internet/examples/main-simple.cc | 2 +- src/lr-wpan/examples/lr-wpan-data.cc | 2 +- .../examples/lr-wpan-error-distance-plot.cc | 2 +- src/lr-wpan/examples/lr-wpan-phy-test.cc | 2 +- src/lte/doc/source/lte-user.rst | 2 +- src/lte/examples/lena-cc-helper.cc | 2 +- src/lte/examples/lena-cqi-threshold.cc | 2 +- src/lte/examples/lena-deactivate-bearer.cc | 2 +- src/lte/examples/lena-distributed-ffr.cc | 2 +- src/lte/examples/lena-dual-stripe.cc | 2 +- src/lte/examples/lena-fading.cc | 2 +- src/lte/examples/lena-frequency-reuse.cc | 2 +- .../examples/lena-intercell-interference.cc | 2 +- src/lte/examples/lena-ipv6-addr-conf.cc | 2 +- src/lte/examples/lena-ipv6-ue-rh.cc | 2 +- src/lte/examples/lena-ipv6-ue-ue.cc | 2 +- src/lte/examples/lena-pathloss-traces.cc | 2 +- src/lte/examples/lena-profiling.cc | 2 +- src/lte/examples/lena-radio-link-failure.cc | 2 +- src/lte/examples/lena-rem-sector-antenna.cc | 2 +- src/lte/examples/lena-rem.cc | 2 +- src/lte/examples/lena-rlc-traces.cc | 2 +- src/lte/examples/lena-simple-epc-backhaul.cc | 2 +- src/lte/examples/lena-simple-epc-emu.cc | 2 +- src/lte/examples/lena-simple-epc.cc | 2 +- src/lte/examples/lena-simple.cc | 2 +- src/lte/examples/lena-uplink-power-control.cc | 2 +- src/lte/examples/lena-x2-handover-measures.cc | 2 +- src/lte/examples/lena-x2-handover.cc | 2 +- src/mesh/examples/mesh.cc | 2 +- .../examples/bonnmotion-ns2-example.cc | 2 +- src/mobility/examples/main-grid-topology.cc | 2 +- src/mobility/examples/main-random-topology.cc | 2 +- src/mobility/examples/main-random-walk.cc | 2 +- .../examples/mobility-trace-example.cc | 2 +- src/mobility/examples/ns2-mobility-trace.cc | 2 +- src/mpi/examples/nms-p2p-nix-distributed.cc | 2 +- .../examples/simple-distributed-empty-node.cc | 2 +- src/mpi/examples/simple-distributed.cc | 2 +- src/mpi/examples/third-distributed.cc | 2 +- .../examples/colors-link-description.cc | 2 +- src/netanim/examples/dumbbell-animation.cc | 2 +- src/netanim/examples/grid-animation.cc | 2 +- src/netanim/examples/resources-counters.cc | 2 +- src/netanim/examples/star-animation.cc | 2 +- src/netanim/examples/uan-animation.cc | 2 +- src/netanim/examples/wireless-animation.cc | 2 +- src/network/examples/packet-socket-apps.cc | 2 +- src/nix-vector-routing/examples/nix-simple.cc | 2 +- .../examples/nms-p2p-nix.cc | 2 +- src/olsr/examples/olsr-hna.cc | 2 +- .../examples/simple-point-to-point-olsr.cc | 2 +- src/openflow/examples/openflow-switch.cc | 2 +- .../examples/main-attribute-value.cc | 2 +- .../jakes-propagation-model-example.cc | 2 +- .../examples/main-propagation-loss.cc | 2 +- .../examples/example-ping-lr-wpan-beacon.cc | 2 +- .../example-ping-lr-wpan-mesh-under.cc | 2 +- .../examples/example-ping-lr-wpan.cc | 2 +- src/sixlowpan/examples/example-sixlowpan.cc | 2 +- ...ideal-phy-matrix-propagation-loss-model.cc | 2 +- ...hoc-aloha-ideal-phy-with-microwave-oven.cc | 2 +- .../examples/adhoc-aloha-ideal-phy.cc | 2 +- src/spectrum/examples/tv-trans-example.cc | 2 +- .../examples/tv-trans-regional-example.cc | 2 +- src/stats/doc/statistics.rst | 2 +- src/stats/examples/double-probe-example.cc | 2 +- src/stats/examples/file-helper-example.cc | 2 +- src/stats/examples/gnuplot-helper-example.cc | 2 +- src/stats/examples/time-probe-example.cc | 2 +- .../examples/tap-csma-virtual-machine.cc | 2 +- src/tap-bridge/examples/tap-csma.cc | 2 +- src/tap-bridge/examples/tap-wifi-dumbbell.cc | 2 +- .../examples/tap-wifi-virtual-machine.cc | 2 +- src/test/perf/perf-io.cc | 2 +- .../examples/topology-example-sim.cc | 2 +- .../examples/adaptive-red-tests.cc | 2 +- .../examples/codel-vs-pfifo-asymmetric.cc | 2 +- .../examples/codel-vs-pfifo-basic-test.cc | 2 +- src/traffic-control/examples/pfifo-vs-red.cc | 2 +- src/traffic-control/examples/pie-example.cc | 2 +- src/traffic-control/examples/red-tests.cc | 2 +- src/traffic-control/examples/red-vs-ared.cc | 2 +- src/uan/examples/uan-6lowpan-example.cc | 2 +- src/uan/examples/uan-cw-example.cc | 2 +- src/uan/examples/uan-ipv4-example.cc | 2 +- src/uan/examples/uan-ipv6-example.cc | 2 +- src/uan/examples/uan-raw-example.cc | 2 +- src/uan/examples/uan-rc-example.cc | 2 +- .../examples/virtual-net-device.cc | 2 +- src/wave/examples/vanet-routing-compare.cc | 2 +- src/wave/examples/wave-simple-80211p.cc | 2 +- src/wave/examples/wave-simple-device.cc | 2 +- src/wifi/examples/wifi-manager-example.cc | 2 +- src/wifi/examples/wifi-phy-configuration.cc | 2 +- src/wifi/examples/wifi-phy-test.cc | 8 +++--- .../examples/wifi-test-interference-helper.cc | 2 +- src/wifi/examples/wifi-trans-example.cc | 2 +- src/wimax/examples/wimax-ipv4.cc | 2 +- src/wimax/examples/wimax-multicast.cc | 2 +- src/wimax/examples/wimax-simple.cc | 2 +- utils/bench-packets.cc | 2 +- utils/bench-simulator.cc | 2 +- utils/print-introspected-doxygen.cc | 2 +- 250 files changed, 259 insertions(+), 272 deletions(-) diff --git a/examples/energy/energy-model-example.cc b/examples/energy/energy-model-example.cc index 3b7d6e0a1..273d3cc7d 100644 --- a/examples/energy/energy-model-example.cc +++ b/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 (__FILE__); cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode); cmd.AddValue ("Prss", "Intended primary RSS (dBm)", Prss); cmd.AddValue ("PpacketSize", "size of application packet sent", PpacketSize); diff --git a/examples/energy/energy-model-with-harvesting-example.cc b/examples/energy/energy-model-with-harvesting-example.cc index ce920d534..80d8957c0 100644 --- a/examples/energy/energy-model-with-harvesting-example.cc +++ b/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 (__FILE__); cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode); cmd.AddValue ("Prss", "Intended primary RSS (dBm)", Prss); cmd.AddValue ("PacketSize", "size of application packet sent", PacketSize); diff --git a/examples/error-model/simple-error-model.cc b/examples/error-model/simple-error-model.cc index 3e49d499f..007364bdb 100644 --- a/examples/error-model/simple-error-model.cc +++ b/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 (__FILE__); cmd.AddValue("errorModelType", "TypeId of the error model to use", errorModelType); cmd.Parse (argc, argv); diff --git a/examples/ipv6/fragmentation-ipv6-two-MTU.cc b/examples/ipv6/fragmentation-ipv6-two-MTU.cc index f9aae347b..430d34211 100644 --- a/examples/ipv6/fragmentation-ipv6-two-MTU.cc +++ b/examples/ipv6/fragmentation-ipv6-two-MTU.cc @@ -47,7 +47,7 @@ int main (int argc, char** argv) { bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "turn on log components", verbose); cmd.Parse (argc, argv); diff --git a/examples/ipv6/fragmentation-ipv6.cc b/examples/ipv6/fragmentation-ipv6.cc index 8e28fc327..8dfc3cd8c 100644 --- a/examples/ipv6/fragmentation-ipv6.cc +++ b/examples/ipv6/fragmentation-ipv6.cc @@ -45,7 +45,7 @@ int main (int argc, char** argv) { bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "turn on log components", verbose); cmd.Parse (argc, argv); diff --git a/examples/ipv6/icmpv6-redirect.cc b/examples/ipv6/icmpv6-redirect.cc index 0bfd79bb4..ee94319b0 100644 --- a/examples/ipv6/icmpv6-redirect.cc +++ b/examples/ipv6/icmpv6-redirect.cc @@ -57,7 +57,7 @@ int main (int argc, char **argv) { bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "turn on log components", verbose); cmd.Parse (argc, argv); diff --git a/examples/ipv6/loose-routing-ipv6.cc b/examples/ipv6/loose-routing-ipv6.cc index 5adae0f84..b2180afe0 100644 --- a/examples/ipv6/loose-routing-ipv6.cc +++ b/examples/ipv6/loose-routing-ipv6.cc @@ -53,7 +53,7 @@ int main (int argc, char **argv) { bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "turn on log components", verbose); cmd.Parse (argc, argv); diff --git a/examples/ipv6/ping6.cc b/examples/ipv6/ping6.cc index a718c48b7..59d0dcbd0 100644 --- a/examples/ipv6/ping6.cc +++ b/examples/ipv6/ping6.cc @@ -43,7 +43,7 @@ int main (int argc, char **argv) { bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "turn on log components", verbose); cmd.Parse (argc, argv); diff --git a/examples/ipv6/radvd-two-prefix.cc b/examples/ipv6/radvd-two-prefix.cc index e5a5ee9e6..057dd702a 100644 --- a/examples/ipv6/radvd-two-prefix.cc +++ b/examples/ipv6/radvd-two-prefix.cc @@ -84,7 +84,7 @@ int main (int argc, char** argv) { bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "turn on log components", verbose); cmd.Parse (argc, argv); diff --git a/examples/ipv6/radvd.cc b/examples/ipv6/radvd.cc index c850d8683..cacedf2af 100644 --- a/examples/ipv6/radvd.cc +++ b/examples/ipv6/radvd.cc @@ -49,7 +49,7 @@ int main (int argc, char** argv) { bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "turn on log components", verbose); cmd.Parse (argc, argv); diff --git a/examples/ipv6/wsn-ping6.cc b/examples/ipv6/wsn-ping6.cc index 92ed2f892..226668553 100644 --- a/examples/ipv6/wsn-ping6.cc +++ b/examples/ipv6/wsn-ping6.cc @@ -47,7 +47,7 @@ int main (int argc, char **argv) { bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "turn on log components", verbose); cmd.Parse (argc, argv); diff --git a/examples/matrix-topology/matrix-topology.cc b/examples/matrix-topology/matrix-topology.cc index d6a6b0a37..ea83675cc 100644 --- a/examples/matrix-topology/matrix-topology.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); // ---------- End of Simulation Variables ---------------------------------- diff --git a/examples/naming/object-names.cc b/examples/naming/object-names.cc index 04fe42c3a..ce21c68f3 100644 --- a/examples/naming/object-names.cc +++ b/examples/naming/object-names.cc @@ -44,7 +44,7 @@ main (int argc, char *argv[]) LogComponentEnable ("ObjectNamesExample", LOG_LEVEL_INFO); #endif - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); NodeContainer n; diff --git a/examples/realtime/realtime-udp-echo.cc b/examples/realtime/realtime-udp-echo.cc index d97d14598..830e32557 100644 --- a/examples/realtime/realtime-udp-echo.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); // diff --git a/examples/routing/dynamic-global-routing.cc b/examples/routing/dynamic-global-routing.cc index e18d0f7c6..07f6c9e4a 100644 --- a/examples/routing/dynamic-global-routing.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); NS_LOG_INFO ("Create nodes."); diff --git a/examples/routing/global-injection-slash32.cc b/examples/routing/global-injection-slash32.cc index e29556486..e3823979f 100644 --- a/examples/routing/global-injection-slash32.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); Ptr nA = CreateObject (); diff --git a/examples/routing/global-routing-multi-switch-plus-router.cc b/examples/routing/global-routing-multi-switch-plus-router.cc index 4e9fb8e0d..fa7c54b5a 100644 --- a/examples/routing/global-routing-multi-switch-plus-router.cc +++ b/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 (__FILE__); cmd.Usage ("NOTE: valid --pcap arguments are: 't2,t3,b2,b3,trlan,trwan,brlan,brwan'"); diff --git a/examples/routing/global-routing-slash32.cc b/examples/routing/global-routing-slash32.cc index de0487c54..7135b3172 100644 --- a/examples/routing/global-routing-slash32.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); Ptr nA = CreateObject (); diff --git a/examples/routing/manet-routing-compare.cc b/examples/routing/manet-routing-compare.cc index 8e469f990..661b34b94 100644 --- a/examples/routing/manet-routing-compare.cc +++ b/examples/routing/manet-routing-compare.cc @@ -187,7 +187,7 @@ RoutingExperiment::SetupPacketReceive (Ipv4Address addr, Ptr node) std::string RoutingExperiment::CommandSetup (int argc, char **argv) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); 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); diff --git a/examples/routing/mixed-global-routing.cc b/examples/routing/mixed-global-routing.cc index 7697d711b..d9601baa1 100644 --- a/examples/routing/mixed-global-routing.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); NS_LOG_INFO ("Create nodes."); diff --git a/examples/routing/rip-simple-network.cc b/examples/routing/rip-simple-network.cc index bdac5e3b0..1bde59630 100644 --- a/examples/routing/rip-simple-network.cc +++ b/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 (__FILE__); 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); diff --git a/examples/routing/ripng-simple-network.cc b/examples/routing/ripng-simple-network.cc index dbf7cd850..26254a2cb 100644 --- a/examples/routing/ripng-simple-network.cc +++ b/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 (__FILE__); 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); diff --git a/examples/routing/simple-alternate-routing.cc b/examples/routing/simple-alternate-routing.cc index 737742405..4cfed4ce1 100644 --- a/examples/routing/simple-alternate-routing.cc +++ b/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 (__FILE__); // // Additionally, we plumb this metric into the default value / command // line argument system as well, for exemplary purposes. This means diff --git a/examples/routing/simple-global-routing.cc b/examples/routing/simple-global-routing.cc index e9dd65aa3..0ae051e3f 100644 --- a/examples/routing/simple-global-routing.cc +++ b/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 (__FILE__); bool enableFlowMonitor = false; cmd.AddValue ("EnableMonitor", "Enable Flow Monitor", enableFlowMonitor); cmd.Parse (argc, argv); diff --git a/examples/routing/simple-routing-ping6.cc b/examples/routing/simple-routing-ping6.cc index bda8124cb..613a2fbb9 100644 --- a/examples/routing/simple-routing-ping6.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); StackHelper stackHelper; diff --git a/examples/routing/static-routing-slash32.cc b/examples/routing/static-routing-slash32.cc index 576b295d8..b0189f009 100644 --- a/examples/routing/static-routing-slash32.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); Ptr nA = CreateObject (); diff --git a/examples/socket/socket-bound-static-routing.cc b/examples/socket/socket-bound-static-routing.cc index 4b76b7772..8c21239f4 100644 --- a/examples/socket/socket-bound-static-routing.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); Ptr nSrc = CreateObject (); diff --git a/examples/socket/socket-bound-tcp-static-routing.cc b/examples/socket/socket-bound-tcp-static-routing.cc index 088169d3e..060d6da8c 100644 --- a/examples/socket/socket-bound-tcp-static-routing.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); Ptr nSrc = CreateObject (); diff --git a/examples/socket/socket-options-ipv4.cc b/examples/socket/socket-options-ipv4.cc index 2469d8444..2d9874d04 100644 --- a/examples/socket/socket-options-ipv4.cc +++ b/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 (__FILE__); cmd.AddValue ("PacketSize", "Packet size in bytes", packetSize); cmd.AddValue ("PacketCount", "Number of packets to send", packetCount); cmd.AddValue ("Interval", "Interval between packets", packetInterval); diff --git a/examples/socket/socket-options-ipv6.cc b/examples/socket/socket-options-ipv6.cc index b5b4e22f5..358454050 100644 --- a/examples/socket/socket-options-ipv6.cc +++ b/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 (__FILE__); cmd.AddValue ("PacketSize", "Packet size in bytes", packetSize); cmd.AddValue ("PacketCount", "Number of packets to send", packetCount); cmd.AddValue ("Interval", "Interval between packets", packetInterval); diff --git a/examples/stats/wifi-example-sim.cc b/examples/stats/wifi-example-sim.cc index 5c8a144a2..b7ced16af 100644 --- a/examples/stats/wifi-example-sim.cc +++ b/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 (__FILE__); cmd.AddValue ("distance", "Distance apart to place nodes (in meters).", distance); cmd.AddValue ("format", "Format to use for data output.", diff --git a/examples/tcp/dctcp-example.cc b/examples/tcp/dctcp-example.cc index 85e4077a4..1c5daa14b 100644 --- a/examples/tcp/dctcp-example.cc +++ b/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 (__FILE__); cmd.AddValue ("tcpTypeId", "ns-3 TCP TypeId", tcpTypeId); cmd.AddValue ("flowStartupWindow", "startup time window (TCP staggered starts)", flowStartupWindow); cmd.AddValue ("convergenceTime", "convergence time", convergenceTime); diff --git a/examples/tcp/star.cc b/examples/tcp/star.cc index 1e7b94ddf..57cba6c33 100644 --- a/examples/tcp/star.cc +++ b/examples/tcp/star.cc @@ -56,7 +56,7 @@ main (int argc, char *argv[]) // uint32_t nSpokes = 8; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("nSpokes", "Number of nodes to place in the star", nSpokes); cmd.Parse (argc, argv); diff --git a/examples/tcp/tcp-bulk-send.cc b/examples/tcp/tcp-bulk-send.cc index df211c9ce..fe10c4c24 100644 --- a/examples/tcp/tcp-bulk-send.cc +++ b/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 (__FILE__); cmd.AddValue ("tracing", "Flag to enable/disable tracing", tracing); cmd.AddValue ("maxBytes", "Total number of bytes for application to send", maxBytes); diff --git a/examples/tcp/tcp-large-transfer.cc b/examples/tcp/tcp-large-transfer.cc index 3298af57f..2efcce65b 100644 --- a/examples/tcp/tcp-large-transfer.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); // initialize the tx buffer. diff --git a/examples/tcp/tcp-nsc-comparison.cc b/examples/tcp/tcp-nsc-comparison.cc index ada9aaa90..80468a66a 100644 --- a/examples/tcp/tcp-nsc-comparison.cc +++ b/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 (__FILE__); 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); diff --git a/examples/tcp/tcp-nsc-lfn.cc b/examples/tcp/tcp-nsc-lfn.cc index 9147d895a..299cf4100 100644 --- a/examples/tcp/tcp-nsc-lfn.cc +++ b/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 (__FILE__); // 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); diff --git a/examples/tcp/tcp-nsc-zoo.cc b/examples/tcp/tcp-nsc-zoo.cc index bde60c43f..616422ff7 100644 --- a/examples/tcp/tcp-nsc-zoo.cc +++ b/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 (__FILE__); // 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); diff --git a/examples/tcp/tcp-pacing.cc b/examples/tcp/tcp-pacing.cc index 657f3e3d6..fd853bf32 100644 --- a/examples/tcp/tcp-pacing.cc +++ b/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 (__FILE__); cmd.AddValue ("tracing", "Flag to enable/disable tracing", tracing); cmd.AddValue ("maxBytes", "Total number of bytes for application to send", maxBytes); diff --git a/examples/tcp/tcp-pcap-nanosec-example.cc b/examples/tcp/tcp-pcap-nanosec-example.cc index b57150a68..774c3161e 100644 --- a/examples/tcp/tcp-pcap-nanosec-example.cc +++ b/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 (__FILE__); cmd.AddValue ("tracing", "Flag to enable tracing", tracing); cmd.AddValue ("nanosec", "Flag to use nanosecond timestamps for pcap as default", nanosec); cmd.AddValue ("maxBytes", diff --git a/examples/tcp/tcp-star-server.cc b/examples/tcp/tcp-star-server.cc index fc9373e6e..522b4b871 100644 --- a/examples/tcp/tcp-star-server.cc +++ b/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 (__FILE__); cmd.AddValue ("nNodes", "Number of nodes to place in the star", N); cmd.Parse (argc, argv); diff --git a/examples/tcp/tcp-variants-comparison.cc b/examples/tcp/tcp-variants-comparison.cc index 78c45e9a8..fc549844f 100644 --- a/examples/tcp/tcp-variants-comparison.cc +++ b/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 (__FILE__); cmd.AddValue ("transport_prot", "Transport protocol to use: TcpNewReno, " "TcpHybla, TcpHighSpeed, TcpHtcp, TcpVegas, TcpScalable, TcpVeno, " "TcpBic, TcpYeah, TcpIllinois, TcpWestwood, TcpWestwoodPlus, TcpLedbat, " diff --git a/examples/traffic-control/queue-discs-benchmark.cc b/examples/traffic-control/queue-discs-benchmark.cc index ce5849635..0ebb77cf7 100644 --- a/examples/traffic-control/queue-discs-benchmark.cc +++ b/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 (__FILE__); 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); diff --git a/examples/traffic-control/red-vs-fengadaptive.cc b/examples/traffic-control/red-vs-fengadaptive.cc index 417893acb..95298204c 100644 --- a/examples/traffic-control/red-vs-fengadaptive.cc +++ b/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 (__FILE__); 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); diff --git a/examples/traffic-control/red-vs-nlred.cc b/examples/traffic-control/red-vs-nlred.cc index 404cb11e6..066ad1bf6 100644 --- a/examples/traffic-control/red-vs-nlred.cc +++ b/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 (__FILE__); 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); diff --git a/examples/traffic-control/tbf-example.cc b/examples/traffic-control/tbf-example.cc index dac72f38d..5a48fb5b5 100644 --- a/examples/traffic-control/tbf-example.cc +++ b/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 (__FILE__); 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); diff --git a/examples/traffic-control/traffic-control.cc b/examples/traffic-control/traffic-control.cc index e6ca87bc7..25a9ba871 100644 --- a/examples/traffic-control/traffic-control.cc +++ b/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 (__FILE__); cmd.AddValue ("transportProt", "Transport protocol to use: Tcp, Udp", transportProt); cmd.Parse (argc, argv); diff --git a/examples/tutorial/fifth.cc b/examples/tutorial/fifth.cc index d8e27ecce..60272e506 100644 --- a/examples/tutorial/fifth.cc +++ b/examples/tutorial/fifth.cc @@ -175,7 +175,7 @@ RxDrop (Ptr p) int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); NodeContainer nodes; diff --git a/examples/tutorial/first.cc b/examples/tutorial/first.cc index 3fbfd334d..f68eb6a8e 100644 --- a/examples/tutorial/first.cc +++ b/examples/tutorial/first.cc @@ -34,7 +34,7 @@ NS_LOG_COMPONENT_DEFINE ("FirstScriptExample"); int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); Time::SetResolution (Time::NS); diff --git a/examples/tutorial/second.cc b/examples/tutorial/second.cc index 790ba8df5..794c1a705 100644 --- a/examples/tutorial/second.cc +++ b/examples/tutorial/second.cc @@ -41,7 +41,7 @@ main (int argc, char *argv[]) bool verbose = true; uint32_t nCsma = 3; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("nCsma", "Number of \"extra\" CSMA nodes/devices", nCsma); cmd.AddValue ("verbose", "Tell echo applications to log if true", verbose); diff --git a/examples/tutorial/seventh.cc b/examples/tutorial/seventh.cc index 116abfbd9..983563a8a 100644 --- a/examples/tutorial/seventh.cc +++ b/examples/tutorial/seventh.cc @@ -202,7 +202,7 @@ main (int argc, char *argv[]) { bool useV6 = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("useIpv6", "Use Ipv6", useV6); cmd.Parse (argc, argv); diff --git a/examples/tutorial/sixth.cc b/examples/tutorial/sixth.cc index faa03969e..128377b2d 100644 --- a/examples/tutorial/sixth.cc +++ b/examples/tutorial/sixth.cc @@ -192,7 +192,7 @@ RxDrop (Ptr file, Ptr p) int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); NodeContainer nodes; diff --git a/examples/tutorial/third.cc b/examples/tutorial/third.cc index b0f8846ee..fa7f26cfa 100644 --- a/examples/tutorial/third.cc +++ b/examples/tutorial/third.cc @@ -47,7 +47,7 @@ main (int argc, char *argv[]) uint32_t nWifi = 3; bool tracing = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); 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); diff --git a/examples/udp-client-server/udp-client-server.cc b/examples/udp-client-server/udp-client-server.cc index 52628c3a6..f31b3a62d 100644 --- a/examples/udp-client-server/udp-client-server.cc +++ b/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 (__FILE__); cmd.AddValue ("useIpv6", "Use Ipv6", useV6); cmd.Parse (argc, argv); diff --git a/examples/udp-client-server/udp-trace-client-server.cc b/examples/udp-client-server/udp-trace-client-server.cc index 3391065ee..9eae5218a 100644 --- a/examples/udp-client-server/udp-trace-client-server.cc +++ b/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 (__FILE__); cmd.AddValue ("useIpv6", "Use Ipv6", useV6); cmd.Parse (argc, argv); diff --git a/examples/udp/udp-echo.cc b/examples/udp/udp-echo.cc index 10276d0dc..65db528e8 100644 --- a/examples/udp/udp-echo.cc +++ b/examples/udp/udp-echo.cc @@ -54,7 +54,7 @@ main (int argc, char *argv[]) bool useV6 = false; Address serverAddress; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("useIpv6", "Use Ipv6", useV6); cmd.Parse (argc, argv); // diff --git a/examples/wireless/mixed-wired-wireless.cc b/examples/wireless/mixed-wired-wireless.cc index 3b46aafb4..7175e7a33 100644 --- a/examples/wireless/mixed-wired-wireless.cc +++ b/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 (__FILE__); cmd.AddValue ("backboneNodes", "number of backbone nodes", backboneNodes); cmd.AddValue ("infraNodes", "number of leaf nodes", infraNodes); cmd.AddValue ("lanNodes", "number of LAN nodes", lanNodes); diff --git a/examples/wireless/wifi-80211e-txop.cc b/examples/wireless/wifi-80211e-txop.cc index 449cd797f..024d3a329 100644 --- a/examples/wireless/wifi-80211e-txop.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-80211n-mimo.cc b/examples/wireless/wifi-80211n-mimo.cc index 213149567..bd7a2a18c 100644 --- a/examples/wireless/wifi-80211n-mimo.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-adhoc.cc b/examples/wireless/wifi-adhoc.cc index c75530827..3a6a3a6aa 100644 --- a/examples/wireless/wifi-adhoc.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); Gnuplot gnuplot = Gnuplot ("reference-rates.png"); diff --git a/examples/wireless/wifi-aggregation.cc b/examples/wireless/wifi-aggregation.cc index 3d75ba091..27a319874 100644 --- a/examples/wireless/wifi-aggregation.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-ap.cc b/examples/wireless/wifi-ap.cc index 4f3666fa4..3f4b60fcb 100644 --- a/examples/wireless/wifi-ap.cc +++ b/examples/wireless/wifi-ap.cc @@ -115,7 +115,7 @@ AdvancePosition (Ptr node) int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "Print trace information if true", g_verbose); cmd.Parse (argc, argv); diff --git a/examples/wireless/wifi-backward-compatibility.cc b/examples/wireless/wifi-backward-compatibility.cc index 77d8f1253..0e04aa76f 100644 --- a/examples/wireless/wifi-backward-compatibility.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-blockack.cc b/examples/wireless/wifi-blockack.cc index 444d69204..8a4f0b442 100644 --- a/examples/wireless/wifi-blockack.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); LogComponentEnable ("QosTxop", LOG_LEVEL_DEBUG); diff --git a/examples/wireless/wifi-clear-channel-cmu.cc b/examples/wireless/wifi-clear-channel-cmu.cc index f8f24de31..cbcd92281 100644 --- a/examples/wireless/wifi-clear-channel-cmu.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); Gnuplot gnuplot = Gnuplot ("clear-channel.eps"); diff --git a/examples/wireless/wifi-dsss-validation.cc b/examples/wireless/wifi-dsss-validation.cc index 70afde6cf..7e706ea83 100644 --- a/examples/wireless/wifi-dsss-validation.cc +++ b/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 (__FILE__); cmd.AddValue ("FrameSize", "The frame size in bytes", FrameSize); cmd.Parse (argc, argv); diff --git a/examples/wireless/wifi-he-network.cc b/examples/wireless/wifi-he-network.cc index 6e2fb9ec6..32e926737 100644 --- a/examples/wireless/wifi-he-network.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-hidden-terminal.cc b/examples/wireless/wifi-hidden-terminal.cc index 31ff2cb2c..26714bd2b 100644 --- a/examples/wireless/wifi-hidden-terminal.cc +++ b/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 (__FILE__); cmd.AddValue ("wifiManager", "Set wifi rate manager (Aarf, Aarfcd, Amrr, Arf, Cara, Ideal, Minstrel, Onoe, Rraa)", wifiManager); cmd.Parse (argc, argv); diff --git a/examples/wireless/wifi-ht-network.cc b/examples/wireless/wifi-ht-network.cc index 61548ecbc..d7b3661b8 100644 --- a/examples/wireless/wifi-ht-network.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-mixed-network.cc b/examples/wireless/wifi-mixed-network.cc index a0877842a..03f2cd97f 100644 --- a/examples/wireless/wifi-mixed-network.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-multi-tos.cc b/examples/wireless/wifi-multi-tos.cc index 3f213c896..5e6bb4b90 100644 --- a/examples/wireless/wifi-multi-tos.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-multirate.cc b/examples/wireless/wifi-multirate.cc index b914b9e8d..623df8952 100644 --- a/examples/wireless/wifi-multirate.cc +++ b/examples/wireless/wifi-multirate.cc @@ -554,7 +554,7 @@ bool Experiment::CommandSetup (int argc, char **argv) { // for commandline input - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("packetSize", "packet size", packetSize); cmd.AddValue ("totalTime", "simulation time", totalTime); // according to totalTime, select an appropriate samplingPeriod automatically. diff --git a/examples/wireless/wifi-ofdm-he-validation.cc b/examples/wireless/wifi-ofdm-he-validation.cc index 739849a45..07f432377 100644 --- a/examples/wireless/wifi-ofdm-he-validation.cc +++ b/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 (__FILE__); cmd.AddValue ("FrameSize", "The frame size", FrameSize); cmd.Parse (argc, argv); diff --git a/examples/wireless/wifi-ofdm-ht-validation.cc b/examples/wireless/wifi-ofdm-ht-validation.cc index 4968517d3..3d4c154c5 100644 --- a/examples/wireless/wifi-ofdm-ht-validation.cc +++ b/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 (__FILE__); cmd.AddValue ("FrameSize", "The frame size in bytes", FrameSize); cmd.Parse (argc, argv); diff --git a/examples/wireless/wifi-ofdm-validation.cc b/examples/wireless/wifi-ofdm-validation.cc index 23ef3be8c..eac80f686 100644 --- a/examples/wireless/wifi-ofdm-validation.cc +++ b/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 (__FILE__); cmd.AddValue ("FrameSize", "The frame size in bytes", FrameSize); cmd.Parse (argc, argv); diff --git a/examples/wireless/wifi-ofdm-vht-validation.cc b/examples/wireless/wifi-ofdm-vht-validation.cc index ec62733ef..684bc6711 100644 --- a/examples/wireless/wifi-ofdm-vht-validation.cc +++ b/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 (__FILE__); cmd.AddValue ("FrameSize", "The frame size in bytes", FrameSize); cmd.Parse (argc, argv); diff --git a/examples/wireless/wifi-pcf.cc b/examples/wireless/wifi-pcf.cc index 5e1f08d77..4b6f1e62c 100644 --- a/examples/wireless/wifi-pcf.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-power-adaptation-distance.cc b/examples/wireless/wifi-power-adaptation-distance.cc index 3012ecb0e..8eb5ac722 100644 --- a/examples/wireless/wifi-power-adaptation-distance.cc +++ b/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 (__FILE__); cmd.AddValue ("manager", "PRC Manager", manager); cmd.AddValue ("rtsThreshold", "RTS threshold", rtsThreshold); cmd.AddValue ("outputFileName", "Output filename", outputFileName); diff --git a/examples/wireless/wifi-power-adaptation-interference.cc b/examples/wireless/wifi-power-adaptation-interference.cc index 4c002fab3..a143cd0a6 100644 --- a/examples/wireless/wifi-power-adaptation-interference.cc +++ b/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 (__FILE__); cmd.AddValue ("manager", "PRC Manager", manager); cmd.AddValue ("rtsThreshold", "RTS threshold", rtsThreshold); cmd.AddValue ("outputFileName", "Output filename", outputFileName); diff --git a/examples/wireless/wifi-rate-adaptation-distance.cc b/examples/wireless/wifi-rate-adaptation-distance.cc index cdf617c34..ca171c50a 100644 --- a/examples/wireless/wifi-rate-adaptation-distance.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-simple-adhoc-grid.cc b/examples/wireless/wifi-simple-adhoc-grid.cc index 13e76b15d..397e828c8 100644 --- a/examples/wireless/wifi-simple-adhoc-grid.cc +++ b/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 (__FILE__); cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode); cmd.AddValue ("distance", "distance (m)", distance); cmd.AddValue ("packetSize", "size of application packet sent", packetSize); diff --git a/examples/wireless/wifi-simple-adhoc.cc b/examples/wireless/wifi-simple-adhoc.cc index af1803ea2..8f0d23404 100644 --- a/examples/wireless/wifi-simple-adhoc.cc +++ b/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 (__FILE__); cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode); cmd.AddValue ("rss", "received signal strength", rss); cmd.AddValue ("packetSize", "size of application packet sent", packetSize); diff --git a/examples/wireless/wifi-simple-ht-hidden-stations.cc b/examples/wireless/wifi-simple-ht-hidden-stations.cc index 1e76963d3..789276281 100644 --- a/examples/wireless/wifi-simple-ht-hidden-stations.cc +++ b/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 (__FILE__); cmd.AddValue ("nMpdus", "Number of aggregated MPDUs", nMpdus); cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize); cmd.AddValue ("enableRts", "Enable RTS/CTS", enableRts); diff --git a/examples/wireless/wifi-simple-infra.cc b/examples/wireless/wifi-simple-infra.cc index 2f08e66dd..7008241b0 100644 --- a/examples/wireless/wifi-simple-infra.cc +++ b/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 (__FILE__); cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode); cmd.AddValue ("rss", "received signal strength", rss); cmd.AddValue ("packetSize", "size of application packet sent", packetSize); diff --git a/examples/wireless/wifi-simple-interference.cc b/examples/wireless/wifi-simple-interference.cc index 8a7d83bf2..1c023d096 100644 --- a/examples/wireless/wifi-simple-interference.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-sleep.cc b/examples/wireless/wifi-sleep.cc index d2f331743..8503d46e5 100644 --- a/examples/wireless/wifi-sleep.cc +++ b/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 (__FILE__); cmd.AddValue ("dataRate", "Data rate", dataRate); cmd.AddValue ("packetSize", "size of application packet sent", packetSize); cmd.AddValue ("duration", "duration (seconds) of the experiment", duration); diff --git a/examples/wireless/wifi-spatial-reuse.cc b/examples/wireless/wifi-spatial-reuse.cc index f07cbd620..ba5190922 100644 --- a/examples/wireless/wifi-spatial-reuse.cc +++ b/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 (__FILE__); cmd.AddValue ("duration", "Duration of simulation (s)", duration); cmd.AddValue ("interval", "Inter packet interval (s)", interval); cmd.AddValue ("enableObssPd", "Enable/disable OBSS_PD", enableObssPd); diff --git a/examples/wireless/wifi-spectrum-per-example.cc b/examples/wireless/wifi-spectrum-per-example.cc index 6f4d7ff84..17188f003 100644 --- a/examples/wireless/wifi-spectrum-per-example.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-spectrum-per-interference.cc b/examples/wireless/wifi-spectrum-per-interference.cc index 195cf4541..7d738cde5 100644 --- a/examples/wireless/wifi-spectrum-per-interference.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-spectrum-saturation-example.cc b/examples/wireless/wifi-spectrum-saturation-example.cc index 7b70e65c3..39dc0d364 100644 --- a/examples/wireless/wifi-spectrum-saturation-example.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-tcp.cc b/examples/wireless/wifi-tcp.cc index 6e0f9e5ed..27dd47b2e 100644 --- a/examples/wireless/wifi-tcp.cc +++ b/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 (__FILE__); cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize); cmd.AddValue ("dataRate", "Application data ate", dataRate); cmd.AddValue ("tcpVariant", "Transport protocol to use: TcpNewReno, " diff --git a/examples/wireless/wifi-timing-attributes.cc b/examples/wireless/wifi-timing-attributes.cc index ee357755d..8542b310c 100644 --- a/examples/wireless/wifi-timing-attributes.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-txop-aggregation.cc b/examples/wireless/wifi-txop-aggregation.cc index 8f84698d4..2b384c1bc 100644 --- a/examples/wireless/wifi-txop-aggregation.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-vht-network.cc b/examples/wireless/wifi-vht-network.cc index 48a8d694a..3e65a64dc 100644 --- a/examples/wireless/wifi-vht-network.cc +++ b/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 (__FILE__); 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); diff --git a/examples/wireless/wifi-wired-bridging.cc b/examples/wireless/wifi-wired-bridging.cc index b26834c2e..a86f1d274 100644 --- a/examples/wireless/wifi-wired-bridging.cc +++ b/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 (__FILE__); 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); diff --git a/src/aodv/examples/aodv.cc b/src/aodv/examples/aodv.cc index 325e30662..eea918c78 100644 --- a/src/aodv/examples/aodv.cc +++ b/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 (__FILE__); cmd.AddValue ("pcap", "Write PCAP traces.", pcap); cmd.AddValue ("printRoutes", "Print routing table dumps.", printRoutes); diff --git a/src/applications/examples/three-gpp-http-example.cc b/src/applications/examples/three-gpp-http-example.cc index ce4df9bf9..55a21b111 100644 --- a/src/applications/examples/three-gpp-http-example.cc +++ b/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 (__FILE__); cmd.AddValue ("SimulationTime", "Length of simulation in seconds.", simTimeSec); cmd.Parse (argc, argv); diff --git a/src/bridge/examples/csma-bridge-one-hop.cc b/src/bridge/examples/csma-bridge-one-hop.cc index 814aa2078..9d47d0d6f 100644 --- a/src/bridge/examples/csma-bridge-one-hop.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); // diff --git a/src/bridge/examples/csma-bridge.cc b/src/bridge/examples/csma-bridge.cc index 86ee8ca70..ad4728fc8 100644 --- a/src/bridge/examples/csma-bridge.cc +++ b/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 (__FILE__); cmd.Parse (argc, argv); // diff --git a/src/brite/examples/brite-MPI-example.cc b/src/brite/examples/brite-MPI-example.cc index 6183905f7..cdd5deed2 100644 --- a/src/brite/examples/brite-MPI-example.cc +++ b/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 (__FILE__); 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); diff --git a/src/brite/examples/brite-generic-example.cc b/src/brite/examples/brite-generic-example.cc index e55014825..5026d73f7 100644 --- a/src/brite/examples/brite-generic-example.cc +++ b/src/brite/examples/brite-generic-example.cc @@ -46,7 +46,7 @@ main (int argc, char *argv[]) bool tracing = false; bool nix = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); 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); diff --git a/src/buildings/examples/buildings-pathloss-profiler.cc b/src/buildings/examples/buildings-pathloss-profiler.cc index 2b0560f0b..75a2b0ca9 100644 --- a/src/buildings/examples/buildings-pathloss-profiler.cc +++ b/src/buildings/examples/buildings-pathloss-profiler.cc @@ -41,7 +41,7 @@ main (int argc, char *argv[]) double hUe = 1.0; bool enbIndoor = false; bool ueIndoor = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue("hEnb", "Height of the eNB", hEnb); cmd.AddValue("hUe", "Height of UE", hUe); diff --git a/src/click/examples/nsclick-defines.cc b/src/click/examples/nsclick-defines.cc index e0c2cc3d3..15c51020b 100644 --- a/src/click/examples/nsclick-defines.cc +++ b/src/click/examples/nsclick-defines.cc @@ -32,7 +32,7 @@ main (int argc, char *argv[]) #ifdef NS3_CLICK std::string clickConfigFolder = "src/click/examples"; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("clickConfigFolder", "Base folder for click configuration files", clickConfigFolder); cmd.Parse (argc, argv); diff --git a/src/click/examples/nsclick-raw-wlan.cc b/src/click/examples/nsclick-raw-wlan.cc index 97b02f369..e0bf1c996 100644 --- a/src/click/examples/nsclick-raw-wlan.cc +++ b/src/click/examples/nsclick-raw-wlan.cc @@ -47,7 +47,7 @@ int main (int argc, char *argv[]) double rss = -80; std::string clickConfigFolder = "src/click/examples"; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("clickConfigFolder", "Base folder for click configuration files", clickConfigFolder); cmd.Parse (argc, argv); diff --git a/src/click/examples/nsclick-routing.cc b/src/click/examples/nsclick-routing.cc index febf667de..d463a3e86 100644 --- a/src/click/examples/nsclick-routing.cc +++ b/src/click/examples/nsclick-routing.cc @@ -49,7 +49,7 @@ main (int argc, char *argv[]) #ifdef NS3_CLICK std::string clickConfigFolder = "src/click/examples"; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("clickConfigFolder", "Base folder for click configuration files", clickConfigFolder); cmd.Parse (argc, argv); diff --git a/src/click/examples/nsclick-simple-lan.cc b/src/click/examples/nsclick-simple-lan.cc index e6332f0fa..ef023077f 100644 --- a/src/click/examples/nsclick-simple-lan.cc +++ b/src/click/examples/nsclick-simple-lan.cc @@ -45,7 +45,7 @@ int main (int argc, char *argv[]) #ifdef NS3_CLICK std::string clickConfigFolder = "src/click/examples"; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("clickConfigFolder", "Base folder for click configuration files", clickConfigFolder); cmd.Parse (argc, argv); diff --git a/src/click/examples/nsclick-udp-client-server-csma.cc b/src/click/examples/nsclick-udp-client-server-csma.cc index 41193a1d4..f34fc3fb2 100644 --- a/src/click/examples/nsclick-udp-client-server-csma.cc +++ b/src/click/examples/nsclick-udp-client-server-csma.cc @@ -51,7 +51,7 @@ main (int argc, char *argv[]) #ifdef NS3_CLICK std::string clickConfigFolder = "src/click/examples"; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("clickConfigFolder", "Base folder for click configuration files", clickConfigFolder); cmd.Parse (argc, argv); diff --git a/src/click/examples/nsclick-udp-client-server-wifi.cc b/src/click/examples/nsclick-udp-client-server-wifi.cc index f8c7005f6..6841fe222 100644 --- a/src/click/examples/nsclick-udp-client-server-wifi.cc +++ b/src/click/examples/nsclick-udp-client-server-wifi.cc @@ -73,7 +73,7 @@ main (int argc, char *argv[]) #ifdef NS3_CLICK std::string clickConfigFolder = "src/click/examples"; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("clickConfigFolder", "Base folder for click configuration files", clickConfigFolder); cmd.Parse (argc, argv); diff --git a/src/config-store/examples/config-store-save.cc b/src/config-store/examples/config-store-save.cc index 635872ed1..64e26aae6 100644 --- a/src/config-store/examples/config-store-save.cc +++ b/src/config-store/examples/config-store-save.cc @@ -40,7 +40,7 @@ NS_OBJECT_ENSURE_REGISTERED (ConfigExample); // int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); Config::SetDefault ("ns3::ConfigExample::TestInt16", IntegerValue (-5)); diff --git a/src/core/examples/command-line-example.cc b/src/core/examples/command-line-example.cc index 393a6637e..4085baf38 100644 --- a/src/core/examples/command-line-example.cc +++ b/src/core/examples/command-line-example.cc @@ -89,7 +89,7 @@ int main (int argc, char *argv[]) const int nonOpt2Def = nonOpt2; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Usage ("CommandLine example program.\n" "\n" "This little program demonstrates how to use CommandLine."); diff --git a/src/core/examples/hash-example.cc b/src/core/examples/hash-example.cc index 125989a5a..4ebaf8c1c 100644 --- a/src/core/examples/hash-example.cc +++ b/src/core/examples/hash-example.cc @@ -548,7 +548,7 @@ main (int argc, char *argv[]) bool timing = false; DictFiles files; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Usage ("Find hash collisions in the dictionary."); cmd.AddValue ("dict", "Dictionary file to hash", MakeCallback (&DictFiles::Add, diff --git a/src/core/examples/main-callback.cc b/src/core/examples/main-callback.cc index 7a9476906..b173698b4 100644 --- a/src/core/examples/main-callback.cc +++ b/src/core/examples/main-callback.cc @@ -71,7 +71,7 @@ public: int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); // return type: double diff --git a/src/core/examples/main-ptr.cc b/src/core/examples/main-ptr.cc index f7b6007e2..b08c22492 100644 --- a/src/core/examples/main-ptr.cc +++ b/src/core/examples/main-ptr.cc @@ -93,7 +93,7 @@ ClearPtr (void) int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); { diff --git a/src/core/examples/main-random-variable-stream.cc b/src/core/examples/main-random-variable-stream.cc index 685c53a8e..131d595ff 100644 --- a/src/core/examples/main-random-variable-stream.cc +++ b/src/core/examples/main-random-variable-stream.cc @@ -107,7 +107,7 @@ Histogram (Ptr rndvar, int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); unsigned int probes = 1000000; diff --git a/src/core/examples/main-test-sync.cc b/src/core/examples/main-test-sync.cc index ddda395bf..447d3244d 100644 --- a/src/core/examples/main-test-sync.cc +++ b/src/core/examples/main-test-sync.cc @@ -154,7 +154,7 @@ test (void) int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); while (true) diff --git a/src/core/examples/sample-log-time-format.cc b/src/core/examples/sample-log-time-format.cc index eaf51b48b..b605bd2d9 100644 --- a/src/core/examples/sample-log-time-format.cc +++ b/src/core/examples/sample-log-time-format.cc @@ -129,7 +129,7 @@ int main (int argc, char *argv[]) std::map resolutionMap = {{"Time::US", Time::US}, {"Time::NS", Time::NS}, {"Time::PS", Time::PS}, {"Time::FS", Time::FS}}; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("replaceTimePrinter", "replace time printing function", replaceTimePrinter); cmd.AddValue ("resolution", "time resolution", resolution); cmd.Parse (argc, argv); diff --git a/src/core/examples/sample-random-variable-stream.cc b/src/core/examples/sample-random-variable-stream.cc index 2b79aaa42..c00f1016f 100644 --- a/src/core/examples/sample-random-variable-stream.cc +++ b/src/core/examples/sample-random-variable-stream.cc @@ -59,7 +59,7 @@ using namespace ns3; int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); // SeedManager::SetRun (3); diff --git a/src/core/examples/sample-random-variable.cc b/src/core/examples/sample-random-variable.cc index 75eef2c5f..d38cf63f2 100644 --- a/src/core/examples/sample-random-variable.cc +++ b/src/core/examples/sample-random-variable.cc @@ -59,7 +59,7 @@ using namespace ns3; int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); // SeedManager::SetRun (3); diff --git a/src/core/examples/sample-show-progress.cc b/src/core/examples/sample-show-progress.cc index 86d303609..54bed86cd 100644 --- a/src/core/examples/sample-show-progress.cc +++ b/src/core/examples/sample-show-progress.cc @@ -158,7 +158,7 @@ main (int argc, char ** argv) Time wait = MilliSeconds (10); bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("stop", "Simulation duration in virtual time.", stop); cmd.AddValue ("interval", "Approximate reporting interval, in wall clock time.", interval); cmd.AddValue ("wait", "Wallclock time to burn on each event.", wait); diff --git a/src/core/examples/sample-simulator.cc b/src/core/examples/sample-simulator.cc index d5a558256..dbf23e49f 100644 --- a/src/core/examples/sample-simulator.cc +++ b/src/core/examples/sample-simulator.cc @@ -102,7 +102,7 @@ CancelledEvent (void) int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); MyModel model; diff --git a/src/core/model/command-line.cc b/src/core/model/command-line.cc index 496030146..b65e6d15e 100644 --- a/src/core/model/command-line.cc +++ b/src/core/model/command-line.cc @@ -352,7 +352,7 @@ CommandLine::PrintDoxygenUsage (void) const if (m_shortName.size () == 0) { - NS_FATAL_ERROR ("No file name on example-to-run; forgot to use COMMANDLINE (var)?"); + NS_FATAL_ERROR ("No file name on example-to-run; forgot to use CommandLine var (__FILE__)?"); return; } diff --git a/src/core/model/command-line.h b/src/core/model/command-line.h index 3c1e33c7e..8d0b35592 100644 --- a/src/core/model/command-line.h +++ b/src/core/model/command-line.h @@ -46,16 +46,6 @@ namespace ns3 { * The main entry point is CommandLine */ -/** - * \ingroup commandline - * \brief Declare a CommandLine instance. - * - * This form is preferred since it supports creating Doxygen - * documentation for programs from the CommandLine configuration. - */ -#define COMMANDLINE(var) \ - CommandLine var ( __FILE__ ) - /** * \ingroup commandline * \brief Parse command-line arguments @@ -143,7 +133,7 @@ namespace ns3 { * bool boolArg = false; * std::string strArg = "strArg default"; * - * COMMANDLINE (cmd); + * CommandLine cmd (__FILE__); * cmd.Usage ("CommandLine example program.\n" * "\n" * "This little program demonstrates how to use CommandLine."); @@ -204,7 +194,7 @@ namespace ns3 { * int value1; * int value2; * - * COMMANDLINE (cmd); + * CommandLine cmd (__FILE__); * cmd.Usage ("..."); * cmd.AddValue ("value1", "first value", value1); * cmd.AddValue ("value2", "second value", value1); @@ -221,10 +211,9 @@ namespace ns3 { * * Finally, note that for examples which will be run by \c test.py * the preferred declaration of a CommandLine instance is - * to use the \c COMMANDLINE macro to declare the instance name: * * \code - * COMMANDLINE (cmd); + * CommandLine cmd (__FILE__); * \endcode * This will ensure that the program usage and arguments can be added to * the Doxygen documentation automatically. @@ -236,11 +225,9 @@ public: CommandLine (void); /** * Construct and register the source file name. - * This would typically be called by using the \c COMMANDLINE macro: - * COMMANDLINE (cmd); + * This would typically be called by + * CommandLine cmd (__FILE__); * - * This is just syntactic sugar for - * COMMANDLINE cmd (__FILE__); * This form is required to generate Doxygen documentation of the * arguments and options. */ @@ -390,7 +377,7 @@ public: * * Alternatively, an overloaded operator << can be used: * \code - * COMMANDLINE (cmd); + * CommandLine cmd (__FILE__); * cmd.Parse (argc, argv); * ... * @@ -705,7 +692,7 @@ CommandLineHelper::UserItemParse (const std::string value, T & val) * * Example usage: * \code - * COMMANDLINE (cmd); + * CommandLine cmd (__FILE__); * cmd.Parse (argc, argv); * ... * diff --git a/src/create-module.py b/src/create-module.py index 9aa1e38fa..f7f469739 100755 --- a/src/create-module.py +++ b/src/create-module.py @@ -125,7 +125,7 @@ main (int argc, char *argv[]) { bool verbose = true; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "Tell application to log if true", verbose); cmd.Parse (argc,argv); diff --git a/src/csma-layout/examples/csma-star.cc b/src/csma-layout/examples/csma-star.cc index 19384da3c..9caeac134 100644 --- a/src/csma-layout/examples/csma-star.cc +++ b/src/csma-layout/examples/csma-star.cc @@ -65,7 +65,7 @@ main (int argc, char *argv[]) Ipv6Address ipv6AddressBase = Ipv6Address("2001::"); Ipv6Prefix ipv6AddressPrefix = Ipv6Prefix(64); - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("nSpokes", "Number of spoke nodes to place in the star", nSpokes); cmd.AddValue ("useIpv6", "Use Ipv6", useIpv6); cmd.Parse (argc, argv); diff --git a/src/csma/examples/csma-broadcast.cc b/src/csma/examples/csma-broadcast.cc index 522114457..95b47b6b7 100644 --- a/src/csma/examples/csma-broadcast.cc +++ b/src/csma/examples/csma-broadcast.cc @@ -54,7 +54,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 (__FILE__); cmd.Parse (argc, argv); NS_LOG_INFO ("Create nodes."); diff --git a/src/csma/examples/csma-multicast.cc b/src/csma/examples/csma-multicast.cc index 1317dc5cc..211d199ae 100644 --- a/src/csma/examples/csma-multicast.cc +++ b/src/csma/examples/csma-multicast.cc @@ -59,7 +59,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 (__FILE__); cmd.Parse (argc, argv); NS_LOG_INFO ("Create nodes."); diff --git a/src/csma/examples/csma-one-subnet.cc b/src/csma/examples/csma-one-subnet.cc index cd0d10bab..17df91b93 100644 --- a/src/csma/examples/csma-one-subnet.cc +++ b/src/csma/examples/csma-one-subnet.cc @@ -52,7 +52,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 (__FILE__); cmd.Parse (argc, argv); // // Explicitly create the nodes required by the topology (shown above). diff --git a/src/csma/examples/csma-packet-socket.cc b/src/csma/examples/csma-packet-socket.cc index 8f1ccdd3b..7b92dec5b 100644 --- a/src/csma/examples/csma-packet-socket.cc +++ b/src/csma/examples/csma-packet-socket.cc @@ -56,7 +56,7 @@ main (int argc, char *argv[]) LogComponentEnable ("CsmaPacketSocketExample", LOG_LEVEL_INFO); #endif - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); g_os.open ("csma-packet-socket-sink.tr",std::ios_base::binary | std::ios_base::out); diff --git a/src/csma/examples/csma-ping.cc b/src/csma/examples/csma-ping.cc index a1ff4bd36..6a94fc218 100644 --- a/src/csma/examples/csma-ping.cc +++ b/src/csma/examples/csma-ping.cc @@ -53,7 +53,7 @@ int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); // Here, we will explicitly create four nodes. diff --git a/src/csma/examples/csma-raw-ip-socket.cc b/src/csma/examples/csma-raw-ip-socket.cc index 4c056981b..39e3b2d45 100644 --- a/src/csma/examples/csma-raw-ip-socket.cc +++ b/src/csma/examples/csma-raw-ip-socket.cc @@ -56,7 +56,7 @@ main (int argc, char *argv[]) LogComponentEnable ("CsmaPacketSocketExample", LOG_LEVEL_INFO); #endif uint32_t dataRate = 10; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("dataRate", "application dataRate (Kb/s)", dataRate); cmd.Parse (argc, argv); diff --git a/src/dsdv/examples/dsdv-manet.cc b/src/dsdv/examples/dsdv-manet.cc index 1f1c908d4..b8b9fe6a8 100644 --- a/src/dsdv/examples/dsdv-manet.cc +++ b/src/dsdv/examples/dsdv-manet.cc @@ -152,7 +152,7 @@ int main (int argc, char **argv) bool printRoutingTable = true; std::string CSVfileName = "DsdvManetExample.csv"; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("nWifis", "Number of wifi nodes[Default:30]", nWifis); cmd.AddValue ("nSinks", "Number of wifi sink nodes[Default:10]", nSinks); cmd.AddValue ("totalTime", "Total Simulation time[Default:100]", totalTime); diff --git a/src/dsr/examples/dsr.cc b/src/dsr/examples/dsr.cc index 0405600e3..f003e8554 100644 --- a/src/dsr/examples/dsr.cc +++ b/src/dsr/examples/dsr.cc @@ -94,7 +94,7 @@ main (int argc, char *argv[]) std::string phyMode ("DsssRate11Mbps"); //Allow users to override the default parameters and set it to new ones from CommandLine. - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("nWifis", "Number of wifi nodes", nWifis); cmd.AddValue ("nSinks", "Number of SINK traffic nodes", nSinks); cmd.AddValue ("rate", "CBR traffic rate(in kbps), Default:8", rate); diff --git a/src/energy/examples/li-ion-energy-source.cc b/src/energy/examples/li-ion-energy-source.cc index e0a104320..d654916b4 100644 --- a/src/energy/examples/li-ion-energy-source.cc +++ b/src/energy/examples/li-ion-energy-source.cc @@ -61,7 +61,7 @@ PrintCellInfo (Ptr es) int main (int argc, char **argv) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); // uncomment below to see the energy consumption details diff --git a/src/energy/examples/rv-battery-model-test.cc b/src/energy/examples/rv-battery-model-test.cc index 554b63f1c..9cff48679 100644 --- a/src/energy/examples/rv-battery-model-test.cc +++ b/src/energy/examples/rv-battery-model-test.cc @@ -637,7 +637,7 @@ BatteryLifetimeTest::CreateLoadProfiles (void) int main (int argc, char **argv) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); NS_LOG_DEBUG ("Constant load run."); diff --git a/src/fd-net-device/examples/dummy-network.cc b/src/fd-net-device/examples/dummy-network.cc index 91b14c6df..cb55a37cc 100644 --- a/src/fd-net-device/examples/dummy-network.cc +++ b/src/fd-net-device/examples/dummy-network.cc @@ -35,7 +35,7 @@ NS_LOG_COMPONENT_DEFINE ("DummyNetworkExample"); int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); NodeContainer nodes; diff --git a/src/fd-net-device/examples/fd-emu-onoff.cc b/src/fd-net-device/examples/fd-emu-onoff.cc index 856f4c402..901bb71f0 100644 --- a/src/fd-net-device/examples/fd-emu-onoff.cc +++ b/src/fd-net-device/examples/fd-emu-onoff.cc @@ -106,7 +106,7 @@ main (int argc, char *argv[]) std::string macClient ("00:00:00:00:00:01"); std::string macServer ("00:00:00:00:00:02"); - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("deviceName", "Device name", deviceName); cmd.AddValue ("client", "Local IP address (dotted decimal only please)", client); cmd.AddValue ("server", "Remote IP address (dotted decimal only please)", server); diff --git a/src/fd-net-device/examples/fd-emu-ping.cc b/src/fd-net-device/examples/fd-emu-ping.cc index d333c36ce..a47eaef86 100644 --- a/src/fd-net-device/examples/fd-emu-ping.cc +++ b/src/fd-net-device/examples/fd-emu-ping.cc @@ -98,7 +98,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 (__FILE__); cmd.AddValue ("deviceName", "Device name", deviceName); cmd.AddValue ("remote", "Remote IP address (dotted decimal only please)", remote); cmd.Parse (argc, argv); diff --git a/src/fd-net-device/examples/fd-emu-udp-echo.cc b/src/fd-net-device/examples/fd-emu-udp-echo.cc index 5179678e9..ceb828052 100644 --- a/src/fd-net-device/examples/fd-emu-udp-echo.cc +++ b/src/fd-net-device/examples/fd-emu-udp-echo.cc @@ -97,7 +97,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 (__FILE__); cmd.AddValue ("client", "client mode", clientMode); cmd.AddValue ("server", "server mode", serverMode); cmd.AddValue ("deviceName", "device name", deviceName); diff --git a/src/fd-net-device/examples/fd-planetlab-ping.cc b/src/fd-net-device/examples/fd-planetlab-ping.cc index 50b8e527a..056084e80 100644 --- a/src/fd-net-device/examples/fd-planetlab-ping.cc +++ b/src/fd-net-device/examples/fd-planetlab-ping.cc @@ -90,7 +90,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 (__FILE__); cmd.AddValue ("remote", "Remote IP address (dotted decimal only please)", remote); cmd.AddValue ("tapNetwork", "Network address to assign the TAP device IP address (dotted decimal only please). Note that the network address must be that from the vsys_vnet tag which must exist in your PlanetLab slice.", network); cmd.AddValue ("tapMask", "Network mask for configure the TAP device (dotted decimal only please)", mask); diff --git a/src/fd-net-device/examples/fd-tap-ping.cc b/src/fd-net-device/examples/fd-tap-ping.cc index bb5a9d2bc..599fccc54 100644 --- a/src/fd-net-device/examples/fd-tap-ping.cc +++ b/src/fd-net-device/examples/fd-tap-ping.cc @@ -103,7 +103,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 (__FILE__); cmd.AddValue ("deviceName", "Device name", deviceName); cmd.AddValue ("remote", "Remote IP address (dotted decimal only please)", remote); cmd.AddValue ("tapNetwork", "Network address to assign the TAP device IP address (dotted decimal only please)", network); diff --git a/src/fd-net-device/examples/fd-tap-ping6.cc b/src/fd-net-device/examples/fd-tap-ping6.cc index 2274e68c2..0d13d7c90 100644 --- a/src/fd-net-device/examples/fd-tap-ping6.cc +++ b/src/fd-net-device/examples/fd-tap-ping6.cc @@ -60,7 +60,7 @@ NS_LOG_COMPONENT_DEFINE ("TAPPing6Example"); int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); NS_LOG_INFO ("Ping6 Emulation Example with TAP"); diff --git a/src/fd-net-device/examples/fd2fd-onoff.cc b/src/fd-net-device/examples/fd2fd-onoff.cc index 4b328787e..f0d839b72 100644 --- a/src/fd-net-device/examples/fd2fd-onoff.cc +++ b/src/fd-net-device/examples/fd2fd-onoff.cc @@ -61,7 +61,7 @@ main (int argc, char *argv[]) // Command-line arguments // bool tcpMode = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("tcpMode", "1:true, 0:false, default mode UDP",tcpMode); cmd.Parse (argc, argv); diff --git a/src/fd-net-device/examples/realtime-dummy-network.cc b/src/fd-net-device/examples/realtime-dummy-network.cc index 5f0bab3de..57dd7d72f 100644 --- a/src/fd-net-device/examples/realtime-dummy-network.cc +++ b/src/fd-net-device/examples/realtime-dummy-network.cc @@ -35,7 +35,7 @@ NS_LOG_COMPONENT_DEFINE ("RealtimeDummyNetworkExample"); int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); GlobalValue::Bind ("SimulatorImplementationType", StringValue ("ns3::RealtimeSimulatorImpl")); diff --git a/src/fd-net-device/examples/realtime-fd2fd-onoff.cc b/src/fd-net-device/examples/realtime-fd2fd-onoff.cc index e2ae56cc4..935f2fe11 100644 --- a/src/fd-net-device/examples/realtime-fd2fd-onoff.cc +++ b/src/fd-net-device/examples/realtime-fd2fd-onoff.cc @@ -56,7 +56,7 @@ NS_LOG_COMPONENT_DEFINE ("RealtimeFdNetDeviceSaturationExample"); int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); uint16_t sinkPort = 8000; diff --git a/src/internet-apps/examples/dhcp-example.cc b/src/internet-apps/examples/dhcp-example.cc index 4c8a8f471..c18b91158 100644 --- a/src/internet-apps/examples/dhcp-example.cc +++ b/src/internet-apps/examples/dhcp-example.cc @@ -36,7 +36,7 @@ NS_LOG_COMPONENT_DEFINE ("DhcpExample"); int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); bool verbose = false; bool tracing = false; diff --git a/src/internet-apps/examples/traceroute-example.cc b/src/internet-apps/examples/traceroute-example.cc index 6695ec021..38c53ae1d 100644 --- a/src/internet-apps/examples/traceroute-example.cc +++ b/src/internet-apps/examples/traceroute-example.cc @@ -131,7 +131,7 @@ TracerouteExample::Configure (int argc, char **argv) // LogComponentEnable("AodvRoutingProtocol", LOG_LEVEL_ALL); SeedManager::SetSeed (12345); - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("pcap", "Write PCAP traces.", pcap); cmd.AddValue ("printRoutes", "Print routing table dumps.", printRoutes); diff --git a/src/internet/examples/main-simple.cc b/src/internet/examples/main-simple.cc index 1d4704046..b4d1f5c0c 100644 --- a/src/internet/examples/main-simple.cc +++ b/src/internet/examples/main-simple.cc @@ -87,7 +87,7 @@ RunSimulation (void) int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); RunSimulation (); diff --git a/src/lr-wpan/examples/lr-wpan-data.cc b/src/lr-wpan/examples/lr-wpan-data.cc index 44fd6e612..371669355 100644 --- a/src/lr-wpan/examples/lr-wpan-data.cc +++ b/src/lr-wpan/examples/lr-wpan-data.cc @@ -61,7 +61,7 @@ int main (int argc, char *argv[]) bool verbose = false; bool extended = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "turn on all log components", verbose); cmd.AddValue ("extended", "use extended addressing", extended); diff --git a/src/lr-wpan/examples/lr-wpan-error-distance-plot.cc b/src/lr-wpan/examples/lr-wpan-error-distance-plot.cc index c8365f45d..011ee08ea 100644 --- a/src/lr-wpan/examples/lr-wpan-error-distance-plot.cc +++ b/src/lr-wpan/examples/lr-wpan-error-distance-plot.cc @@ -77,7 +77,7 @@ int main (int argc, char *argv[]) double txPower = 0; uint32_t channelNumber = 11; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("txPower", "transmit power (dBm)", txPower); cmd.AddValue ("packetSize", "packet (MSDU) size (bytes)", packetSize); diff --git a/src/lr-wpan/examples/lr-wpan-phy-test.cc b/src/lr-wpan/examples/lr-wpan-phy-test.cc index 6aa49daa8..7a12d1626 100644 --- a/src/lr-wpan/examples/lr-wpan-phy-test.cc +++ b/src/lr-wpan/examples/lr-wpan-phy-test.cc @@ -55,7 +55,7 @@ void SendOnePacket (Ptr sender, Ptr receiver) int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); LogComponentEnableAll (LOG_PREFIX_FUNC); diff --git a/src/lte/doc/source/lte-user.rst b/src/lte/doc/source/lte-user.rst index 2174b0819..9ecee89cb 100644 --- a/src/lte/doc/source/lte-user.rst +++ b/src/lte/doc/source/lte-user.rst @@ -152,7 +152,7 @@ how to do it using input files together with the ns-3 ConfigStore. First of all, you need to put the following in your simulation program, right after ``main ()`` starts:: - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); ConfigStore inputConfig; inputConfig.ConfigureDefaults (); diff --git a/src/lte/examples/lena-cc-helper.cc b/src/lte/examples/lena-cc-helper.cc index 782df22dc..6dd61b97b 100644 --- a/src/lte/examples/lena-cc-helper.cc +++ b/src/lte/examples/lena-cc-helper.cc @@ -32,7 +32,7 @@ void Print ( ComponentCarrier cc); int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); Config::SetDefault ("ns3::ComponentCarrier::UlBandwidth", UintegerValue (50)); diff --git a/src/lte/examples/lena-cqi-threshold.cc b/src/lte/examples/lena-cqi-threshold.cc index 099d7155d..a328c533c 100644 --- a/src/lte/examples/lena-cqi-threshold.cc +++ b/src/lte/examples/lena-cqi-threshold.cc @@ -63,7 +63,7 @@ ChangePosition (Ptr node) int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); // to save a template default attribute file run it like this: diff --git a/src/lte/examples/lena-deactivate-bearer.cc b/src/lte/examples/lena-deactivate-bearer.cc index be40119f6..be802252f 100644 --- a/src/lte/examples/lena-deactivate-bearer.cc +++ b/src/lte/examples/lena-deactivate-bearer.cc @@ -50,7 +50,7 @@ main (int argc, char *argv[]) double interPacketInterval = 100; // Command line arguments - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("numberOfNodes", "Number of eNodeBs + UE pairs", numberOfNodes); cmd.AddValue ("simTime", "Total duration of the simulation [s])", simTime); cmd.AddValue ("distance", "Distance between eNBs [m]", distance); diff --git a/src/lte/examples/lena-distributed-ffr.cc b/src/lte/examples/lena-distributed-ffr.cc index 6b69a12e4..dc5e933b1 100644 --- a/src/lte/examples/lena-distributed-ffr.cc +++ b/src/lte/examples/lena-distributed-ffr.cc @@ -116,7 +116,7 @@ int main (int argc, char *argv[]) Box macroUeBox = Box (-distance * 0.5, distance * 1.5, -distance * 0.5, distance * 1.5, 1.5, 1.5); // Command line arguments - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("numberOfUes", "Number of UEs", numberOfRandomUes); cmd.AddValue ("simTime", "Total duration of the simulation (in seconds)", simTime); cmd.AddValue ("generateSpectrumTrace", "if true, will generate a Spectrum Analyzer trace", generateSpectrumTrace); diff --git a/src/lte/examples/lena-dual-stripe.cc b/src/lte/examples/lena-dual-stripe.cc index 049e668cd..f2f9e664e 100644 --- a/src/lte/examples/lena-dual-stripe.cc +++ b/src/lte/examples/lena-dual-stripe.cc @@ -382,7 +382,7 @@ main (int argc, char *argv[]) Config::SetDefault ("ns3::UdpClient::MaxPackets", UintegerValue (1000000)); Config::SetDefault ("ns3::LteRlcUm::MaxTxBufferSize", UintegerValue (10 * 1024)); - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); ConfigStore inputConfig; inputConfig.ConfigureDefaults (); diff --git a/src/lte/examples/lena-fading.cc b/src/lte/examples/lena-fading.cc index 7929fd9af..3a6b09c49 100644 --- a/src/lte/examples/lena-fading.cc +++ b/src/lte/examples/lena-fading.cc @@ -33,7 +33,7 @@ using namespace ns3; int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); // to save a template default attribute file run it like this: diff --git a/src/lte/examples/lena-frequency-reuse.cc b/src/lte/examples/lena-frequency-reuse.cc index 3f676c44e..9fda6947c 100644 --- a/src/lte/examples/lena-frequency-reuse.cc +++ b/src/lte/examples/lena-frequency-reuse.cc @@ -112,7 +112,7 @@ int main (int argc, char *argv[]) Box macroUeBox = Box (-distance * 0.5, distance * 1.5, -distance * 0.5, distance * 1.5, 1.5, 1.5); // Command line arguments - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("numberOfUes", "Number of random UEs", numberOfRandomUes); cmd.AddValue ("simTime", "Total duration of the simulation (in seconds)", simTime); cmd.AddValue ("generateSpectrumTrace", "if true, will generate a Spectrum Analyzer trace", generateSpectrumTrace); diff --git a/src/lte/examples/lena-intercell-interference.cc b/src/lte/examples/lena-intercell-interference.cc index dc6120422..fe5b7ef3c 100644 --- a/src/lte/examples/lena-intercell-interference.cc +++ b/src/lte/examples/lena-intercell-interference.cc @@ -44,7 +44,7 @@ int main (int argc, char *argv[]) uint32_t numUes = 1; double simTime = 1.0; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("enbDist", "distance between the two eNBs", enbDist); cmd.AddValue ("radius", "the radius of the disc where UEs are placed around an eNB", radius); cmd.AddValue ("numUes", "how many UEs are attached to each eNB", numUes); diff --git a/src/lte/examples/lena-ipv6-addr-conf.cc b/src/lte/examples/lena-ipv6-addr-conf.cc index 5bc6445c1..4eeff337a 100644 --- a/src/lte/examples/lena-ipv6-addr-conf.cc +++ b/src/lte/examples/lena-ipv6-addr-conf.cc @@ -44,7 +44,7 @@ NS_LOG_COMPONENT_DEFINE ("EpcFirstExampleForIpv6"); int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); Ptr lteHelper = CreateObject (); diff --git a/src/lte/examples/lena-ipv6-ue-rh.cc b/src/lte/examples/lena-ipv6-ue-rh.cc index 3ba7179ba..c2121fd5d 100644 --- a/src/lte/examples/lena-ipv6-ue-rh.cc +++ b/src/lte/examples/lena-ipv6-ue-rh.cc @@ -43,7 +43,7 @@ NS_LOG_COMPONENT_DEFINE ("EpcFirstExampleForIpv6"); int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); Ptr lteHelper = CreateObject (); diff --git a/src/lte/examples/lena-ipv6-ue-ue.cc b/src/lte/examples/lena-ipv6-ue-ue.cc index 9d5c5862d..53aeaccdc 100644 --- a/src/lte/examples/lena-ipv6-ue-ue.cc +++ b/src/lte/examples/lena-ipv6-ue-ue.cc @@ -44,7 +44,7 @@ NS_LOG_COMPONENT_DEFINE ("EpcSecondExampleForIpv6"); int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); Ptr lteHelper = CreateObject (); diff --git a/src/lte/examples/lena-pathloss-traces.cc b/src/lte/examples/lena-pathloss-traces.cc index dfe069809..15677697a 100644 --- a/src/lte/examples/lena-pathloss-traces.cc +++ b/src/lte/examples/lena-pathloss-traces.cc @@ -45,7 +45,7 @@ int main (int argc, char *argv[]) uint32_t numUes = 1; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("enbDist", "distance between the two eNBs", enbDist); cmd.AddValue ("radius", "the radius of the disc where UEs are placed around an eNB", radius); cmd.AddValue ("numUes", "how many UEs are attached to each eNB", numUes); diff --git a/src/lte/examples/lena-profiling.cc b/src/lte/examples/lena-profiling.cc index 91a923ee1..3fd01a4c1 100644 --- a/src/lte/examples/lena-profiling.cc +++ b/src/lte/examples/lena-profiling.cc @@ -38,7 +38,7 @@ main (int argc, char *argv[]) uint32_t nUe = 1; uint32_t nFloors = 0; double simTime = 1.0; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("nEnb", "Number of eNodeBs per floor", nEnbPerFloor); cmd.AddValue ("nUe", "Number of UEs", nUe); diff --git a/src/lte/examples/lena-radio-link-failure.cc b/src/lte/examples/lena-radio-link-failure.cc index aec9a5515..f1b5c766b 100644 --- a/src/lte/examples/lena-radio-link-failure.cc +++ b/src/lte/examples/lena-radio-link-failure.cc @@ -276,7 +276,7 @@ main (int argc, char *argv[]) bool enableDataErrorModel = true; bool enableNsLogs = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("simTime", "Total duration of the simulation (in seconds)", simTime); cmd.AddValue ("numberOfEnbs", "Number of eNBs", numberOfEnbs); cmd.AddValue ("n311", "Number of in-synch indication", n311); diff --git a/src/lte/examples/lena-rem-sector-antenna.cc b/src/lte/examples/lena-rem-sector-antenna.cc index fcdde7c4f..614a219bd 100644 --- a/src/lte/examples/lena-rem-sector-antenna.cc +++ b/src/lte/examples/lena-rem-sector-antenna.cc @@ -37,7 +37,7 @@ using std::vector; int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); ConfigStore inputConfig; diff --git a/src/lte/examples/lena-rem.cc b/src/lte/examples/lena-rem.cc index e4066b9bc..e3dbcf445 100644 --- a/src/lte/examples/lena-rem.cc +++ b/src/lte/examples/lena-rem.cc @@ -33,7 +33,7 @@ using namespace ns3; int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); // to save a template default attribute file run it like this: diff --git a/src/lte/examples/lena-rlc-traces.cc b/src/lte/examples/lena-rlc-traces.cc index 6e6403bcb..01d46a76e 100644 --- a/src/lte/examples/lena-rlc-traces.cc +++ b/src/lte/examples/lena-rlc-traces.cc @@ -31,7 +31,7 @@ using namespace ns3; int main (int argc, char *argv[]) { // Command line arguments - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); ConfigStore inputConfig; diff --git a/src/lte/examples/lena-simple-epc-backhaul.cc b/src/lte/examples/lena-simple-epc-backhaul.cc index cfb868287..89c86e9c5 100644 --- a/src/lte/examples/lena-simple-epc-backhaul.cc +++ b/src/lte/examples/lena-simple-epc-backhaul.cc @@ -60,7 +60,7 @@ main (int argc, char *argv[]) bool useHelper = false; // Command line arguments - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("numNodePairs", "Number of eNodeBs + UE pairs", numNodePairs); cmd.AddValue ("simTime", "Total duration of the simulation", simTime); cmd.AddValue ("distance", "Distance between eNBs [m]", distance); diff --git a/src/lte/examples/lena-simple-epc-emu.cc b/src/lte/examples/lena-simple-epc-emu.cc index 376566438..3118cdb71 100644 --- a/src/lte/examples/lena-simple-epc-emu.cc +++ b/src/lte/examples/lena-simple-epc-emu.cc @@ -55,7 +55,7 @@ main (int argc, char *argv[]) double interPacketInterval = 1000; // Command line arguments - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue("nEnbs", "Number of eNBs", nEnbs); cmd.AddValue("nUesPerEnb", "Number of UEs per eNB", nUesPerEnb); cmd.AddValue("simTime", "Total duration of the simulation [s])", simTime); diff --git a/src/lte/examples/lena-simple-epc.cc b/src/lte/examples/lena-simple-epc.cc index 88f5ec26f..f9f18c27a 100644 --- a/src/lte/examples/lena-simple-epc.cc +++ b/src/lte/examples/lena-simple-epc.cc @@ -51,7 +51,7 @@ main (int argc, char *argv[]) bool disablePl = false; // Command line arguments - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("numNodePairs", "Number of eNodeBs + UE pairs", numNodePairs); cmd.AddValue ("simTime", "Total duration of the simulation", simTime); cmd.AddValue ("distance", "Distance between eNBs [m]", distance); diff --git a/src/lte/examples/lena-simple.cc b/src/lte/examples/lena-simple.cc index 45a76c118..2c6d63ea0 100644 --- a/src/lte/examples/lena-simple.cc +++ b/src/lte/examples/lena-simple.cc @@ -33,7 +33,7 @@ int main (int argc, char *argv[]) Time simTime = MilliSeconds (1050); bool useCa = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("simTime", "Total duration of the simulation", simTime); cmd.AddValue ("useCa", "Whether to use carrier aggregation.", useCa); cmd.Parse (argc, argv); diff --git a/src/lte/examples/lena-uplink-power-control.cc b/src/lte/examples/lena-uplink-power-control.cc index d3e04a353..ddc19f39e 100644 --- a/src/lte/examples/lena-uplink-power-control.cc +++ b/src/lte/examples/lena-uplink-power-control.cc @@ -45,7 +45,7 @@ int main (int argc, char *argv[]) Config::SetDefault ("ns3::LteUePowerControl::AccumulationEnabled", BooleanValue (true)); Config::SetDefault ("ns3::LteUePowerControl::Alpha", DoubleValue (1.0)); - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); Ptr lteHelper = CreateObject (); diff --git a/src/lte/examples/lena-x2-handover-measures.cc b/src/lte/examples/lena-x2-handover-measures.cc index ccb21966e..364e1a127 100644 --- a/src/lte/examples/lena-x2-handover-measures.cc +++ b/src/lte/examples/lena-x2-handover-measures.cc @@ -158,7 +158,7 @@ main (int argc, char *argv[]) Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue (true)); // Command line arguments - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("simTime", "Total duration of the simulation (in seconds)", simTime); cmd.AddValue ("speed", "Speed of the UE (default = 20 m/s)", speed); cmd.AddValue ("enbTxPowerDbm", "TX power [dBm] used by HeNBs (default = 46.0)", enbTxPowerDbm); diff --git a/src/lte/examples/lena-x2-handover.cc b/src/lte/examples/lena-x2-handover.cc index ce58ce8aa..a61f731cb 100644 --- a/src/lte/examples/lena-x2-handover.cc +++ b/src/lte/examples/lena-x2-handover.cc @@ -153,7 +153,7 @@ main (int argc, char *argv[]) Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue (false)); // Command line arguments - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("numberOfUes", "Number of UEs", numberOfUes); cmd.AddValue ("numberOfEnbs", "Number of eNodeBs", numberOfEnbs); cmd.AddValue ("simTime", "Total duration of the simulation", simTime); diff --git a/src/mesh/examples/mesh.cc b/src/mesh/examples/mesh.cc index bb594c04b..ac2d8d318 100644 --- a/src/mesh/examples/mesh.cc +++ b/src/mesh/examples/mesh.cc @@ -131,7 +131,7 @@ MeshTest::MeshTest () : void MeshTest::Configure (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("x-size", "Number of nodes in a row grid", m_xSize); cmd.AddValue ("y-size", "Number of rows in a grid", m_ySize); cmd.AddValue ("step", "Size of edge in our grid (meters)", m_step); diff --git a/src/mobility/examples/bonnmotion-ns2-example.cc b/src/mobility/examples/bonnmotion-ns2-example.cc index e601532e2..9828b8894 100644 --- a/src/mobility/examples/bonnmotion-ns2-example.cc +++ b/src/mobility/examples/bonnmotion-ns2-example.cc @@ -67,7 +67,7 @@ int main (int argc, char *argv[]) double deltaTime = 100; std::string traceFile = "src/mobility/examples/bonnmotion.ns_movements"; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("traceFile", "Ns2 movement trace file", traceFile); cmd.AddValue ("deltaTime", "time interval (s) between updates (default 100)", deltaTime); cmd.Parse (argc, argv); diff --git a/src/mobility/examples/main-grid-topology.cc b/src/mobility/examples/main-grid-topology.cc index 39ddaac8b..e2ee5af38 100644 --- a/src/mobility/examples/main-grid-topology.cc +++ b/src/mobility/examples/main-grid-topology.cc @@ -25,7 +25,7 @@ using namespace ns3; int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); NodeContainer nodes; diff --git a/src/mobility/examples/main-random-topology.cc b/src/mobility/examples/main-random-topology.cc index 79e480c37..51524e395 100644 --- a/src/mobility/examples/main-random-topology.cc +++ b/src/mobility/examples/main-random-topology.cc @@ -32,7 +32,7 @@ CourseChange (std::string context, Ptr position) int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); diff --git a/src/mobility/examples/main-random-walk.cc b/src/mobility/examples/main-random-walk.cc index 0f56921eb..917b92826 100644 --- a/src/mobility/examples/main-random-walk.cc +++ b/src/mobility/examples/main-random-walk.cc @@ -38,7 +38,7 @@ int main (int argc, char *argv[]) Config::SetDefault ("ns3::RandomWalk2dMobilityModel::Speed", StringValue ("ns3::ConstantRandomVariable[Constant=1.0]")); Config::SetDefault ("ns3::RandomWalk2dMobilityModel::Bounds", StringValue ("0|200|0|200")); - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); NodeContainer c; diff --git a/src/mobility/examples/mobility-trace-example.cc b/src/mobility/examples/mobility-trace-example.cc index 656457ef1..fc2b88265 100644 --- a/src/mobility/examples/mobility-trace-example.cc +++ b/src/mobility/examples/mobility-trace-example.cc @@ -26,7 +26,7 @@ using namespace ns3; int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); NodeContainer sta; diff --git a/src/mobility/examples/ns2-mobility-trace.cc b/src/mobility/examples/ns2-mobility-trace.cc index b509af7f4..eb892e38b 100644 --- a/src/mobility/examples/ns2-mobility-trace.cc +++ b/src/mobility/examples/ns2-mobility-trace.cc @@ -83,7 +83,7 @@ int main (int argc, char *argv[]) LogComponentEnable ("Ns2MobilityHelper",LOG_LEVEL_DEBUG); // Parse command line attribute - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("traceFile", "Ns2 movement trace file", traceFile); cmd.AddValue ("nodeNum", "Number of nodes", nodeNum); cmd.AddValue ("duration", "Duration of Simulation", duration); diff --git a/src/mpi/examples/nms-p2p-nix-distributed.cc b/src/mpi/examples/nms-p2p-nix-distributed.cc index 9e7647c98..ddd69088e 100644 --- a/src/mpi/examples/nms-p2p-nix-distributed.cc +++ b/src/mpi/examples/nms-p2p-nix-distributed.cc @@ -91,7 +91,7 @@ main (int argc, char *argv[]) int nBytes = 500000; // Bytes for each on/off app bool nix = true; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("CN", "Number of total CNs [2]", nCN); cmd.AddValue ("LAN", "Number of nodes per LAN [42]", nLANClients); cmd.AddValue ("single", "1 if use single flow", single); diff --git a/src/mpi/examples/simple-distributed-empty-node.cc b/src/mpi/examples/simple-distributed-empty-node.cc index 831989489..f478795c1 100644 --- a/src/mpi/examples/simple-distributed-empty-node.cc +++ b/src/mpi/examples/simple-distributed-empty-node.cc @@ -85,7 +85,7 @@ main (int argc, char *argv[]) bool tracing = false; // Parse command line - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("nix", "Enable the use of nix-vector or global routing", nix); cmd.AddValue ("nullmsg", "Enable the use of null-message synchronization", nullmsg); cmd.AddValue ("tracing", "Enable pcap tracing", tracing); diff --git a/src/mpi/examples/simple-distributed.cc b/src/mpi/examples/simple-distributed.cc index 9e03fd035..3c82739d9 100644 --- a/src/mpi/examples/simple-distributed.cc +++ b/src/mpi/examples/simple-distributed.cc @@ -70,7 +70,7 @@ main (int argc, char *argv[]) bool tracing = false; // Parse command line - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("nix", "Enable the use of nix-vector or global routing", nix); cmd.AddValue ("nullmsg", "Enable the use of null-message synchronization", nullmsg); cmd.AddValue ("tracing", "Enable pcap tracing", tracing); diff --git a/src/mpi/examples/third-distributed.cc b/src/mpi/examples/third-distributed.cc index 97cbe8652..a7c4821cf 100644 --- a/src/mpi/examples/third-distributed.cc +++ b/src/mpi/examples/third-distributed.cc @@ -54,7 +54,7 @@ main (int argc, char *argv[]) bool tracing = false; bool nullmsg = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); 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); diff --git a/src/netanim/examples/colors-link-description.cc b/src/netanim/examples/colors-link-description.cc index 4f7f8e221..dcd7651bd 100644 --- a/src/netanim/examples/colors-link-description.cc +++ b/src/netanim/examples/colors-link-description.cc @@ -90,7 +90,7 @@ int main (int argc, char *argv[]) uint32_t nLeaf = 0; // If non-zero, number of both left and right std::string animFile = "dynamic_linknode.xml" ; // Name of file for animation output - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("nLeftLeaf", "Number of left side leaf nodes", nLeftLeaf); cmd.AddValue ("nRightLeaf","Number of right side leaf nodes", nRightLeaf); cmd.AddValue ("nLeaf", "Number of left and right side leaf nodes", nLeaf); diff --git a/src/netanim/examples/dumbbell-animation.cc b/src/netanim/examples/dumbbell-animation.cc index df1e635b5..6f6c08895 100644 --- a/src/netanim/examples/dumbbell-animation.cc +++ b/src/netanim/examples/dumbbell-animation.cc @@ -38,7 +38,7 @@ int main (int argc, char *argv[]) uint32_t nLeaf = 0; // If non-zero, number of both left and right std::string animFile = "dumbbell-animation.xml" ; // Name of file for animation output - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("nLeftLeaf", "Number of left side leaf nodes", nLeftLeaf); cmd.AddValue ("nRightLeaf","Number of right side leaf nodes", nRightLeaf); cmd.AddValue ("nLeaf", "Number of left and right side leaf nodes", nLeaf); diff --git a/src/netanim/examples/grid-animation.cc b/src/netanim/examples/grid-animation.cc index 9dbfb3125..a29ddf63f 100644 --- a/src/netanim/examples/grid-animation.cc +++ b/src/netanim/examples/grid-animation.cc @@ -37,7 +37,7 @@ int main (int argc, char *argv[]) uint32_t ySize = 5; std::string animFile = "grid-animation.xml"; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("xSize", "Number of rows of nodes", xSize); cmd.AddValue ("ySize", "Number of columns of nodes", ySize); cmd.AddValue ("animFile", "File Name for Animation Output", animFile); diff --git a/src/netanim/examples/resources-counters.cc b/src/netanim/examples/resources-counters.cc index 6ccf20efb..9754fff85 100644 --- a/src/netanim/examples/resources-counters.cc +++ b/src/netanim/examples/resources-counters.cc @@ -116,7 +116,7 @@ int main (int argc, char *argv[]) uint32_t nLeaf = 0; // If non-zero, number of both left and right std::string animFile = "resources_demo.xml" ; // Name of file for animation output - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("nLeftLeaf", "Number of left side leaf nodes", nLeftLeaf); cmd.AddValue ("nRightLeaf","Number of right side leaf nodes", nRightLeaf); cmd.AddValue ("nLeaf", "Number of left and right side leaf nodes", nLeaf); diff --git a/src/netanim/examples/star-animation.cc b/src/netanim/examples/star-animation.cc index 011570689..af3787459 100644 --- a/src/netanim/examples/star-animation.cc +++ b/src/netanim/examples/star-animation.cc @@ -60,7 +60,7 @@ main (int argc, char *argv[]) Ipv6Address ipv6AddressBase = Ipv6Address("2001::"); Ipv6Prefix ipv6AddressPrefix = Ipv6Prefix(64); - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("nSpokes", "Number of spoke nodes to place in the star", nSpokes); cmd.AddValue ("animFile", "File Name for Animation Output", animFile); cmd.AddValue ("useIpv6", "use Ipv6", useIpv6); diff --git a/src/netanim/examples/uan-animation.cc b/src/netanim/examples/uan-animation.cc index 2c68ae089..47964e7d2 100644 --- a/src/netanim/examples/uan-animation.cc +++ b/src/netanim/examples/uan-animation.cc @@ -261,7 +261,7 @@ main (int argc, char **argv) std::string perModel = "ns3::UanPhyPerGenDefault"; std::string sinrModel = "ns3::UanPhyCalcSinrDefault"; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("NumNodes", "Number of transmitting nodes", exp.m_numNodes); cmd.AddValue ("Depth", "Depth of transmitting and sink nodes", exp.m_depth); cmd.AddValue ("RegionSize", "Size of boundary in meters", exp.m_boundary); diff --git a/src/netanim/examples/wireless-animation.cc b/src/netanim/examples/wireless-animation.cc index 5816fa028..bcef8dcfc 100644 --- a/src/netanim/examples/wireless-animation.cc +++ b/src/netanim/examples/wireless-animation.cc @@ -38,7 +38,7 @@ int main (int argc, char *argv[]) { uint32_t nWifi = 20; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("nWifi", "Number of wifi STA devices", nWifi); cmd.Parse (argc,argv); diff --git a/src/network/examples/packet-socket-apps.cc b/src/network/examples/packet-socket-apps.cc index 4c015ecf2..ad2850873 100644 --- a/src/network/examples/packet-socket-apps.cc +++ b/src/network/examples/packet-socket-apps.cc @@ -40,7 +40,7 @@ int main (int argc, char *argv[]) { bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "turn on log components", verbose); cmd.Parse(argc, argv); diff --git a/src/nix-vector-routing/examples/nix-simple.cc b/src/nix-vector-routing/examples/nix-simple.cc index 76bdf9e0b..67e036df5 100644 --- a/src/nix-vector-routing/examples/nix-simple.cc +++ b/src/nix-vector-routing/examples/nix-simple.cc @@ -45,7 +45,7 @@ NS_LOG_COMPONENT_DEFINE ("NixSimpleExample"); int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); LogComponentEnable ("UdpEchoClientApplication", LOG_LEVEL_INFO); diff --git a/src/nix-vector-routing/examples/nms-p2p-nix.cc b/src/nix-vector-routing/examples/nms-p2p-nix.cc index c69b33f6b..a7733c98c 100644 --- a/src/nix-vector-routing/examples/nms-p2p-nix.cc +++ b/src/nix-vector-routing/examples/nms-p2p-nix.cc @@ -158,7 +158,7 @@ main (int argc, char *argv[]) int nCN = 2, nLANClients = 42; bool nix = true; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("CN", "Number of total CNs [2]", nCN); cmd.AddValue ("LAN", "Number of nodes per LAN [42]", nLANClients); cmd.AddValue ("NIX", "Toggle nix-vector routing", nix); diff --git a/src/olsr/examples/olsr-hna.cc b/src/olsr/examples/olsr-hna.cc index 58bfb2bdd..4c101e181 100644 --- a/src/olsr/examples/olsr-hna.cc +++ b/src/olsr/examples/olsr-hna.cc @@ -100,7 +100,7 @@ int main (int argc, char *argv[]) bool assocMethod1 = false; bool assocMethod2 = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode); cmd.AddValue ("rss", "received signal strength", rss); diff --git a/src/olsr/examples/simple-point-to-point-olsr.cc b/src/olsr/examples/simple-point-to-point-olsr.cc index 7e79b42cb..b48379897 100644 --- a/src/olsr/examples/simple-point-to-point-olsr.cc +++ b/src/olsr/examples/simple-point-to-point-olsr.cc @@ -71,7 +71,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 (__FILE__); cmd.Parse (argc, argv); // Here, we will explicitly create four nodes. In more sophisticated diff --git a/src/openflow/examples/openflow-switch.cc b/src/openflow/examples/openflow-switch.cc index 6b4d77613..b7db11941 100644 --- a/src/openflow/examples/openflow-switch.cc +++ b/src/openflow/examples/openflow-switch.cc @@ -84,7 +84,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 (__FILE__); cmd.AddValue ("v", "Verbose (turns on logging).", MakeCallback (&SetVerbose)); cmd.AddValue ("verbose", "Verbose (turns on logging).", MakeCallback (&SetVerbose)); cmd.AddValue ("d", "Use Drop Controller (Learning if not specified).", MakeCallback (&SetDrop)); diff --git a/src/point-to-point/examples/main-attribute-value.cc b/src/point-to-point/examples/main-attribute-value.cc index 996149043..c075c9af8 100644 --- a/src/point-to-point/examples/main-attribute-value.cc +++ b/src/point-to-point/examples/main-attribute-value.cc @@ -70,7 +70,7 @@ main (int argc, char *argv[]) // Allow the user to override any of the defaults and the above // SetDefaults() at run-time, via command-line arguments // For example, via "--ns3::DropTailQueue::MaxSize=80p" - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); // This provides yet another way to set the value from the command line: cmd.AddValue ("maxSize", "ns3::DropTailQueue::MaxSize"); cmd.Parse (argc, argv); diff --git a/src/propagation/examples/jakes-propagation-model-example.cc b/src/propagation/examples/jakes-propagation-model-example.cc index bb2a8cb38..940c7d2a7 100644 --- a/src/propagation/examples/jakes-propagation-model-example.cc +++ b/src/propagation/examples/jakes-propagation-model-example.cc @@ -69,7 +69,7 @@ void JakesPropagationExample::Next () int main (int argc, char *argv[]) { Config::SetDefault ("ns3::JakesProcess::NumberOfOscillators", UintegerValue (100)); - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); JakesPropagationExample example; Simulator::Stop (Seconds (1000)); diff --git a/src/propagation/examples/main-propagation-loss.cc b/src/propagation/examples/main-propagation-loss.cc index ca5435266..6f277483b 100644 --- a/src/propagation/examples/main-propagation-loss.cc +++ b/src/propagation/examples/main-propagation-loss.cc @@ -219,7 +219,7 @@ TestDeterministicByTime (Ptr model, int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); GnuplotCollection gnuplots ("main-propagation-loss.pdf"); diff --git a/src/sixlowpan/examples/example-ping-lr-wpan-beacon.cc b/src/sixlowpan/examples/example-ping-lr-wpan-beacon.cc index 8d7643843..1147e0537 100644 --- a/src/sixlowpan/examples/example-ping-lr-wpan-beacon.cc +++ b/src/sixlowpan/examples/example-ping-lr-wpan-beacon.cc @@ -48,7 +48,7 @@ int main (int argc, char** argv) bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "turn on log components", verbose); cmd.Parse (argc, argv); diff --git a/src/sixlowpan/examples/example-ping-lr-wpan-mesh-under.cc b/src/sixlowpan/examples/example-ping-lr-wpan-mesh-under.cc index 008741914..23541ad52 100644 --- a/src/sixlowpan/examples/example-ping-lr-wpan-mesh-under.cc +++ b/src/sixlowpan/examples/example-ping-lr-wpan-mesh-under.cc @@ -37,7 +37,7 @@ int main (int argc, char** argv) Packet::EnablePrinting (); - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "turn on log components", verbose); cmd.Parse (argc, argv); diff --git a/src/sixlowpan/examples/example-ping-lr-wpan.cc b/src/sixlowpan/examples/example-ping-lr-wpan.cc index 7b1f5ff06..897c09860 100644 --- a/src/sixlowpan/examples/example-ping-lr-wpan.cc +++ b/src/sixlowpan/examples/example-ping-lr-wpan.cc @@ -37,7 +37,7 @@ int main (int argc, char** argv) { bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "turn on log components", verbose); cmd.Parse (argc, argv); diff --git a/src/sixlowpan/examples/example-sixlowpan.cc b/src/sixlowpan/examples/example-sixlowpan.cc index 242a14229..0fc9b30ae 100644 --- a/src/sixlowpan/examples/example-sixlowpan.cc +++ b/src/sixlowpan/examples/example-sixlowpan.cc @@ -53,7 +53,7 @@ int main (int argc, char** argv) { bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "turn on some relevant log components", verbose); cmd.Parse (argc, argv); diff --git a/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc b/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc index b7cf3c21e..b9e8fb345 100644 --- a/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc +++ b/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc @@ -123,7 +123,7 @@ GlobalPathlossDatabase::Print () int main (int argc, char** argv) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); double lossDb = 130; double txPowerW = 0.1; uint64_t phyRate = 500000; diff --git a/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc b/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc index ffd4d6c7f..869ea6dd4 100644 --- a/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc +++ b/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc @@ -124,7 +124,7 @@ SetupPacketReceive (Ptr node) int main (int argc, char** argv) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "Print trace information if true", g_verbose); cmd.Parse (argc, argv); diff --git a/src/spectrum/examples/adhoc-aloha-ideal-phy.cc b/src/spectrum/examples/adhoc-aloha-ideal-phy.cc index 4eabde8f3..3d65b110d 100644 --- a/src/spectrum/examples/adhoc-aloha-ideal-phy.cc +++ b/src/spectrum/examples/adhoc-aloha-ideal-phy.cc @@ -119,7 +119,7 @@ SetupPacketReceive (Ptr node) int main (int argc, char** argv) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("verbose", "Print trace information if true", g_verbose); cmd.Parse (argc, argv); diff --git a/src/spectrum/examples/tv-trans-example.cc b/src/spectrum/examples/tv-trans-example.cc index 2714f4401..eeaacea4a 100644 --- a/src/spectrum/examples/tv-trans-example.cc +++ b/src/spectrum/examples/tv-trans-example.cc @@ -41,7 +41,7 @@ using namespace ns3; */ int main (int argc, char** argv) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); /* nodes and positions */ diff --git a/src/spectrum/examples/tv-trans-regional-example.cc b/src/spectrum/examples/tv-trans-regional-example.cc index 158ea8ebd..26ec66ebe 100644 --- a/src/spectrum/examples/tv-trans-regional-example.cc +++ b/src/spectrum/examples/tv-trans-regional-example.cc @@ -41,7 +41,7 @@ using namespace ns3; */ int main (int argc, char** argv) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); /* random seed and run number; adjust these to change random draws */ diff --git a/src/stats/doc/statistics.rst b/src/stats/doc/statistics.rst index c0b6a2baf..9926425f0 100644 --- a/src/stats/doc/statistics.rst +++ b/src/stats/doc/statistics.rst @@ -108,7 +108,7 @@ The first thing to do in implementing this experiment is developing the simulati string strategy ("wifi-default"); string runID; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue("distance", "Distance apart to place nodes (in meters).", distance); cmd.AddValue("format", "Format to use for data output.", format); cmd.AddValue("experiment", "Identifier for experiment.", experiment); diff --git a/src/stats/examples/double-probe-example.cc b/src/stats/examples/double-probe-example.cc index b2fd73cce..68b5a786f 100644 --- a/src/stats/examples/double-probe-example.cc +++ b/src/stats/examples/double-probe-example.cc @@ -120,7 +120,7 @@ NotifyViaProbe (std::string context, double oldVal, double newVal) int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); bool connected; diff --git a/src/stats/examples/file-helper-example.cc b/src/stats/examples/file-helper-example.cc index 5e902aa7d..33c676654 100644 --- a/src/stats/examples/file-helper-example.cc +++ b/src/stats/examples/file-helper-example.cc @@ -99,7 +99,7 @@ Emitter::Count (void) int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); // diff --git a/src/stats/examples/gnuplot-helper-example.cc b/src/stats/examples/gnuplot-helper-example.cc index cb55680b2..e71ad2f7d 100644 --- a/src/stats/examples/gnuplot-helper-example.cc +++ b/src/stats/examples/gnuplot-helper-example.cc @@ -98,7 +98,7 @@ Emitter::Count (void) int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); // diff --git a/src/stats/examples/time-probe-example.cc b/src/stats/examples/time-probe-example.cc index cfb16d89d..7334e32ae 100644 --- a/src/stats/examples/time-probe-example.cc +++ b/src/stats/examples/time-probe-example.cc @@ -143,7 +143,7 @@ int main (int argc, char *argv[]) double stopTime = 100.0; bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("stopTime", "Time (seconds) to terminate simulation", stopTime); cmd.AddValue ("verbose", "Whether to enable verbose output", verbose); cmd.Parse (argc, argv); diff --git a/src/tap-bridge/examples/tap-csma-virtual-machine.cc b/src/tap-bridge/examples/tap-csma-virtual-machine.cc index 4b93966a7..70bff18e2 100644 --- a/src/tap-bridge/examples/tap-csma-virtual-machine.cc +++ b/src/tap-bridge/examples/tap-csma-virtual-machine.cc @@ -73,7 +73,7 @@ NS_LOG_COMPONENT_DEFINE ("TapCsmaVirtualMachineExample"); int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); // diff --git a/src/tap-bridge/examples/tap-csma.cc b/src/tap-bridge/examples/tap-csma.cc index 2a824b314..744ac6b01 100644 --- a/src/tap-bridge/examples/tap-csma.cc +++ b/src/tap-bridge/examples/tap-csma.cc @@ -75,7 +75,7 @@ main (int argc, char *argv[]) std::string mode = "ConfigureLocal"; std::string tapName = "thetap"; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("mode", "Mode setting of TapBridge", mode); cmd.AddValue ("tapName", "Name of the OS tap device", tapName); cmd.Parse (argc, argv); diff --git a/src/tap-bridge/examples/tap-wifi-dumbbell.cc b/src/tap-bridge/examples/tap-wifi-dumbbell.cc index 12ac5b3d5..95fbd0cda 100644 --- a/src/tap-bridge/examples/tap-wifi-dumbbell.cc +++ b/src/tap-bridge/examples/tap-wifi-dumbbell.cc @@ -120,7 +120,7 @@ main (int argc, char *argv[]) std::string mode = "ConfigureLocal"; std::string tapName = "thetap"; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("mode", "Mode setting of TapBridge", mode); cmd.AddValue ("tapName", "Name of the OS tap device", tapName); cmd.Parse (argc, argv); diff --git a/src/tap-bridge/examples/tap-wifi-virtual-machine.cc b/src/tap-bridge/examples/tap-wifi-virtual-machine.cc index 0cda3c9a0..bc7d5c77f 100644 --- a/src/tap-bridge/examples/tap-wifi-virtual-machine.cc +++ b/src/tap-bridge/examples/tap-wifi-virtual-machine.cc @@ -82,7 +82,7 @@ NS_LOG_COMPONENT_DEFINE ("TapWifiVirtualMachineExample"); int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); // diff --git a/src/test/perf/perf-io.cc b/src/test/perf/perf-io.cc index 311b252f3..b42c2ad99 100644 --- a/src/test/perf/perf-io.cc +++ b/src/test/perf/perf-io.cc @@ -73,7 +73,7 @@ main (int argc, char *argv[]) bool binmode = true; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("n", "How many times to write (defaults to 100000", n); cmd.AddValue ("iter", "How many times to run the test looking for a min (defaults to 50)", iter); cmd.AddValue ("doStream", "Run the C++ I/O benchmark otherwise the C I/O ", doStream); diff --git a/src/topology-read/examples/topology-example-sim.cc b/src/topology-read/examples/topology-example-sim.cc index d3e70d280..6694c31af 100644 --- a/src/topology-read/examples/topology-example-sim.cc +++ b/src/topology-read/examples/topology-example-sim.cc @@ -88,7 +88,7 @@ int main (int argc, char *argv[]) std::string input ("src/topology-read/examples/Inet_small_toposample.txt"); // Set up command line parameters used to control the experiment. - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("format", "Format to use for data input [Orbis|Inet|Rocketfuel].", format); cmd.AddValue ("input", "Name of the input file.", diff --git a/src/traffic-control/examples/adaptive-red-tests.cc b/src/traffic-control/examples/adaptive-red-tests.cc index fcf9ddfb0..388af980e 100644 --- a/src/traffic-control/examples/adaptive-red-tests.cc +++ b/src/traffic-control/examples/adaptive-red-tests.cc @@ -202,7 +202,7 @@ main (int argc, char *argv[]) aredTest = 1; // Will only save in the directory if enable opts below pathOut = "."; // Current directory - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("testNumber", "Run test 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14 or 15", aredTest); cmd.AddValue ("pathOut", "Path to save results from --writeForPlot/--writePcap/--writeFlowMonitor", pathOut); cmd.AddValue ("writeForPlot", "<0/1> to write results for plot (gnuplot)", writeForPlot); diff --git a/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc b/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc index 19f4bba6f..82c4c9b5e 100644 --- a/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc +++ b/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc @@ -238,7 +238,7 @@ int main (int argc, char *argv[]) std::string fileNamePrefix = "codel-vs-pfifo-fast-asymmetric"; bool logging = true; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("serverCmtsDelay", "Link delay between server and CMTS", serverCmtsDelay); cmd.AddValue ("cmtsRouterDelay", "Link delay between CMTS and rounter", cmtsRouterDelay); cmd.AddValue ("routerHostDelay", "Link delay between router and host", routerHostDelay); diff --git a/src/traffic-control/examples/codel-vs-pfifo-basic-test.cc b/src/traffic-control/examples/codel-vs-pfifo-basic-test.cc index 6363b77e8..cc97cbe2c 100644 --- a/src/traffic-control/examples/codel-vs-pfifo-basic-test.cc +++ b/src/traffic-control/examples/codel-vs-pfifo-basic-test.cc @@ -95,7 +95,7 @@ int main (int argc, char *argv[]) std::string cwndTrFileName = "cwndPfifoFast.tr"; bool logging = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("bottleneckBandwidth", "Bottleneck bandwidth", bottleneckBandwidth); cmd.AddValue ("bottleneckDelay", "Bottleneck delay", bottleneckDelay); cmd.AddValue ("accessBandwidth", "Access link bandwidth", accessBandwidth); diff --git a/src/traffic-control/examples/pfifo-vs-red.cc b/src/traffic-control/examples/pfifo-vs-red.cc index 47194f995..eaa756406 100644 --- a/src/traffic-control/examples/pfifo-vs-red.cc +++ b/src/traffic-control/examples/pfifo-vs-red.cc @@ -49,7 +49,7 @@ int main (int argc, char *argv[]) std::string bottleNeckLinkBw = "1Mbps"; std::string bottleNeckLinkDelay = "50ms"; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); 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); diff --git a/src/traffic-control/examples/pie-example.cc b/src/traffic-control/examples/pie-example.cc index 066ff7484..4b10a7ed7 100644 --- a/src/traffic-control/examples/pie-example.cc +++ b/src/traffic-control/examples/pie-example.cc @@ -159,7 +159,7 @@ main (int argc, char *argv[]) // Configuration and command line parameter parsing // Will only save in the directory if enable opts below pathOut = "."; // Current directory - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("pathOut", "Path to save results from --writeForPlot/--writePcap/--writeFlowMonitor", pathOut); cmd.AddValue ("writeForPlot", "<0/1> to write results for plot (gnuplot)", writeForPlot); cmd.AddValue ("writePcap", "<0/1> to write results in pcapfile", writePcap); diff --git a/src/traffic-control/examples/red-tests.cc b/src/traffic-control/examples/red-tests.cc index 4c8571ab2..86a9da2d8 100644 --- a/src/traffic-control/examples/red-tests.cc +++ b/src/traffic-control/examples/red-tests.cc @@ -279,7 +279,7 @@ main (int argc, char *argv[]) redTest = 1; // Will only save in the directory if enable opts below pathOut = "."; // Current directory - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("testNumber", "Run test 1, 3, 4 or 5", redTest); cmd.AddValue ("pathOut", "Path to save results from --writeForPlot/--writePcap/--writeFlowMonitor", pathOut); cmd.AddValue ("writeForPlot", "<0/1> to write results for plot (gnuplot)", writeForPlot); diff --git a/src/traffic-control/examples/red-vs-ared.cc b/src/traffic-control/examples/red-vs-ared.cc index a7e162c7b..dadf57a39 100644 --- a/src/traffic-control/examples/red-vs-ared.cc +++ b/src/traffic-control/examples/red-vs-ared.cc @@ -48,7 +48,7 @@ int main (int argc, char *argv[]) std::string bottleNeckLinkBw = "1Mbps"; std::string bottleNeckLinkDelay = "50ms"; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); 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); diff --git a/src/uan/examples/uan-6lowpan-example.cc b/src/uan/examples/uan-6lowpan-example.cc index 82ce9d99a..91bef1fbc 100644 --- a/src/uan/examples/uan-6lowpan-example.cc +++ b/src/uan/examples/uan-6lowpan-example.cc @@ -254,7 +254,7 @@ UanExperiment::Teardown () int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); UanExperiment experiment; diff --git a/src/uan/examples/uan-cw-example.cc b/src/uan/examples/uan-cw-example.cc index 9a4454cd8..9ccc7425c 100644 --- a/src/uan/examples/uan-cw-example.cc +++ b/src/uan/examples/uan-cw-example.cc @@ -273,7 +273,7 @@ main (int argc, char **argv) std::string perModel = "ns3::UanPhyPerGenDefault"; std::string sinrModel = "ns3::UanPhyCalcSinrDefault"; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("NumNodes", "Number of transmitting nodes", exp.m_numNodes); cmd.AddValue ("Depth", "Depth of transmitting and sink nodes", exp.m_depth); cmd.AddValue ("RegionSize", "Size of boundary in meters", exp.m_boundary); diff --git a/src/uan/examples/uan-ipv4-example.cc b/src/uan/examples/uan-ipv4-example.cc index ffba2f0c6..cac77ffd1 100644 --- a/src/uan/examples/uan-ipv4-example.cc +++ b/src/uan/examples/uan-ipv4-example.cc @@ -246,7 +246,7 @@ UanExperiment::Teardown () int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); UanExperiment experiment; diff --git a/src/uan/examples/uan-ipv6-example.cc b/src/uan/examples/uan-ipv6-example.cc index d65e45773..8abbd2c31 100644 --- a/src/uan/examples/uan-ipv6-example.cc +++ b/src/uan/examples/uan-ipv6-example.cc @@ -249,7 +249,7 @@ UanExperiment::Teardown () int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); UanExperiment experiment; diff --git a/src/uan/examples/uan-raw-example.cc b/src/uan/examples/uan-raw-example.cc index 61600de6f..096aaa38f 100644 --- a/src/uan/examples/uan-raw-example.cc +++ b/src/uan/examples/uan-raw-example.cc @@ -241,7 +241,7 @@ UanExperiment::Teardown () int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); UanExperiment experiment; diff --git a/src/uan/examples/uan-rc-example.cc b/src/uan/examples/uan-rc-example.cc index 6d8a2116f..8f76f0a54 100644 --- a/src/uan/examples/uan-rc-example.cc +++ b/src/uan/examples/uan-rc-example.cc @@ -254,7 +254,7 @@ main (int argc, char *argv[]) Experiment exp; bool quiet = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("TotalRate", "Total channel capacity", exp.m_totalRate); cmd.AddValue ("NumberRates", "Number of divided rates ( (NumberRates+1)%TotalRate should be 0)", exp.m_numRates); cmd.AddValue ("MaxRange", "Maximum range between gateway and acoustic node", exp.m_maxRange); diff --git a/src/virtual-net-device/examples/virtual-net-device.cc b/src/virtual-net-device/examples/virtual-net-device.cc index 6dd856073..1454da53d 100644 --- a/src/virtual-net-device/examples/virtual-net-device.cc +++ b/src/virtual-net-device/examples/virtual-net-device.cc @@ -198,7 +198,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 (__FILE__); cmd.Parse (argc, argv); NS_LOG_INFO ("Create nodes."); diff --git a/src/wave/examples/vanet-routing-compare.cc b/src/wave/examples/vanet-routing-compare.cc index 8cfcfa117..c75a9e21a 100644 --- a/src/wave/examples/vanet-routing-compare.cc +++ b/src/wave/examples/vanet-routing-compare.cc @@ -2005,7 +2005,7 @@ VanetRoutingExperiment::SetGlobalsFromConfig () void VanetRoutingExperiment::CommandSetup (int argc, char **argv) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); double txDist1 = 50.0; double txDist2 = 100.0; double txDist3 = 150.0; diff --git a/src/wave/examples/wave-simple-80211p.cc b/src/wave/examples/wave-simple-80211p.cc index 820d22542..cda3d862b 100644 --- a/src/wave/examples/wave-simple-80211p.cc +++ b/src/wave/examples/wave-simple-80211p.cc @@ -105,7 +105,7 @@ int main (int argc, char *argv[]) double interval = 1.0; // seconds bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode); cmd.AddValue ("packetSize", "size of application packet sent", packetSize); diff --git a/src/wave/examples/wave-simple-device.cc b/src/wave/examples/wave-simple-device.cc index f2215870e..a4f54f2b3 100644 --- a/src/wave/examples/wave-simple-device.cc +++ b/src/wave/examples/wave-simple-device.cc @@ -278,7 +278,7 @@ WaveNetDeviceExample::SendWsaExample () int main (int argc, char *argv[]) { - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Parse (argc, argv); WaveNetDeviceExample example; diff --git a/src/wifi/examples/wifi-manager-example.cc b/src/wifi/examples/wifi-manager-example.cc index 00ff58589..a842c1c58 100644 --- a/src/wifi/examples/wifi-manager-example.cc +++ b/src/wifi/examples/wifi-manager-example.cc @@ -172,7 +172,7 @@ int main (int argc, char *argv[]) uint32_t maxSlrc = 7; uint32_t maxSsrc = 7; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("maxSsrc", "The maximum number of retransmission attempts for a RTS packet", maxSsrc); cmd.AddValue ("maxSlrc", "The maximum number of retransmission attempts for a Data packet", maxSlrc); cmd.AddValue ("rtsThreshold", "RTS threshold", rtsThreshold); diff --git a/src/wifi/examples/wifi-phy-configuration.cc b/src/wifi/examples/wifi-phy-configuration.cc index 5472a560e..a5c2cbc2a 100644 --- a/src/wifi/examples/wifi-phy-configuration.cc +++ b/src/wifi/examples/wifi-phy-configuration.cc @@ -62,7 +62,7 @@ int main (int argc, char *argv[]) uint32_t testCase = 0; bool printAttributes = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("testCase", "Test case", testCase); cmd.AddValue ("printAttributes", "If true, print out attributes", printAttributes); cmd.Parse (argc, argv); diff --git a/src/wifi/examples/wifi-phy-test.cc b/src/wifi/examples/wifi-phy-test.cc index 825292786..0c35f8f3f 100644 --- a/src/wifi/examples/wifi-phy-test.cc +++ b/src/wifi/examples/wifi-phy-test.cc @@ -323,7 +323,7 @@ static void PrintPsr (int argc, char *argv[]) PsrExperiment experiment; struct PsrExperiment::Input input; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("Distance", "The distance between two phys", input.distance); cmd.AddValue ("PacketSize", "The size of each packet sent", input.packetSize); cmd.AddValue ("TxMode", "The mode to use to send each packet", input.txMode); @@ -350,7 +350,7 @@ double CalcPsr (struct PsrExperiment::Output output, struct PsrExperiment::Input static void PrintPsrVsDistance (int argc, char *argv[]) { struct PsrExperiment::Input input; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("TxPowerLevel", "The power level index to use to send each packet", input.txPowerLevel); cmd.AddValue ("TxMode", "The mode to use to send each packet", input.txMode); cmd.AddValue ("NPackets", "The number of packets to send", input.nPackets); @@ -403,7 +403,7 @@ static void PrintSizeVsRange (int argc, char *argv[]) { double targetPsr = 0.05; struct PsrExperiment::Input input; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("TxPowerLevel", "The power level index to use to send each packet", input.txPowerLevel); cmd.AddValue ("TxMode", "The mode to use to send each packet", input.txMode); cmd.AddValue ("NPackets", "The number of packets to send", input.nPackets); @@ -440,7 +440,7 @@ static void PrintPsrVsCollisionInterval (int argc, char *argv[]) { CollisionExperiment::Input input; input.nPackets = 100; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("NPackets", "The number of packets to send for each transmitter", input.nPackets); cmd.AddValue ("xA", "the position of transmitter A", input.xA); cmd.AddValue ("xB", "the position of transmitter B", input.xB); diff --git a/src/wifi/examples/wifi-test-interference-helper.cc b/src/wifi/examples/wifi-test-interference-helper.cc index 38d6af4fb..7e664b2ba 100644 --- a/src/wifi/examples/wifi-test-interference-helper.cc +++ b/src/wifi/examples/wifi-test-interference-helper.cc @@ -307,7 +307,7 @@ int main (int argc, char *argv[]) std::string str_preamble = "WIFI_PREAMBLE_LONG"; uint64_t delay = 0; //microseconds - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("delay", "Delay in microseconds between frame transmission from sender A and frame transmission from sender B", delay); cmd.AddValue ("xA", "The position of transmitter A (< 0)", input.xA); cmd.AddValue ("xB", "The position of transmitter B (> 0)", input.xB); diff --git a/src/wifi/examples/wifi-trans-example.cc b/src/wifi/examples/wifi-trans-example.cc index 685dc6948..94506cc3c 100644 --- a/src/wifi/examples/wifi-trans-example.cc +++ b/src/wifi/examples/wifi-trans-example.cc @@ -57,7 +57,7 @@ int main (int argc, char** argv) int bw = 20; double pow = 23; //dBm bool verbose = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("standard", "OFDM-based Wi-Fi standard [11a, 11_10MHZ, 11_5MHZ, 11n_2_4GHZ, 11n_5GHZ, 11ac, 11ax_2_4GHZ, 11ax_5GHZ]", standard); diff --git a/src/wimax/examples/wimax-ipv4.cc b/src/wimax/examples/wimax-ipv4.cc index b42838f40..30db58194 100644 --- a/src/wimax/examples/wimax-ipv4.cc +++ b/src/wimax/examples/wimax-ipv4.cc @@ -74,7 +74,7 @@ int main (int argc, char *argv[]) LogComponentEnable ("UdpServer", LOG_LEVEL_INFO); - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("nbSS", "number of subscriber station to create", nbSS); cmd.AddValue ("scheduler", "type of scheduler to use with the network devices", schedType); cmd.AddValue ("duration", "duration of the simulation in seconds", duration); diff --git a/src/wimax/examples/wimax-multicast.cc b/src/wimax/examples/wimax-multicast.cc index 99c9f4ec9..52f9b049e 100644 --- a/src/wimax/examples/wimax-multicast.cc +++ b/src/wimax/examples/wimax-multicast.cc @@ -100,7 +100,7 @@ int main (int argc, char *argv[]) int nbSS = 10, duration = 7, schedType = 0; WimaxHelper::SchedulerType scheduler = WimaxHelper::SCHED_TYPE_SIMPLE; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("nbSS", "number of subscriber station to create", nbSS); cmd.AddValue ("scheduler", "type of scheduler to use with the netdevices", schedType); cmd.AddValue ("duration", "duration of the simulation in seconds", duration); diff --git a/src/wimax/examples/wimax-simple.cc b/src/wimax/examples/wimax-simple.cc index 06a5b61ac..996f03aa9 100644 --- a/src/wimax/examples/wimax-simple.cc +++ b/src/wimax/examples/wimax-simple.cc @@ -65,7 +65,7 @@ int main (int argc, char *argv[]) int duration = 7, schedType = 0; WimaxHelper::SchedulerType scheduler = WimaxHelper::SCHED_TYPE_SIMPLE; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.AddValue ("scheduler", "type of scheduler to use with the network devices", schedType); cmd.AddValue ("duration", "duration of the simulation in seconds", duration); cmd.AddValue ("verbose", "turn on all WimaxNetDevice log components", verbose); diff --git a/utils/bench-packets.cc b/utils/bench-packets.cc index 3ed06b584..20eef934c 100644 --- a/utils/bench-packets.cc +++ b/utils/bench-packets.cc @@ -363,7 +363,7 @@ int main (int argc, char *argv[]) uint32_t minIterations = 1; bool enablePrinting = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Usage ("Benchmark Packet class"); cmd.AddValue ("n", "number of iterations", n); cmd.AddValue ("min-iterations", "number of subiterations to minimize iteration time over", minIterations); diff --git a/utils/bench-simulator.cc b/utils/bench-simulator.cc index a366dbdcc..a905adcc0 100644 --- a/utils/bench-simulator.cc +++ b/utils/bench-simulator.cc @@ -213,7 +213,7 @@ int main (int argc, char *argv[]) uint32_t runs = 1; std::string filename = ""; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Usage ("Benchmark the simulator scheduler.\n" "\n" "Event intervals are taken from one of:\n" diff --git a/utils/print-introspected-doxygen.cc b/utils/print-introspected-doxygen.cc index 3c6f058d1..a27d77cb2 100644 --- a/utils/print-introspected-doxygen.cc +++ b/utils/print-introspected-doxygen.cc @@ -1583,7 +1583,7 @@ int main (int argc, char *argv[]) NS_LOG_FUNCTION_NOARGS (); bool outputText = false; - COMMANDLINE (cmd); + CommandLine cmd (__FILE__); cmd.Usage ("Generate documentation for all ns-3 registered types, " "trace sources, attributes and global variables."); cmd.AddValue ("output-text", "format output as plain text", outputText);