From 18f2715506be3dfd227f566a90472df1b292a36a Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Sat, 5 Mar 2011 11:47:37 -0800 Subject: [PATCH] remove src/helper module --- examples/energy/energy-model-example.cc | 1 - examples/error-model/simple-error-model.cc | 1 - examples/ipv6/fragmentation-ipv6.cc | 1 - examples/ipv6/icmpv6-redirect.cc | 1 - examples/ipv6/loose-routing-ipv6.cc | 1 - examples/ipv6/ping6.cc | 1 - examples/ipv6/radvd-two-prefix.cc | 1 - examples/ipv6/radvd.cc | 1 - examples/matrix-topology/matrix-topology.cc | 1 - examples/mobility/ns2-mobility-trace.cc | 1 - examples/mpi/nms-p2p-nix-distributed.cc | 1 - examples/mpi/simple-distributed.cc | 1 - examples/mpi/third-distributed.cc | 1 - examples/naming/object-names.cc | 1 - examples/realtime/realtime-udp-echo.cc | 1 - examples/routing/dynamic-global-routing.cc | 1 - examples/routing/global-injection-slash32.cc | 1 - examples/routing/global-routing-slash32.cc | 1 - examples/routing/mixed-global-routing.cc | 1 - examples/routing/simple-alternate-routing.cc | 1 - examples/routing/simple-global-routing.cc | 1 - examples/routing/simple-routing-ping6.cc | 1 - examples/routing/static-routing-slash32.cc | 1 - examples/socket/socket-bound-static-routing.cc | 1 - .../socket/socket-bound-tcp-static-routing.cc | 1 - examples/stats/wifi-example-sim.cc | 1 - examples/tcp/tcp-bulk-send.cc | 1 - examples/tcp/tcp-large-transfer.cc | 1 - examples/tcp/tcp-nsc-lfn.cc | 1 - examples/tcp/tcp-nsc-zoo.cc | 1 - examples/tcp/tcp-star-server.cc | 1 - examples/tutorial/fifth.cc | 1 - examples/tutorial/first.cc | 1 - examples/tutorial/second.cc | 1 - examples/tutorial/sixth.cc | 1 - examples/tutorial/third.cc | 1 - examples/udp-client-server/udp-client-server.cc | 1 - .../udp-client-server/udp-trace-client-server.cc | 1 - examples/udp/udp-echo.cc | 1 - examples/wireless/mixed-wireless.cc | 1 - examples/wireless/multirate.cc | 1 - .../wireless/simple-wifi-frame-aggregation.cc | 1 - examples/wireless/wifi-adhoc.cc | 1 - examples/wireless/wifi-ap.cc | 1 - examples/wireless/wifi-blockack.cc | 1 - examples/wireless/wifi-clear-channel-cmu.cc | 1 - examples/wireless/wifi-hidden-terminal.cc | 1 - examples/wireless/wifi-simple-adhoc-grid.cc | 1 - examples/wireless/wifi-simple-adhoc.cc | 1 - examples/wireless/wifi-simple-infra.cc | 1 - examples/wireless/wifi-simple-interference.cc | 1 - examples/wireless/wifi-wired-bridging.cc | 1 - examples/wireless/wscript | 2 +- samples/main-random-topology.cc | 1 - samples/main-random-walk.cc | 1 - samples/main-simple.cc | 1 - samples/wscript | 4 ++-- scratch/multiple-sources/simple-simulation.cc | 1 - scratch/simple.cc | 1 - src/bridge/examples/csma-bridge-one-hop.cc | 1 - src/bridge/examples/csma-bridge.cc | 1 - src/click/examples/nsclick-raw-wlan.cc | 1 - src/click/examples/nsclick-routing.cc | 1 - src/click/examples/nsclick-simple-lan.cc | 1 - .../examples/nsclick-udp-client-server-csma.cc | 1 - .../examples/nsclick-udp-client-server-wifi.cc | 1 - src/csma/examples/csma-broadcast.cc | 1 - src/csma/examples/csma-multicast.cc | 1 - src/csma/examples/csma-one-subnet.cc | 1 - src/csma/examples/csma-packet-socket.cc | 1 - src/csma/examples/csma-ping.cc | 1 - src/csma/examples/csma-raw-ip-socket.cc | 1 - src/csma/examples/csma-star.cc | 1 - src/dsdv/examples/dsdv-manet.cc | 1 - src/emu/examples/emu-ping.cc | 1 - src/emu/examples/emu-udp-echo.cc | 1 - src/helper/waf | 1 - src/helper/wscript | 15 --------------- src/lte/examples/lte-amc.cc | 1 - src/lte/examples/lte-channel-model.cc | 1 - src/lte/examples/lte-device.cc | 1 - src/lte/examples/lte-multiple-flows.cc | 1 - src/lte/examples/lte-phy-downlink.cc | 1 - src/lte/examples/lte-phy-uplink.cc | 1 - src/mesh/examples/mesh.cc | 1 - src/nix-vector-routing/doc/nix-vector-routing.h | 2 -- src/nix-vector-routing/examples/nix-simple.cc | 1 - src/nix-vector-routing/examples/nms-p2p-nix.cc | 1 - src/olsr/examples/olsr-hna.cc | 1 - src/olsr/examples/simple-point-to-point-olsr.cc | 1 - .../examples/tap-csma-virtual-machine.cc | 1 - src/tap-bridge/examples/tap-csma.cc | 1 - src/tap-bridge/examples/tap-wifi-dumbbell.cc | 1 - .../examples/tap-wifi-virtual-machine.cc | 1 - src/test/perf/perf-io.cc | 1 - .../examples/topology-example-sim.cc | 1 - src/uan/examples/uan-cw-example.cc | 1 - src/uan/examples/uan-cw-example.h | 1 - src/uan/examples/uan-rc-example.cc | 1 - src/uan/examples/uan-rc-example.h | 1 - .../examples/virtual-net-device.cc | 1 - src/{ => wifi}/helper/athstats-helper.cc | 0 src/{ => wifi}/helper/athstats-helper.h | 0 src/wifi/wscript | 2 ++ src/wimax/examples/wimax-ipv4.cc | 1 - src/wimax/examples/wimax-multicast.cc | 1 - src/wimax/examples/wimax-simple.cc | 1 - src/wscript | 1 - utils/print-introspected-doxygen.cc | 1 - 109 files changed, 5 insertions(+), 122 deletions(-) delete mode 100755 src/helper/waf delete mode 100644 src/helper/wscript rename src/{ => wifi}/helper/athstats-helper.cc (100%) rename src/{ => wifi}/helper/athstats-helper.h (100%) diff --git a/examples/energy/energy-model-example.cc b/examples/energy/energy-model-example.cc index 3919dae52..2474f7001 100644 --- a/examples/energy/energy-model-example.cc +++ b/examples/energy/energy-model-example.cc @@ -20,7 +20,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wifi-module.h" diff --git a/examples/error-model/simple-error-model.cc b/examples/error-model/simple-error-model.cc index cb5eb55d2..4ba61d96e 100644 --- a/examples/error-model/simple-error-model.cc +++ b/examples/error-model/simple-error-model.cc @@ -37,7 +37,6 @@ #include #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" diff --git a/examples/ipv6/fragmentation-ipv6.cc b/examples/ipv6/fragmentation-ipv6.cc index dbbf7af62..ad448efee 100644 --- a/examples/ipv6/fragmentation-ipv6.cc +++ b/examples/ipv6/fragmentation-ipv6.cc @@ -31,7 +31,6 @@ #include #include "ns3/core-module.h" #include "ns3/internet-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" #include "ns3/ipv6-static-routing-helper.h" diff --git a/examples/ipv6/icmpv6-redirect.cc b/examples/ipv6/icmpv6-redirect.cc index ab86df4e1..b8ea39190 100644 --- a/examples/ipv6/icmpv6-redirect.cc +++ b/examples/ipv6/icmpv6-redirect.cc @@ -43,7 +43,6 @@ #include #include "ns3/core-module.h" #include "ns3/internet-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" #include "ns3/ipv6-static-routing-helper.h" diff --git a/examples/ipv6/loose-routing-ipv6.cc b/examples/ipv6/loose-routing-ipv6.cc index dab7382f4..9b636fdaa 100644 --- a/examples/ipv6/loose-routing-ipv6.cc +++ b/examples/ipv6/loose-routing-ipv6.cc @@ -41,7 +41,6 @@ #include #include "ns3/core-module.h" #include "ns3/internet-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" #include "ns3/ipv6-header.h" diff --git a/examples/ipv6/ping6.cc b/examples/ipv6/ping6.cc index 127470754..91c967772 100644 --- a/examples/ipv6/ping6.cc +++ b/examples/ipv6/ping6.cc @@ -32,7 +32,6 @@ #include #include "ns3/core-module.h" #include "ns3/internet-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" diff --git a/examples/ipv6/radvd-two-prefix.cc b/examples/ipv6/radvd-two-prefix.cc index e80a24481..0b3c7ef33 100644 --- a/examples/ipv6/radvd-two-prefix.cc +++ b/examples/ipv6/radvd-two-prefix.cc @@ -35,7 +35,6 @@ #include #include "ns3/core-module.h" #include "ns3/internet-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" diff --git a/examples/ipv6/radvd.cc b/examples/ipv6/radvd.cc index c061509fb..11f7751ee 100644 --- a/examples/ipv6/radvd.cc +++ b/examples/ipv6/radvd.cc @@ -34,7 +34,6 @@ #include #include "ns3/core-module.h" #include "ns3/internet-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" diff --git a/examples/matrix-topology/matrix-topology.cc b/examples/matrix-topology/matrix-topology.cc index f1ffb326a..3a99d5955 100644 --- a/examples/matrix-topology/matrix-topology.cc +++ b/examples/matrix-topology/matrix-topology.cc @@ -50,7 +50,6 @@ #include "ns3/network-module.h" #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/global-route-manager.h" #include "ns3/mobility-module.h" diff --git a/examples/mobility/ns2-mobility-trace.cc b/examples/mobility/ns2-mobility-trace.cc index 84480497f..0b1a7cbfd 100644 --- a/examples/mobility/ns2-mobility-trace.cc +++ b/examples/mobility/ns2-mobility-trace.cc @@ -56,7 +56,6 @@ #include "ns3/core-module.h" #include "ns3/mobility-module.h" -#include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/ns2-mobility-helper.h" diff --git a/examples/mpi/nms-p2p-nix-distributed.cc b/examples/mpi/nms-p2p-nix-distributed.cc index 5e23949e1..b74830860 100644 --- a/examples/mpi/nms-p2p-nix-distributed.cc +++ b/examples/mpi/nms-p2p-nix-distributed.cc @@ -41,7 +41,6 @@ #include "ns3/core-module.h" #include "ns3/internet-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/onoff-application.h" #include "ns3/packet-sink.h" #include "ns3/point-to-point-net-device.h" diff --git a/examples/mpi/simple-distributed.cc b/examples/mpi/simple-distributed.cc index 8b96ba601..ba57225e9 100644 --- a/examples/mpi/simple-distributed.cc +++ b/examples/mpi/simple-distributed.cc @@ -43,7 +43,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/mpi-interface.h" #include "ns3/ipv4-global-routing-helper.h" #include "ns3/ipv4-static-routing-helper.h" diff --git a/examples/mpi/third-distributed.cc b/examples/mpi/third-distributed.cc index 8cdad9eef..1c52acb16 100644 --- a/examples/mpi/third-distributed.cc +++ b/examples/mpi/third-distributed.cc @@ -16,7 +16,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" #include "ns3/mpi-interface.h" diff --git a/examples/naming/object-names.cc b/examples/naming/object-names.cc index 3c69f7080..f39c3fc45 100644 --- a/examples/naming/object-names.cc +++ b/examples/naming/object-names.cc @@ -23,7 +23,6 @@ // #include "ns3/core-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" diff --git a/examples/realtime/realtime-udp-echo.cc b/examples/realtime/realtime-udp-echo.cc index d812efd5f..512287191 100644 --- a/examples/realtime/realtime-udp-echo.cc +++ b/examples/realtime/realtime-udp-echo.cc @@ -27,7 +27,6 @@ #include #include "ns3/core-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" diff --git a/examples/routing/dynamic-global-routing.cc b/examples/routing/dynamic-global-routing.cc index 458609b50..23fbea7ba 100644 --- a/examples/routing/dynamic-global-routing.cc +++ b/examples/routing/dynamic-global-routing.cc @@ -69,7 +69,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" diff --git a/examples/routing/global-injection-slash32.cc b/examples/routing/global-injection-slash32.cc index 5a5dc525d..3f0764065 100644 --- a/examples/routing/global-injection-slash32.cc +++ b/examples/routing/global-injection-slash32.cc @@ -29,7 +29,6 @@ #include "ns3/network-module.h" #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-static-routing.h" #include "ns3/ipv4-global-routing.h" diff --git a/examples/routing/global-routing-slash32.cc b/examples/routing/global-routing-slash32.cc index 430f7c139..7b7b90cea 100644 --- a/examples/routing/global-routing-slash32.cc +++ b/examples/routing/global-routing-slash32.cc @@ -29,7 +29,6 @@ #include "ns3/network-module.h" #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/routing/mixed-global-routing.cc b/examples/routing/mixed-global-routing.cc index 9c04837d0..ca9cf9368 100644 --- a/examples/routing/mixed-global-routing.cc +++ b/examples/routing/mixed-global-routing.cc @@ -39,7 +39,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/point-to-point-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/routing/simple-alternate-routing.cc b/examples/routing/simple-alternate-routing.cc index bf4b400ea..19b68add8 100644 --- a/examples/routing/simple-alternate-routing.cc +++ b/examples/routing/simple-alternate-routing.cc @@ -41,7 +41,6 @@ #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/routing/simple-global-routing.cc b/examples/routing/simple-global-routing.cc index 093347b95..664f1400c 100644 --- a/examples/routing/simple-global-routing.cc +++ b/examples/routing/simple-global-routing.cc @@ -43,7 +43,6 @@ #include "ns3/network-module.h" #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/flow-monitor-helper.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/routing/simple-routing-ping6.cc b/examples/routing/simple-routing-ping6.cc index c1689adb6..ed338253b 100644 --- a/examples/routing/simple-routing-ping6.cc +++ b/examples/routing/simple-routing-ping6.cc @@ -31,7 +31,6 @@ #include #include "ns3/core-module.h" #include "ns3/internet-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" #include "ns3/ipv6-static-routing-helper.h" diff --git a/examples/routing/static-routing-slash32.cc b/examples/routing/static-routing-slash32.cc index 28f9174f8..13455432f 100644 --- a/examples/routing/static-routing-slash32.cc +++ b/examples/routing/static-routing-slash32.cc @@ -29,7 +29,6 @@ #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" #include "ns3/csma-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-static-routing-helper.h" diff --git a/examples/socket/socket-bound-static-routing.cc b/examples/socket/socket-bound-static-routing.cc index 53f03c295..037a38e02 100644 --- a/examples/socket/socket-bound-static-routing.cc +++ b/examples/socket/socket-bound-static-routing.cc @@ -39,7 +39,6 @@ #include "ns3/network-module.h" #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" -#include "ns3/helper-module.h" #include "ns3/ipv4-static-routing-helper.h" #include "ns3/ipv4-list-routing-helper.h" diff --git a/examples/socket/socket-bound-tcp-static-routing.cc b/examples/socket/socket-bound-tcp-static-routing.cc index c62d04be7..2d588314b 100644 --- a/examples/socket/socket-bound-tcp-static-routing.cc +++ b/examples/socket/socket-bound-tcp-static-routing.cc @@ -39,7 +39,6 @@ #include "ns3/network-module.h" #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-static-routing-helper.h" #include "ns3/ipv4-list-routing-helper.h" diff --git a/examples/stats/wifi-example-sim.cc b/examples/stats/wifi-example-sim.cc index cc4d36245..48f0f7239 100644 --- a/examples/stats/wifi-example-sim.cc +++ b/examples/stats/wifi-example-sim.cc @@ -38,7 +38,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/wifi-module.h" #include "ns3/internet-module.h" diff --git a/examples/tcp/tcp-bulk-send.cc b/examples/tcp/tcp-bulk-send.cc index 52eda6012..7be5b2f93 100644 --- a/examples/tcp/tcp-bulk-send.cc +++ b/examples/tcp/tcp-bulk-send.cc @@ -27,7 +27,6 @@ #include #include #include "ns3/core-module.h" -#include "ns3/helper-module.h" #include "ns3/point-to-point-module.h" #include "ns3/internet-module.h" #include "ns3/applications-module.h" diff --git a/examples/tcp/tcp-large-transfer.cc b/examples/tcp/tcp-large-transfer.cc index 41f59765f..ff5e76a2f 100644 --- a/examples/tcp/tcp-large-transfer.cc +++ b/examples/tcp/tcp-large-transfer.cc @@ -37,7 +37,6 @@ #include #include "ns3/core-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/network-module.h" #include "ns3/internet-module.h" diff --git a/examples/tcp/tcp-nsc-lfn.cc b/examples/tcp/tcp-nsc-lfn.cc index 4f1e32be6..54d54ecc4 100644 --- a/examples/tcp/tcp-nsc-lfn.cc +++ b/examples/tcp/tcp-nsc-lfn.cc @@ -34,7 +34,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" diff --git a/examples/tcp/tcp-nsc-zoo.cc b/examples/tcp/tcp-nsc-zoo.cc index caf0e2eeb..da5d10dfe 100644 --- a/examples/tcp/tcp-nsc-zoo.cc +++ b/examples/tcp/tcp-nsc-zoo.cc @@ -31,7 +31,6 @@ #include #include "ns3/core-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/network-module.h" #include "ns3/csma-module.h" diff --git a/examples/tcp/tcp-star-server.cc b/examples/tcp/tcp-star-server.cc index c126d977f..8ffff68d6 100644 --- a/examples/tcp/tcp-star-server.cc +++ b/examples/tcp/tcp-star-server.cc @@ -50,7 +50,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" diff --git a/examples/tutorial/fifth.cc b/examples/tutorial/fifth.cc index 7bc65956d..e818964f1 100644 --- a/examples/tutorial/fifth.cc +++ b/examples/tutorial/fifth.cc @@ -18,7 +18,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/internet-module.h" -#include "ns3/helper-module.h" #include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" diff --git a/examples/tutorial/first.cc b/examples/tutorial/first.cc index 7e4766b6f..8e8479c54 100644 --- a/examples/tutorial/first.cc +++ b/examples/tutorial/first.cc @@ -18,7 +18,6 @@ #include "ns3/network-module.h" #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" using namespace ns3; diff --git a/examples/tutorial/second.cc b/examples/tutorial/second.cc index 930532830..7c85f5c58 100644 --- a/examples/tutorial/second.cc +++ b/examples/tutorial/second.cc @@ -16,7 +16,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" diff --git a/examples/tutorial/sixth.cc b/examples/tutorial/sixth.cc index fac5724f4..70c00a4b0 100644 --- a/examples/tutorial/sixth.cc +++ b/examples/tutorial/sixth.cc @@ -18,7 +18,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/internet-module.h" -#include "ns3/helper-module.h" #include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" diff --git a/examples/tutorial/third.cc b/examples/tutorial/third.cc index a92047fde..1129b4588 100644 --- a/examples/tutorial/third.cc +++ b/examples/tutorial/third.cc @@ -17,7 +17,6 @@ #include "ns3/core-module.h" #include "ns3/point-to-point-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" diff --git a/examples/udp-client-server/udp-client-server.cc b/examples/udp-client-server/udp-client-server.cc index 1daaf192f..ec7359296 100644 --- a/examples/udp-client-server/udp-client-server.cc +++ b/examples/udp-client-server/udp-client-server.cc @@ -26,7 +26,6 @@ #include #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" diff --git a/examples/udp-client-server/udp-trace-client-server.cc b/examples/udp-client-server/udp-trace-client-server.cc index 3d823c211..087bafe65 100644 --- a/examples/udp-client-server/udp-trace-client-server.cc +++ b/examples/udp-client-server/udp-trace-client-server.cc @@ -25,7 +25,6 @@ #include #include "ns3/core-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" diff --git a/examples/udp/udp-echo.cc b/examples/udp/udp-echo.cc index 8d849604b..bbab90be9 100644 --- a/examples/udp/udp-echo.cc +++ b/examples/udp/udp-echo.cc @@ -27,7 +27,6 @@ #include #include "ns3/core-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" diff --git a/examples/wireless/mixed-wireless.cc b/examples/wireless/mixed-wireless.cc index 51353c24b..fed275b62 100644 --- a/examples/wireless/mixed-wireless.cc +++ b/examples/wireless/mixed-wireless.cc @@ -62,7 +62,6 @@ #include #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wireless/multirate.cc b/examples/wireless/multirate.cc index 038366ef4..1a6bb7654 100644 --- a/examples/wireless/multirate.cc +++ b/examples/wireless/multirate.cc @@ -50,7 +50,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wireless/simple-wifi-frame-aggregation.cc b/examples/wireless/simple-wifi-frame-aggregation.cc index 8644b15a6..f8a5b545a 100644 --- a/examples/wireless/simple-wifi-frame-aggregation.cc +++ b/examples/wireless/simple-wifi-frame-aggregation.cc @@ -19,7 +19,6 @@ */ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" diff --git a/examples/wireless/wifi-adhoc.cc b/examples/wireless/wifi-adhoc.cc index 20b9c9a3f..5a31efd50 100644 --- a/examples/wireless/wifi-adhoc.cc +++ b/examples/wireless/wifi-adhoc.cc @@ -20,7 +20,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wireless/wifi-ap.cc b/examples/wireless/wifi-ap.cc index 20f98ab12..9520c5d7a 100644 --- a/examples/wireless/wifi-ap.cc +++ b/examples/wireless/wifi-ap.cc @@ -21,7 +21,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wireless/wifi-blockack.cc b/examples/wireless/wifi-blockack.cc index 4bf81013b..42db10b9c 100644 --- a/examples/wireless/wifi-blockack.cc +++ b/examples/wireless/wifi-blockack.cc @@ -42,7 +42,6 @@ #include "ns3/core-module.h" #include "ns3/internet-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" diff --git a/examples/wireless/wifi-clear-channel-cmu.cc b/examples/wireless/wifi-clear-channel-cmu.cc index 1ec7cb2a7..a7b575a7b 100644 --- a/examples/wireless/wifi-clear-channel-cmu.cc +++ b/examples/wireless/wifi-clear-channel-cmu.cc @@ -20,7 +20,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wifi-module.h" diff --git a/examples/wireless/wifi-hidden-terminal.cc b/examples/wireless/wifi-hidden-terminal.cc index a53c112ac..6de5f68f5 100644 --- a/examples/wireless/wifi-hidden-terminal.cc +++ b/examples/wireless/wifi-hidden-terminal.cc @@ -32,7 +32,6 @@ #include "ns3/core-module.h" #include "ns3/propagation-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/internet-module.h" diff --git a/examples/wireless/wifi-simple-adhoc-grid.cc b/examples/wireless/wifi-simple-adhoc-grid.cc index 326d4b49d..a4505485f 100644 --- a/examples/wireless/wifi-simple-adhoc-grid.cc +++ b/examples/wireless/wifi-simple-adhoc-grid.cc @@ -71,7 +71,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wifi-module.h" diff --git a/examples/wireless/wifi-simple-adhoc.cc b/examples/wireless/wifi-simple-adhoc.cc index 578b02275..14ac0f975 100644 --- a/examples/wireless/wifi-simple-adhoc.cc +++ b/examples/wireless/wifi-simple-adhoc.cc @@ -53,7 +53,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wifi-module.h" diff --git a/examples/wireless/wifi-simple-infra.cc b/examples/wireless/wifi-simple-infra.cc index 06548eb96..5cdbe7b9b 100644 --- a/examples/wireless/wifi-simple-infra.cc +++ b/examples/wireless/wifi-simple-infra.cc @@ -54,7 +54,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wifi-module.h" diff --git a/examples/wireless/wifi-simple-interference.cc b/examples/wireless/wifi-simple-interference.cc index 891f14f1d..a824cfc84 100644 --- a/examples/wireless/wifi-simple-interference.cc +++ b/examples/wireless/wifi-simple-interference.cc @@ -82,7 +82,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wifi-module.h" diff --git a/examples/wireless/wifi-wired-bridging.cc b/examples/wireless/wifi-wired-bridging.cc index a8ca3d6b7..c574feda6 100644 --- a/examples/wireless/wifi-wired-bridging.cc +++ b/examples/wireless/wifi-wired-bridging.cc @@ -45,7 +45,6 @@ #include "ns3/core-module.h" #include "ns3/mobility-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/network-module.h" diff --git a/examples/wireless/wscript b/examples/wireless/wscript index c89779525..122fb6e45 100644 --- a/examples/wireless/wscript +++ b/examples/wireless/wscript @@ -14,7 +14,7 @@ def build(bld): obj = bld.create_ns3_program('wifi-ap', ['core', 'mobility', 'wifi']) obj.source = 'wifi-ap.cc' - obj = bld.create_ns3_program('wifi-wired-bridging', ['core', 'mobility', 'wifi', 'csma', 'helper', 'bridge']) + obj = bld.create_ns3_program('wifi-wired-bridging', ['core', 'mobility', 'wifi', 'csma', 'bridge']) obj.source = 'wifi-wired-bridging.cc' obj = bld.create_ns3_program('simple-wifi-frame-aggregation', ['core', 'mobility', 'wifi']) diff --git a/samples/main-random-topology.cc b/samples/main-random-topology.cc index 37ce41168..296fc9129 100644 --- a/samples/main-random-topology.cc +++ b/samples/main-random-topology.cc @@ -2,7 +2,6 @@ #include "ns3/core-module.h" #include "ns3/mobility-module.h" -#include "ns3/helper-module.h" using namespace ns3; diff --git a/samples/main-random-walk.cc b/samples/main-random-walk.cc index c02e12a8a..22f7dbf37 100644 --- a/samples/main-random-walk.cc +++ b/samples/main-random-walk.cc @@ -1,7 +1,6 @@ /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ #include "ns3/core-module.h" -#include "ns3/helper-module.h" #include "ns3/mobility-module.h" using namespace ns3; diff --git a/samples/main-simple.cc b/samples/main-simple.cc index 9ebb0f251..9fc558ee6 100644 --- a/samples/main-simple.cc +++ b/samples/main-simple.cc @@ -1,7 +1,6 @@ #include #include "ns3/core-module.h" -#include "ns3/helper-module.h" #include "ns3/network-module.h" #include "ns3/internet-module.h" diff --git a/samples/wscript b/samples/wscript index 6cca593b6..905ffa4b6 100644 --- a/samples/wscript +++ b/samples/wscript @@ -39,11 +39,11 @@ def build(bld): obj.source = 'main-grid-topology.cc' obj = bld.create_ns3_program('main-random-topology', - ['core', 'helper', 'mobility']) + ['core', 'mobility']) obj.source = 'main-random-topology.cc' obj = bld.create_ns3_program('main-random-walk', - ['core', 'helper', 'mobility']) + ['core', 'mobility']) obj.source = 'main-random-walk.cc' obj = bld.create_ns3_program('main-propagation-loss', diff --git a/scratch/multiple-sources/simple-simulation.cc b/scratch/multiple-sources/simple-simulation.cc index 837f3a9ea..04b0bbe74 100644 --- a/scratch/multiple-sources/simple-simulation.cc +++ b/scratch/multiple-sources/simple-simulation.cc @@ -1,7 +1,6 @@ #include #include "ns3/core-module.h" -#include "ns3/helper-module.h" #include "ns3/network-module.h" #include "ns3/internet-module.h" diff --git a/scratch/simple.cc b/scratch/simple.cc index cb29ea34b..078500115 100644 --- a/scratch/simple.cc +++ b/scratch/simple.cc @@ -1,7 +1,6 @@ #include #include "ns3/core-module.h" -#include "ns3/helper-module.h" #include "ns3/network-module.h" #include "ns3/internet-module.h" diff --git a/src/bridge/examples/csma-bridge-one-hop.cc b/src/bridge/examples/csma-bridge-one-hop.cc index 8d543e095..56d232ab8 100644 --- a/src/bridge/examples/csma-bridge-one-hop.cc +++ b/src/bridge/examples/csma-bridge-one-hop.cc @@ -71,7 +71,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/bridge-module.h" #include "ns3/csma-module.h" diff --git a/src/bridge/examples/csma-bridge.cc b/src/bridge/examples/csma-bridge.cc index 0f7b3095e..7babdcb4a 100644 --- a/src/bridge/examples/csma-bridge.cc +++ b/src/bridge/examples/csma-bridge.cc @@ -34,7 +34,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/bridge-module.h" #include "ns3/csma-module.h" diff --git a/src/click/examples/nsclick-raw-wlan.cc b/src/click/examples/nsclick-raw-wlan.cc index a914ab06c..1eddb377f 100644 --- a/src/click/examples/nsclick-raw-wlan.cc +++ b/src/click/examples/nsclick-raw-wlan.cc @@ -27,7 +27,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/click-internet-stack-helper.h" #include "ns3/log.h" #include "ns3/mobility-helper.h" diff --git a/src/click/examples/nsclick-routing.cc b/src/click/examples/nsclick-routing.cc index d0017f8a0..f9f72db37 100644 --- a/src/click/examples/nsclick-routing.cc +++ b/src/click/examples/nsclick-routing.cc @@ -32,7 +32,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/ipv4-click-routing.h" #include "ns3/ipv4-l3-click-protocol.h" #include "ns3/click-internet-stack-helper.h" diff --git a/src/click/examples/nsclick-simple-lan.cc b/src/click/examples/nsclick-simple-lan.cc index c3bb8ebfb..5cfd4366b 100644 --- a/src/click/examples/nsclick-simple-lan.cc +++ b/src/click/examples/nsclick-simple-lan.cc @@ -27,7 +27,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/click-internet-stack-helper.h" #include "ns3/log.h" diff --git a/src/click/examples/nsclick-udp-client-server-csma.cc b/src/click/examples/nsclick-udp-client-server-csma.cc index c21ccc3ef..783f1d99a 100644 --- a/src/click/examples/nsclick-udp-client-server-csma.cc +++ b/src/click/examples/nsclick-udp-client-server-csma.cc @@ -35,7 +35,6 @@ #include #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/ipv4-click-routing.h" #include "ns3/click-internet-stack-helper.h" diff --git a/src/click/examples/nsclick-udp-client-server-wifi.cc b/src/click/examples/nsclick-udp-client-server-wifi.cc index 7dbf40030..14c48f94f 100644 --- a/src/click/examples/nsclick-udp-client-server-wifi.cc +++ b/src/click/examples/nsclick-udp-client-server-wifi.cc @@ -33,7 +33,6 @@ #include #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/ipv4-click-routing.h" #include "ns3/click-internet-stack-helper.h" #include "ns3/mobility-helper.h" diff --git a/src/csma/examples/csma-broadcast.cc b/src/csma/examples/csma-broadcast.cc index a388b6e12..5b2e11db3 100644 --- a/src/csma/examples/csma-broadcast.cc +++ b/src/csma/examples/csma-broadcast.cc @@ -34,7 +34,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" diff --git a/src/csma/examples/csma-multicast.cc b/src/csma/examples/csma-multicast.cc index 75ce464e6..7ebbfa5ed 100644 --- a/src/csma/examples/csma-multicast.cc +++ b/src/csma/examples/csma-multicast.cc @@ -34,7 +34,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-static-routing-helper.h" diff --git a/src/csma/examples/csma-one-subnet.cc b/src/csma/examples/csma-one-subnet.cc index 70a762a76..5bf447e4f 100644 --- a/src/csma/examples/csma-one-subnet.cc +++ b/src/csma/examples/csma-one-subnet.cc @@ -30,7 +30,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" diff --git a/src/csma/examples/csma-packet-socket.cc b/src/csma/examples/csma-packet-socket.cc index 4088400ba..9a25829c4 100644 --- a/src/csma/examples/csma-packet-socket.cc +++ b/src/csma/examples/csma-packet-socket.cc @@ -34,7 +34,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" diff --git a/src/csma/examples/csma-ping.cc b/src/csma/examples/csma-ping.cc index 54e4f7a2a..8b4b9f267 100644 --- a/src/csma/examples/csma-ping.cc +++ b/src/csma/examples/csma-ping.cc @@ -30,7 +30,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" diff --git a/src/csma/examples/csma-raw-ip-socket.cc b/src/csma/examples/csma-raw-ip-socket.cc index 322535592..096dbbc0a 100644 --- a/src/csma/examples/csma-raw-ip-socket.cc +++ b/src/csma/examples/csma-raw-ip-socket.cc @@ -33,7 +33,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" diff --git a/src/csma/examples/csma-star.cc b/src/csma/examples/csma-star.cc index d426771cc..b070f8320 100644 --- a/src/csma/examples/csma-star.cc +++ b/src/csma/examples/csma-star.cc @@ -17,7 +17,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-star-helper.h" #include "ns3/applications-module.h" #include "ns3/csma-module.h" diff --git a/src/dsdv/examples/dsdv-manet.cc b/src/dsdv/examples/dsdv-manet.cc index bdfd9ff32..1b90e6ed6 100644 --- a/src/dsdv/examples/dsdv-manet.cc +++ b/src/dsdv/examples/dsdv-manet.cc @@ -30,7 +30,6 @@ */ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/src/emu/examples/emu-ping.cc b/src/emu/examples/emu-ping.cc index 16ceaa975..66b7552f5 100644 --- a/src/emu/examples/emu-ping.cc +++ b/src/emu/examples/emu-ping.cc @@ -57,7 +57,6 @@ #include "ns3/network-module.h" #include "ns3/emu-module.h" #include "ns3/applications-module.h" -#include "ns3/helper-module.h" #include "ns3/ipv4-static-routing-helper.h" #include "ns3/ipv4-list-routing-helper.h" diff --git a/src/emu/examples/emu-udp-echo.cc b/src/emu/examples/emu-udp-echo.cc index b97bfe5cd..4e3dd398f 100644 --- a/src/emu/examples/emu-udp-echo.cc +++ b/src/emu/examples/emu-udp-echo.cc @@ -63,7 +63,6 @@ #include #include "ns3/core-module.h" -#include "ns3/helper-module.h" #include "ns3/internet-module.h" #include "ns3/applications-module.h" #include "ns3/emu-helper.h" diff --git a/src/helper/waf b/src/helper/waf deleted file mode 100755 index 3dcf598bc..000000000 --- a/src/helper/waf +++ /dev/null @@ -1 +0,0 @@ -exec "`dirname "$0"`"/../../waf "$@" \ No newline at end of file diff --git a/src/helper/wscript b/src/helper/wscript deleted file mode 100644 index 6c6a3ce04..000000000 --- a/src/helper/wscript +++ /dev/null @@ -1,15 +0,0 @@ -## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- - -def build(bld): - helper = bld.create_ns3_module('helper', ['mobility', 'network', 'internet', 'wifi', 'point-to-point', 'spectrum']) - helper.source = [ - 'athstats-helper.cc', - ] - - headers = bld.new_task_gen('ns3header') - headers.module = 'helper' - headers.source = [ - 'athstats-helper.h', - ] - - env = bld.env_of_name('default') diff --git a/src/lte/examples/lte-amc.cc b/src/lte/examples/lte-amc.cc index c3363af56..c6507580a 100644 --- a/src/lte/examples/lte-amc.cc +++ b/src/lte/examples/lte-amc.cc @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/src/lte/examples/lte-channel-model.cc b/src/lte/examples/lte-channel-model.cc index ce8e6649f..34a304190 100644 --- a/src/lte/examples/lte-channel-model.cc +++ b/src/lte/examples/lte-channel-model.cc @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/src/lte/examples/lte-device.cc b/src/lte/examples/lte-device.cc index 3bd9c024c..c134d76af 100644 --- a/src/lte/examples/lte-device.cc +++ b/src/lte/examples/lte-device.cc @@ -12,7 +12,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/src/lte/examples/lte-multiple-flows.cc b/src/lte/examples/lte-multiple-flows.cc index 9872ece67..2aa0b1c58 100644 --- a/src/lte/examples/lte-multiple-flows.cc +++ b/src/lte/examples/lte-multiple-flows.cc @@ -12,7 +12,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/src/lte/examples/lte-phy-downlink.cc b/src/lte/examples/lte-phy-downlink.cc index 65d781c3c..28317684a 100644 --- a/src/lte/examples/lte-phy-downlink.cc +++ b/src/lte/examples/lte-phy-downlink.cc @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include diff --git a/src/lte/examples/lte-phy-uplink.cc b/src/lte/examples/lte-phy-uplink.cc index a802020e4..715009c23 100644 --- a/src/lte/examples/lte-phy-uplink.cc +++ b/src/lte/examples/lte-phy-uplink.cc @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include diff --git a/src/mesh/examples/mesh.cc b/src/mesh/examples/mesh.cc index 8e4e64af2..b16e108d3 100644 --- a/src/mesh/examples/mesh.cc +++ b/src/mesh/examples/mesh.cc @@ -47,7 +47,6 @@ #include "ns3/core-module.h" #include "ns3/internet-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/mesh-module.h" diff --git a/src/nix-vector-routing/doc/nix-vector-routing.h b/src/nix-vector-routing/doc/nix-vector-routing.h index 2c0ef3e94..d2a67df59 100644 --- a/src/nix-vector-routing/doc/nix-vector-routing.h +++ b/src/nix-vector-routing/doc/nix-vector-routing.h @@ -37,8 +37,6 @@ * * \section api API and Usage * - * Nix-vector routing has been rolled into a helper class. In order to - * utilize these helper functions, users must include ns3/helper-module.h. * The Nix-vector routing protocol must be added to a list of routing * protocols. It is important that list routing is utilized. * diff --git a/src/nix-vector-routing/examples/nix-simple.cc b/src/nix-vector-routing/examples/nix-simple.cc index 2cd36809c..d8497cab3 100644 --- a/src/nix-vector-routing/examples/nix-simple.cc +++ b/src/nix-vector-routing/examples/nix-simple.cc @@ -16,7 +16,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" diff --git a/src/nix-vector-routing/examples/nms-p2p-nix.cc b/src/nix-vector-routing/examples/nms-p2p-nix.cc index bf1a49f42..e4034f02e 100644 --- a/src/nix-vector-routing/examples/nms-p2p-nix.cc +++ b/src/nix-vector-routing/examples/nms-p2p-nix.cc @@ -39,7 +39,6 @@ #include "ns3/core-module.h" #include "ns3/internet-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" #include "ns3/onoff-application.h" diff --git a/src/olsr/examples/olsr-hna.cc b/src/olsr/examples/olsr-hna.cc index 81d22adc7..d2dc364b7 100644 --- a/src/olsr/examples/olsr-hna.cc +++ b/src/olsr/examples/olsr-hna.cc @@ -52,7 +52,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wifi-module.h" diff --git a/src/olsr/examples/simple-point-to-point-olsr.cc b/src/olsr/examples/simple-point-to-point-olsr.cc index a2da75b62..d3a691d17 100644 --- a/src/olsr/examples/simple-point-to-point-olsr.cc +++ b/src/olsr/examples/simple-point-to-point-olsr.cc @@ -43,7 +43,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/internet-module.h" -#include "ns3/helper-module.h" #include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" #include "ns3/olsr-helper.h" diff --git a/src/tap-bridge/examples/tap-csma-virtual-machine.cc b/src/tap-bridge/examples/tap-csma-virtual-machine.cc index d76b7b971..2219cb5c3 100644 --- a/src/tap-bridge/examples/tap-csma-virtual-machine.cc +++ b/src/tap-bridge/examples/tap-csma-virtual-machine.cc @@ -63,7 +63,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/tap-bridge-module.h" diff --git a/src/tap-bridge/examples/tap-csma.cc b/src/tap-bridge/examples/tap-csma.cc index c78975bb1..85370245a 100644 --- a/src/tap-bridge/examples/tap-csma.cc +++ b/src/tap-bridge/examples/tap-csma.cc @@ -60,7 +60,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/wifi-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/internet-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/src/tap-bridge/examples/tap-wifi-dumbbell.cc b/src/tap-bridge/examples/tap-wifi-dumbbell.cc index f2069a382..712e896e9 100644 --- a/src/tap-bridge/examples/tap-wifi-dumbbell.cc +++ b/src/tap-bridge/examples/tap-wifi-dumbbell.cc @@ -105,7 +105,6 @@ #include "ns3/point-to-point-module.h" #include "ns3/wifi-module.h" #include "ns3/internet-module.h" -#include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/src/tap-bridge/examples/tap-wifi-virtual-machine.cc b/src/tap-bridge/examples/tap-wifi-virtual-machine.cc index 4dbf209d6..4ddd9fee4 100644 --- a/src/tap-bridge/examples/tap-wifi-virtual-machine.cc +++ b/src/tap-bridge/examples/tap-wifi-virtual-machine.cc @@ -73,7 +73,6 @@ #include "ns3/network-module.h" #include "ns3/mobility-module.h" #include "ns3/wifi-module.h" -#include "ns3/helper-module.h" #include "ns3/tap-bridge-module.h" using namespace ns3; diff --git a/src/test/perf/perf-io.cc b/src/test/perf/perf-io.cc index b40d7f900..ec0bb7731 100644 --- a/src/test/perf/perf-io.cc +++ b/src/test/perf/perf-io.cc @@ -25,7 +25,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/abort.h" using namespace ns3; diff --git a/src/topology-read/examples/topology-example-sim.cc b/src/topology-read/examples/topology-example-sim.cc index cfaa109fe..f6280a600 100644 --- a/src/topology-read/examples/topology-example-sim.cc +++ b/src/topology-read/examples/topology-example-sim.cc @@ -28,7 +28,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" diff --git a/src/uan/examples/uan-cw-example.cc b/src/uan/examples/uan-cw-example.cc index cab28b3b0..c89ded932 100644 --- a/src/uan/examples/uan-cw-example.cc +++ b/src/uan/examples/uan-cw-example.cc @@ -41,7 +41,6 @@ #include "ns3/network-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include diff --git a/src/uan/examples/uan-cw-example.h b/src/uan/examples/uan-cw-example.h index 4903904e7..c90c30e63 100644 --- a/src/uan/examples/uan-cw-example.h +++ b/src/uan/examples/uan-cw-example.h @@ -24,7 +24,6 @@ #include "ns3/network-module.h" #include "ns3/contrib-module.h" #include "ns3/uan-module.h" -#include "ns3/helper-module.h" using namespace ns3; diff --git a/src/uan/examples/uan-rc-example.cc b/src/uan/examples/uan-rc-example.cc index 902b75531..64b76fecc 100644 --- a/src/uan/examples/uan-rc-example.cc +++ b/src/uan/examples/uan-rc-example.cc @@ -54,7 +54,6 @@ #include "uan-rc-example.h" #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/log.h" diff --git a/src/uan/examples/uan-rc-example.h b/src/uan/examples/uan-rc-example.h index df83bc96d..c60e5e57a 100644 --- a/src/uan/examples/uan-rc-example.h +++ b/src/uan/examples/uan-rc-example.h @@ -23,7 +23,6 @@ #include "ns3/network-module.h" #include "ns3/contrib-module.h" -#include "ns3/helper-module.h" #include "ns3/uan-module.h" using namespace ns3; diff --git a/src/virtual-net-device/examples/virtual-net-device.cc b/src/virtual-net-device/examples/virtual-net-device.cc index 2ae8cef3e..d4c83725c 100644 --- a/src/virtual-net-device/examples/virtual-net-device.cc +++ b/src/virtual-net-device/examples/virtual-net-device.cc @@ -53,7 +53,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" diff --git a/src/helper/athstats-helper.cc b/src/wifi/helper/athstats-helper.cc similarity index 100% rename from src/helper/athstats-helper.cc rename to src/wifi/helper/athstats-helper.cc diff --git a/src/helper/athstats-helper.h b/src/wifi/helper/athstats-helper.h similarity index 100% rename from src/helper/athstats-helper.h rename to src/wifi/helper/athstats-helper.h diff --git a/src/wifi/wscript b/src/wifi/wscript index b17cf2151..7206ede65 100644 --- a/src/wifi/wscript +++ b/src/wifi/wscript @@ -63,6 +63,7 @@ def build(bld): 'model/block-ack-manager.cc', 'model/block-ack-test-suite.cc', 'model/block-ack-cache.cc', + 'helper/athstats-helper.cc', 'helper/wifi-helper.cc', 'helper/yans-wifi-helper.cc', 'helper/nqos-wifi-mac-helper.cc', @@ -125,6 +126,7 @@ def build(bld): 'model/block-ack-agreement.h', 'model/block-ack-manager.h', 'model/block-ack-cache.h', + 'helper/athstats-helper.h', 'helper/wifi-helper.h', 'helper/yans-wifi-helper.h', 'helper/nqos-wifi-mac-helper.h', diff --git a/src/wimax/examples/wimax-ipv4.cc b/src/wimax/examples/wimax-ipv4.cc index 9584b67b8..ac19a5802 100644 --- a/src/wimax/examples/wimax-ipv4.cc +++ b/src/wimax/examples/wimax-ipv4.cc @@ -52,7 +52,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/src/wimax/examples/wimax-multicast.cc b/src/wimax/examples/wimax-multicast.cc index b9e5d1652..c478499ae 100644 --- a/src/wimax/examples/wimax-multicast.cc +++ b/src/wimax/examples/wimax-multicast.cc @@ -52,7 +52,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/src/wimax/examples/wimax-simple.cc b/src/wimax/examples/wimax-simple.cc index e022635f1..612d22420 100644 --- a/src/wimax/examples/wimax-simple.cc +++ b/src/wimax/examples/wimax-simple.cc @@ -44,7 +44,6 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" -#include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/src/wscript b/src/wscript index b657d4650..91edc3d8c 100644 --- a/src/wscript +++ b/src/wscript @@ -37,7 +37,6 @@ all_modules = ( 'click', 'mobility', 'wifi', - 'helper', 'netanim', 'stats', 'uan', diff --git a/utils/print-introspected-doxygen.cc b/utils/print-introspected-doxygen.cc index 7a8a28324..142f3c75a 100644 --- a/utils/print-introspected-doxygen.cc +++ b/utils/print-introspected-doxygen.cc @@ -7,7 +7,6 @@ #include "ns3/log.h" #include "ns3/global-value.h" #include "ns3/string.h" -#include "ns3/helper-module.h" using namespace ns3;