From cd3da7143da2b97f03a27d0418dae905f8e65109 Mon Sep 17 00:00:00 2001 From: "Peter D. Barnes, Jr." Date: Wed, 5 Mar 2014 17:06:59 -0800 Subject: [PATCH] [doxygen] Revert r10410, r10411, r10412 --- src/antenna/model/antenna-model.cc | 3 +- src/antenna/model/cosine-antenna-model.cc | 3 +- src/antenna/model/isotropic-antenna-model.cc | 3 +- src/antenna/model/parabolic-antenna-model.cc | 3 +- src/aodv/model/aodv-packet.cc | 15 ++---- src/aodv/model/aodv-routing-protocol.cc | 6 +-- .../model/application-packet-probe.cc | 3 +- .../model/bulk-send-application.cc | 3 +- src/applications/model/onoff-application.cc | 3 +- src/applications/model/packet-loss-counter.cc | 3 +- src/applications/model/packet-sink.cc | 6 +-- src/applications/model/ping6.cc | 6 +-- src/applications/model/radvd-interface.cc | 3 +- src/applications/model/radvd-prefix.cc | 3 +- src/applications/model/radvd.cc | 6 +-- src/applications/model/seq-ts-header.cc | 3 +- src/applications/model/udp-client.cc | 6 +-- src/applications/model/udp-echo-client.cc | 6 +-- src/applications/model/udp-echo-server.cc | 6 +-- src/applications/model/udp-server.cc | 6 +-- src/applications/model/udp-trace-client.cc | 6 +-- src/applications/model/v4ping.cc | 6 +-- src/bridge/model/bridge-channel.cc | 3 +- src/bridge/model/bridge-net-device.cc | 3 +- src/buildings/helper/building-allocator.cc | 3 +- .../helper/building-position-allocator.cc | 12 ++--- src/buildings/model/building-list.cc | 6 +-- src/buildings/model/building.cc | 3 +- .../model/buildings-propagation-loss-model.cc | 3 +- ...hybrid-buildings-propagation-loss-model.cc | 3 +- .../itu-r-1238-propagation-loss-model.cc | 3 +- src/buildings/model/mobility-building-info.cc | 3 +- .../oh-buildings-propagation-loss-model.cc | 3 +- src/click/model/ipv4-click-routing.cc | 3 +- src/click/model/ipv4-l3-click-protocol.cc | 3 +- .../examples/config-store-save.cc | 3 +- src/config-store/model/config-store.cc | 3 +- src/config-store/model/gtk-config-store.cc | 3 +- src/core/model/attribute-construction-list.cc | 3 +- src/core/model/calendar-scheduler.cc | 6 +-- src/core/model/default-simulator-impl.cc | 3 +- src/core/model/global-value.cc | 3 +- src/core/model/hash-fnv.cc | 3 +- src/core/model/hash-function.cc | 3 +- src/core/model/hash-murmur3.cc | 3 +- src/core/model/hash.cc | 3 +- src/core/model/heap-scheduler.cc | 3 +- src/core/model/list-scheduler.cc | 3 +- src/core/model/map-scheduler.cc | 3 +- src/core/model/names.cc | 3 +- src/core/model/object-base.cc | 3 +- src/core/model/object-factory.cc | 3 +- src/core/model/object.cc | 3 +- src/core/model/random-variable-stream.cc | 48 ++++++----------- src/core/model/random-variable.cc | 3 +- src/core/model/realtime-simulator-impl.cc | 3 +- src/core/model/scheduler.cc | 3 +- src/core/model/synchronizer.cc | 3 +- src/core/model/test.cc | 3 +- src/core/model/type-id.cc | 3 +- src/core/test/attribute-test-suite.cc | 6 +-- src/core/test/object-test-suite.cc | 12 ++--- src/csma/model/csma-channel.cc | 3 +- src/csma/model/csma-net-device.cc | 3 +- src/dsdv/model/dsdv-packet.cc | 5 +- src/dsdv/model/dsdv-routing-protocol.cc | 4 +- src/dsr/model/dsr-fs-header.cc | 6 +-- src/dsr/model/dsr-gratuitous-reply-table.cc | 3 +- src/dsr/model/dsr-network-queue.cc | 3 +- src/dsr/model/dsr-option-header.cc | 33 ++++-------- src/dsr/model/dsr-options.cc | 30 ++++------- src/dsr/model/dsr-passive-buff.cc | 3 +- src/dsr/model/dsr-rcache.cc | 3 +- src/dsr/model/dsr-routing.cc | 3 +- src/dsr/model/dsr-rreq-table.cc | 3 +- src/emu/model/emu-net-device.cc | 3 +- src/energy/model/basic-energy-source.cc | 3 +- src/energy/model/device-energy-model.cc | 3 +- src/energy/model/energy-source.cc | 3 +- src/energy/model/li-ion-energy-source.cc | 3 +- src/energy/model/rv-battery-model.cc | 3 +- .../model/simple-device-energy-model.cc | 3 +- src/energy/model/wifi-radio-energy-model.cc | 3 +- src/energy/test/li-ion-energy-source-test.cc | 3 +- src/fd-net-device/model/fd-net-device.cc | 3 +- src/flow-monitor/model/flow-monitor.cc | 6 +-- src/flow-monitor/model/histogram.cc | 3 +- src/flow-monitor/model/ipv4-flow-probe.cc | 3 +- src/internet/helper/ipv6-address-helper.cc | 3 +- src/internet/model/arp-cache.cc | 3 +- src/internet/model/arp-header.cc | 3 +- src/internet/model/arp-l3-protocol.cc | 3 +- src/internet/model/global-router-interface.cc | 3 +- src/internet/model/icmpv4-l4-protocol.cc | 6 +-- src/internet/model/icmpv4.cc | 12 ++--- src/internet/model/icmpv6-header.cc | 53 +++++++------------ src/internet/model/icmpv6-l4-protocol.cc | 6 +-- src/internet/model/ip-l4-protocol.cc | 3 +- src/internet/model/ipv4-end-point-demux.cc | 3 +- src/internet/model/ipv4-global-routing.cc | 3 +- src/internet/model/ipv4-header.cc | 6 +-- src/internet/model/ipv4-interface.cc | 3 +- src/internet/model/ipv4-l3-protocol.cc | 7 ++- src/internet/model/ipv4-list-routing.cc | 3 +- src/internet/model/ipv4-packet-probe.cc | 3 +- src/internet/model/ipv4-raw-socket-factory.cc | 3 +- src/internet/model/ipv4-raw-socket-impl.cc | 3 +- src/internet/model/ipv4-routing-protocol.cc | 3 +- src/internet/model/ipv4-static-routing.cc | 3 +- src/internet/model/ipv4.cc | 3 +- src/internet/model/ipv6-end-point-demux.cc | 3 +- src/internet/model/ipv6-end-point.cc | 3 +- src/internet/model/ipv6-extension-demux.cc | 3 +- src/internet/model/ipv6-extension-header.cc | 27 ++++------ src/internet/model/ipv6-extension.cc | 27 ++++------ src/internet/model/ipv6-header.cc | 3 +- src/internet/model/ipv6-interface-address.cc | 3 +- src/internet/model/ipv6-interface.cc | 6 +-- src/internet/model/ipv6-l3-protocol.cc | 6 +-- src/internet/model/ipv6-list-routing.cc | 3 +- src/internet/model/ipv6-option-demux.cc | 3 +- src/internet/model/ipv6-option-header.cc | 18 +++---- src/internet/model/ipv6-option.cc | 15 ++---- src/internet/model/ipv6-packet-probe.cc | 3 +- src/internet/model/ipv6-pmtu-cache.cc | 3 +- src/internet/model/ipv6-raw-socket-factory.cc | 3 +- src/internet/model/ipv6-raw-socket-impl.cc | 6 +-- src/internet/model/ipv6-routing-protocol.cc | 3 +- src/internet/model/ipv6-static-routing.cc | 6 +-- src/internet/model/ipv6.cc | 3 +- src/internet/model/loopback-net-device.cc | 3 +- src/internet/model/ndisc-cache.cc | 6 +-- src/internet/model/nsc-sysctl.cc | 3 +- src/internet/model/nsc-tcp-l4-protocol.cc | 3 +- src/internet/model/nsc-tcp-socket-impl.cc | 3 +- src/internet/model/rtt-estimator.cc | 6 +-- src/internet/model/tcp-header.cc | 3 +- src/internet/model/tcp-l4-protocol.cc | 3 +- src/internet/model/tcp-newreno.cc | 3 +- src/internet/model/tcp-reno.cc | 3 +- src/internet/model/tcp-rfc793.cc | 3 +- src/internet/model/tcp-socket-base.cc | 3 +- src/internet/model/tcp-socket-factory.cc | 3 +- src/internet/model/tcp-socket.cc | 3 +- src/internet/model/tcp-tahoe.cc | 3 +- src/internet/model/tcp-westwood.cc | 3 +- src/internet/model/udp-header.cc | 3 +- src/internet/model/udp-l4-protocol.cc | 3 +- src/internet/model/udp-socket-factory.cc | 3 +- src/internet/model/udp-socket-impl.cc | 3 +- src/internet/model/udp-socket.cc | 3 +- src/internet/test/error-channel.cc | 6 +-- src/lte/helper/epc-helper.cc | 6 +-- .../helper/lte-global-pathloss-database.cc | 3 +- src/lte/helper/lte-helper.cc | 3 +- .../lte-hex-grid-enb-topology-helper.cc | 3 +- src/lte/helper/lte-stats-calculator.cc | 3 +- src/lte/helper/mac-stats-calculator.cc | 6 +-- src/lte/helper/phy-rx-stats-calculator.cc | 6 +-- src/lte/helper/phy-stats-calculator.cc | 6 +-- src/lte/helper/phy-tx-stats-calculator.cc | 6 +-- src/lte/helper/point-to-point-epc-helper.cc | 6 +-- .../helper/radio-bearer-stats-calculator.cc | 6 +-- .../helper/radio-environment-map-helper.cc | 3 +- .../model/a2-a4-rsrq-handover-algorithm.cc | 3 +- src/lte/model/a3-rsrp-handover-algorithm.cc | 3 +- src/lte/model/epc-enb-application.cc | 3 +- src/lte/model/epc-gtpu-header.cc | 3 +- src/lte/model/epc-mme.cc | 3 +- src/lte/model/epc-sgw-pgw-application.cc | 3 +- src/lte/model/epc-tft.cc | 3 +- src/lte/model/epc-ue-nas.cc | 3 +- src/lte/model/epc-x2-header.cc | 24 +++------ src/lte/model/epc-x2.cc | 3 +- src/lte/model/eps-bearer-tag.cc | 3 +- src/lte/model/fdbet-ff-mac-scheduler.cc | 3 +- src/lte/model/fdmt-ff-mac-scheduler.cc | 3 +- src/lte/model/fdtbfq-ff-mac-scheduler.cc | 3 +- src/lte/model/ff-mac-scheduler.cc | 3 +- src/lte/model/lte-amc.cc | 3 +- src/lte/model/lte-anr.cc | 3 +- src/lte/model/lte-asn1-header.cc | 3 +- src/lte/model/lte-enb-mac.cc | 3 +- src/lte/model/lte-enb-net-device.cc | 3 +- src/lte/model/lte-enb-phy.cc | 3 +- src/lte/model/lte-enb-rrc.cc | 6 +-- src/lte/model/lte-handover-algorithm.cc | 3 +- src/lte/model/lte-net-device.cc | 3 +- src/lte/model/lte-pdcp-header.cc | 3 +- src/lte/model/lte-pdcp-tag.cc | 3 +- src/lte/model/lte-pdcp.cc | 3 +- src/lte/model/lte-phy-tag.cc | 3 +- src/lte/model/lte-phy.cc | 3 +- src/lte/model/lte-radio-bearer-info.cc | 3 +- src/lte/model/lte-radio-bearer-tag.cc | 3 +- src/lte/model/lte-rlc-am-header.cc | 3 +- src/lte/model/lte-rlc-am.cc | 3 +- src/lte/model/lte-rlc-header.cc | 3 +- src/lte/model/lte-rlc-sdu-status-tag.cc | 3 +- src/lte/model/lte-rlc-tag.cc | 3 +- src/lte/model/lte-rlc-tm.cc | 3 +- src/lte/model/lte-rlc-um.cc | 3 +- src/lte/model/lte-rlc.cc | 6 +-- src/lte/model/lte-rrc-protocol-ideal.cc | 6 +-- src/lte/model/lte-rrc-protocol-real.cc | 6 +-- src/lte/model/lte-spectrum-phy.cc | 3 +- src/lte/model/lte-ue-mac.cc | 3 +- src/lte/model/lte-ue-net-device.cc | 3 +- src/lte/model/lte-ue-phy.cc | 3 +- src/lte/model/lte-ue-rrc.cc | 3 +- src/lte/model/no-op-handover-algorithm.cc | 3 +- src/lte/model/pf-ff-mac-scheduler.cc | 3 +- src/lte/model/pss-ff-mac-scheduler.cc | 3 +- src/lte/model/rem-spectrum-phy.cc | 3 +- src/lte/model/rr-ff-mac-scheduler.cc | 3 +- src/lte/model/tdbet-ff-mac-scheduler.cc | 3 +- src/lte/model/tdmt-ff-mac-scheduler.cc | 3 +- src/lte/model/tdtbfq-ff-mac-scheduler.cc | 3 +- src/lte/model/trace-fading-loss-model.cc | 3 +- src/lte/model/tta-ff-mac-scheduler.cc | 3 +- src/lte/test/epc-test-s1u-downlink.cc | 3 +- src/lte/test/epc-test-s1u-uplink.cc | 3 +- src/lte/test/lte-simple-helper.cc | 3 +- src/lte/test/lte-simple-net-device.cc | 3 +- src/lte/test/lte-test-entities.cc | 3 +- src/lte/test/lte-test-ue-phy.cc | 3 +- src/lte/test/test-lte-epc-e2e-data.cc | 3 +- src/mesh/helper/dot11s/dot11s-installer.cc | 3 +- src/mesh/helper/flame/flame-installer.cc | 3 +- src/mesh/model/dot11s/airtime-metric.cc | 3 +- src/mesh/model/dot11s/hwmp-protocol.cc | 3 +- src/mesh/model/dot11s/hwmp-rtable.cc | 3 +- src/mesh/model/dot11s/hwmp-tag.cc | 3 +- src/mesh/model/dot11s/peer-link-frame.cc | 3 +- src/mesh/model/dot11s/peer-link.cc | 3 +- .../model/dot11s/peer-management-protocol.cc | 3 +- src/mesh/model/flame/flame-header.cc | 3 +- src/mesh/model/flame/flame-protocol.cc | 6 +-- src/mesh/model/flame/flame-rtable.cc | 3 +- src/mesh/model/mesh-l2-routing-protocol.cc | 3 +- src/mesh/model/mesh-point-device.cc | 3 +- src/mesh/model/mesh-wifi-interface-mac.cc | 3 +- src/mobility/helper/mobility-helper.cc | 3 +- .../constant-acceleration-mobility-model.cc | 3 +- .../model/constant-position-mobility-model.cc | 3 +- .../model/constant-velocity-mobility-model.cc | 3 +- .../model/gauss-markov-mobility-model.cc | 3 +- .../model/hierarchical-mobility-model.cc | 3 +- src/mobility/model/mobility-model.cc | 3 +- src/mobility/model/position-allocator.cc | 21 +++----- .../random-direction-2d-mobility-model.cc | 3 +- .../model/random-walk-2d-mobility-model.cc | 3 +- .../model/random-waypoint-mobility-model.cc | 3 +- ...dy-state-random-waypoint-mobility-model.cc | 3 +- src/mobility/model/waypoint-mobility-model.cc | 3 +- src/mpi/model/distributed-simulator-impl.cc | 3 +- src/netanim/examples/uan-animation.cc | 3 +- src/network/model/application.cc | 3 +- src/network/model/channel-list.cc | 6 +-- src/network/model/channel.cc | 3 +- src/network/model/chunk.cc | 3 +- src/network/model/header.cc | 3 +- src/network/model/net-device.cc | 3 +- src/network/model/node-list.cc | 6 +-- src/network/model/node.cc | 3 +- src/network/model/packet-tag-list.cc | 3 +- src/network/model/socket-factory.cc | 3 +- src/network/model/socket.cc | 15 ++---- src/network/model/tag.cc | 3 +- src/network/model/trailer.cc | 3 +- src/network/utils/drop-tail-queue.cc | 3 +- src/network/utils/error-model.cc | 15 ++---- src/network/utils/ethernet-header.cc | 3 +- src/network/utils/ethernet-trailer.cc | 3 +- src/network/utils/flow-id-tag.cc | 3 +- src/network/utils/llc-snap-header.cc | 3 +- src/network/utils/packet-burst.cc | 3 +- src/network/utils/packet-probe.cc | 3 +- src/network/utils/packet-socket-factory.cc | 3 +- src/network/utils/packet-socket.cc | 9 ++-- src/network/utils/packetbb.cc | 3 +- src/network/utils/pcap-file-wrapper.cc | 3 +- src/network/utils/queue.cc | 3 +- src/network/utils/radiotap-header.cc | 3 +- src/network/utils/red-queue.cc | 3 +- src/network/utils/simple-channel.cc | 3 +- src/network/utils/simple-net-device.cc | 3 +- .../model/ipv4-nix-vector-routing.cc | 3 +- src/olsr/model/olsr-header.cc | 6 +-- src/olsr/model/olsr-routing-protocol.cc | 3 +- .../model/openflow-switch-net-device.cc | 3 +- .../model/point-to-point-channel.cc | 3 +- .../model/point-to-point-net-device.cc | 3 +- .../model/point-to-point-remote-channel.cc | 3 +- src/point-to-point/model/ppp-header.cc | 3 +- .../model/cost231-propagation-loss-model.cc | 6 +-- .../itu-r-1411-los-propagation-loss-model.cc | 3 +- ...los-over-rooftop-propagation-loss-model.cc | 3 +- src/propagation/model/jakes-process.cc | 3 +- .../model/jakes-propagation-loss-model.cc | 3 +- .../kun-2600-mhz-propagation-loss-model.cc | 3 +- .../okumura-hata-propagation-loss-model.cc | 3 +- .../model/propagation-delay-model.cc | 9 ++-- .../model/propagation-loss-model.cc | 30 ++++------- .../test/itu-r-1411-los-test-suite.cc | 3 +- ...itu-r-1411-nlos-over-rooftop-test-suite.cc | 3 +- .../test/kun-2600-mhz-test-suite.cc | 3 +- .../test/okumura-hata-test-suite.cc | 3 +- src/sixlowpan/examples/example-sixlowpan.cc | 3 +- src/sixlowpan/helper/sixlowpan-helper.cc | 3 +- src/sixlowpan/model/sixlowpan-header.cc | 18 +++---- src/sixlowpan/model/sixlowpan-net-device.cc | 6 +-- src/sixlowpan/test/error-channel-sixlow.cc | 9 ++-- src/spectrum/model/aloha-noack-mac-header.cc | 3 +- src/spectrum/model/aloha-noack-net-device.cc | 3 +- .../constant-spectrum-propagation-loss.cc | 3 +- .../model/friis-spectrum-propagation-loss.cc | 3 +- src/spectrum/model/half-duplex-ideal-phy.cc | 3 +- .../model/multi-model-spectrum-channel.cc | 3 +- .../model/non-communicating-net-device.cc | 3 +- .../model/single-model-spectrum-channel.cc | 3 +- src/spectrum/model/spectrum-analyzer.cc | 3 +- src/spectrum/model/spectrum-channel.cc | 3 +- src/spectrum/model/spectrum-phy.cc | 3 +- .../model/spectrum-propagation-loss-model.cc | 3 +- src/spectrum/model/waveform-generator.cc | 3 +- src/stats/examples/double-probe-example.cc | 3 +- src/stats/examples/file-helper-example.cc | 3 +- src/stats/examples/gnuplot-helper-example.cc | 3 +- src/stats/helper/file-helper.cc | 3 +- src/stats/helper/gnuplot-helper.cc | 3 +- src/stats/model/boolean-probe.cc | 3 +- src/stats/model/data-collection-object.cc | 3 +- src/stats/model/double-probe.cc | 3 +- src/stats/model/file-aggregator.cc | 6 +-- src/stats/model/gnuplot-aggregator.cc | 6 +-- src/stats/model/probe.cc | 3 +- src/stats/model/time-series-adaptor.cc | 3 +- src/stats/model/uinteger-16-probe.cc | 3 +- src/stats/model/uinteger-32-probe.cc | 3 +- src/stats/model/uinteger-8-probe.cc | 3 +- src/tap-bridge/model/tap-bridge.cc | 3 +- .../helper/topology-reader-helper.cc | 3 +- .../model/inet-topology-reader.cc | 6 +-- .../model/orbis-topology-reader.cc | 6 +-- .../model/rocketfuel-topology-reader.cc | 6 +-- src/topology-read/model/topology-reader.cc | 6 +-- src/uan/examples/uan-cw-example.cc | 3 +- src/uan/examples/uan-rc-example.cc | 3 +- src/uan/model/acoustic-modem-energy-model.cc | 3 +- src/uan/model/uan-channel.cc | 3 +- src/uan/model/uan-header-common.cc | 3 +- src/uan/model/uan-header-rc.cc | 15 ++---- src/uan/model/uan-mac-aloha.cc | 3 +- src/uan/model/uan-mac-cw.cc | 3 +- src/uan/model/uan-mac-rc-gw.cc | 3 +- src/uan/model/uan-mac-rc.cc | 3 +- src/uan/model/uan-mac.cc | 3 +- src/uan/model/uan-net-device.cc | 3 +- src/uan/model/uan-noise-model-default.cc | 3 +- src/uan/model/uan-noise-model.cc | 3 +- src/uan/model/uan-phy-dual.cc | 6 +-- src/uan/model/uan-phy-gen.cc | 15 ++---- src/uan/model/uan-phy.cc | 9 ++-- src/uan/model/uan-prop-model-ideal.cc | 3 +- src/uan/model/uan-prop-model-thorp.cc | 3 +- src/uan/model/uan-prop-model.cc | 3 +- src/uan/model/uan-transducer-hd.cc | 3 +- src/uan/model/uan-transducer.cc | 3 +- src/uan/test/uan-energy-model-test.cc | 3 +- .../model/virtual-net-device.cc | 3 +- src/visualizer/model/visual-simulator-impl.cc | 3 +- src/wifi/helper/athstats-helper.cc | 3 +- src/wifi/model/aarf-wifi-manager.cc | 3 +- src/wifi/model/aarfcd-wifi-manager.cc | 3 +- src/wifi/model/adhoc-wifi-mac.cc | 3 +- src/wifi/model/amrr-wifi-manager.cc | 3 +- src/wifi/model/amsdu-subframe-header.cc | 3 +- src/wifi/model/ap-wifi-mac.cc | 3 +- src/wifi/model/arf-wifi-manager.cc | 3 +- src/wifi/model/cara-wifi-manager.cc | 3 +- src/wifi/model/constant-rate-wifi-manager.cc | 3 +- src/wifi/model/ctrl-headers.cc | 6 +-- src/wifi/model/dca-txop.cc | 3 +- src/wifi/model/dcf.cc | 3 +- src/wifi/model/edca-txop-n.cc | 3 +- src/wifi/model/error-rate-model.cc | 3 +- src/wifi/model/ideal-wifi-manager.cc | 3 +- src/wifi/model/mgt-headers.cc | 21 +++----- src/wifi/model/minstrel-wifi-manager.cc | 3 +- src/wifi/model/msdu-aggregator.cc | 3 +- src/wifi/model/msdu-standard-aggregator.cc | 3 +- src/wifi/model/nist-error-rate-model.cc | 3 +- src/wifi/model/onoe-wifi-manager.cc | 3 +- src/wifi/model/qos-tag.cc | 3 +- src/wifi/model/regular-wifi-mac.cc | 3 +- src/wifi/model/rraa-wifi-manager.cc | 3 +- src/wifi/model/snr-tag.cc | 3 +- src/wifi/model/sta-wifi-mac.cc | 3 +- src/wifi/model/wifi-channel.cc | 3 +- .../model/wifi-information-element-vector.cc | 3 +- src/wifi/model/wifi-mac-header.cc | 3 +- src/wifi/model/wifi-mac-queue.cc | 3 +- src/wifi/model/wifi-mac-trailer.cc | 3 +- src/wifi/model/wifi-mac.cc | 3 +- src/wifi/model/wifi-net-device.cc | 3 +- src/wifi/model/wifi-phy-state-helper.cc | 3 +- src/wifi/model/wifi-phy.cc | 3 +- src/wifi/model/wifi-remote-station-manager.cc | 3 +- src/wifi/model/yans-error-rate-model.cc | 3 +- src/wifi/model/yans-wifi-channel.cc | 3 +- src/wifi/model/yans-wifi-phy.cc | 3 +- src/wimax/model/bandwidth-manager.cc | 3 +- src/wimax/model/bs-link-manager.cc | 3 +- src/wimax/model/bs-net-device.cc | 3 +- src/wimax/model/bs-scheduler-rtps.cc | 3 +- src/wimax/model/bs-scheduler-simple.cc | 3 +- src/wimax/model/bs-scheduler.cc | 3 +- src/wimax/model/bs-uplink-scheduler-mbqos.cc | 3 +- src/wimax/model/bs-uplink-scheduler-rtps.cc | 3 +- src/wimax/model/bs-uplink-scheduler-simple.cc | 3 +- src/wimax/model/bs-uplink-scheduler.cc | 3 +- src/wimax/model/burst-profile-manager.cc | 3 +- src/wimax/model/connection-manager.cc | 3 +- src/wimax/model/dl-mac-messages.cc | 6 +-- src/wimax/model/ipcs-classifier.cc | 3 +- src/wimax/model/mac-messages.cc | 29 +++++----- src/wimax/model/service-flow-manager.cc | 3 +- src/wimax/model/simple-ofdm-wimax-phy.cc | 3 +- src/wimax/model/ss-link-manager.cc | 3 +- src/wimax/model/ss-manager.cc | 3 +- src/wimax/model/ss-net-device.cc | 3 +- src/wimax/model/ss-scheduler.cc | 3 +- src/wimax/model/ul-mac-messages.cc | 6 +-- src/wimax/model/wimax-channel.cc | 3 +- src/wimax/model/wimax-connection.cc | 3 +- src/wimax/model/wimax-mac-header.cc | 15 ++---- src/wimax/model/wimax-mac-queue.cc | 3 +- src/wimax/model/wimax-mac-to-mac-header.cc | 3 +- src/wimax/model/wimax-net-device.cc | 3 +- src/wimax/model/wimax-phy.cc | 3 +- 441 files changed, 659 insertions(+), 1302 deletions(-) diff --git a/src/antenna/model/antenna-model.cc b/src/antenna/model/antenna-model.cc index 491ea00f6..1648dbfd0 100644 --- a/src/antenna/model/antenna-model.cc +++ b/src/antenna/model/antenna-model.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("AntennaModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (AntennaModel) - ; +NS_OBJECT_ENSURE_REGISTERED (AntennaModel); AntennaModel::AntennaModel () diff --git a/src/antenna/model/cosine-antenna-model.cc b/src/antenna/model/cosine-antenna-model.cc index e7c8959ad..a283091c0 100644 --- a/src/antenna/model/cosine-antenna-model.cc +++ b/src/antenna/model/cosine-antenna-model.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("CosineAntennaModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (CosineAntennaModel) - ; +NS_OBJECT_ENSURE_REGISTERED (CosineAntennaModel); TypeId diff --git a/src/antenna/model/isotropic-antenna-model.cc b/src/antenna/model/isotropic-antenna-model.cc index 129af8030..e06ab3dd9 100644 --- a/src/antenna/model/isotropic-antenna-model.cc +++ b/src/antenna/model/isotropic-antenna-model.cc @@ -29,8 +29,7 @@ NS_LOG_COMPONENT_DEFINE ("IsotropicAntennaModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (IsotropicAntennaModel) - ; +NS_OBJECT_ENSURE_REGISTERED (IsotropicAntennaModel); TypeId diff --git a/src/antenna/model/parabolic-antenna-model.cc b/src/antenna/model/parabolic-antenna-model.cc index 79c8bde20..92c3af275 100644 --- a/src/antenna/model/parabolic-antenna-model.cc +++ b/src/antenna/model/parabolic-antenna-model.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("ParabolicAntennaModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ParabolicAntennaModel) - ; +NS_OBJECT_ENSURE_REGISTERED (ParabolicAntennaModel); TypeId diff --git a/src/aodv/model/aodv-packet.cc b/src/aodv/model/aodv-packet.cc index 9f4b5e16d..2c58bae1c 100644 --- a/src/aodv/model/aodv-packet.cc +++ b/src/aodv/model/aodv-packet.cc @@ -34,8 +34,7 @@ namespace ns3 namespace aodv { -NS_OBJECT_ENSURE_REGISTERED (TypeHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (TypeHeader); TypeHeader::TypeHeader (MessageType t) : m_type (t), m_valid (true) @@ -147,8 +146,7 @@ RreqHeader::RreqHeader (uint8_t flags, uint8_t reserved, uint8_t hopCount, uint3 { } -NS_OBJECT_ENSURE_REGISTERED (RreqHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (RreqHeader); TypeId RreqHeader::GetTypeId () @@ -287,8 +285,7 @@ RrepHeader::RrepHeader (uint8_t prefixSize, uint8_t hopCount, Ipv4Address dst, m_lifeTime = uint32_t (lifeTime.GetMilliSeconds ()); } -NS_OBJECT_ENSURE_REGISTERED (RrepHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (RrepHeader); TypeId RrepHeader::GetTypeId () @@ -430,8 +427,7 @@ RrepAckHeader::RrepAckHeader () : { } -NS_OBJECT_ENSURE_REGISTERED (RrepAckHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (RrepAckHeader); TypeId RrepAckHeader::GetTypeId () @@ -497,8 +493,7 @@ RerrHeader::RerrHeader () : { } -NS_OBJECT_ENSURE_REGISTERED (RerrHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (RerrHeader); TypeId RerrHeader::GetTypeId () diff --git a/src/aodv/model/aodv-routing-protocol.cc b/src/aodv/model/aodv-routing-protocol.cc index bb9c0aefe..bb23f4c72 100644 --- a/src/aodv/model/aodv-routing-protocol.cc +++ b/src/aodv/model/aodv-routing-protocol.cc @@ -48,8 +48,7 @@ namespace ns3 { namespace aodv { -NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol) - ; +NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol); /// UDP Port for AODV control traffic const uint32_t RoutingProtocol::AODV_PORT = 654; @@ -112,8 +111,7 @@ private: int32_t m_oif; }; -NS_OBJECT_ENSURE_REGISTERED (DeferredRouteOutputTag) - ; +NS_OBJECT_ENSURE_REGISTERED (DeferredRouteOutputTag); //----------------------------------------------------------------------------- diff --git a/src/applications/model/application-packet-probe.cc b/src/applications/model/application-packet-probe.cc index 8f6a5ea6b..6e1613799 100644 --- a/src/applications/model/application-packet-probe.cc +++ b/src/applications/model/application-packet-probe.cc @@ -32,8 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("ApplicationPacketProbe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ApplicationPacketProbe) - ; +NS_OBJECT_ENSURE_REGISTERED (ApplicationPacketProbe); TypeId ApplicationPacketProbe::GetTypeId () diff --git a/src/applications/model/bulk-send-application.cc b/src/applications/model/bulk-send-application.cc index ac92ca2a0..03637c531 100644 --- a/src/applications/model/bulk-send-application.cc +++ b/src/applications/model/bulk-send-application.cc @@ -35,8 +35,7 @@ NS_LOG_COMPONENT_DEFINE ("BulkSendApplication"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BulkSendApplication) - ; +NS_OBJECT_ENSURE_REGISTERED (BulkSendApplication); TypeId BulkSendApplication::GetTypeId (void) diff --git a/src/applications/model/onoff-application.cc b/src/applications/model/onoff-application.cc index 716837fc7..8bf157729 100644 --- a/src/applications/model/onoff-application.cc +++ b/src/applications/model/onoff-application.cc @@ -46,8 +46,7 @@ NS_LOG_COMPONENT_DEFINE ("OnOffApplication"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (OnOffApplication) - ; +NS_OBJECT_ENSURE_REGISTERED (OnOffApplication); TypeId OnOffApplication::GetTypeId (void) diff --git a/src/applications/model/packet-loss-counter.cc b/src/applications/model/packet-loss-counter.cc index 61fc87716..076b2b574 100644 --- a/src/applications/model/packet-loss-counter.cc +++ b/src/applications/model/packet-loss-counter.cc @@ -26,8 +26,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("PacketLossCounter") - ; +NS_LOG_COMPONENT_DEFINE ("PacketLossCounter"); PacketLossCounter::PacketLossCounter (uint8_t bitmapSize) diff --git a/src/applications/model/packet-sink.cc b/src/applications/model/packet-sink.cc index 8411d8b96..168a684be 100644 --- a/src/applications/model/packet-sink.cc +++ b/src/applications/model/packet-sink.cc @@ -34,10 +34,8 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("PacketSink") - ; -NS_OBJECT_ENSURE_REGISTERED (PacketSink) - ; +NS_LOG_COMPONENT_DEFINE ("PacketSink"); +NS_OBJECT_ENSURE_REGISTERED (PacketSink); TypeId PacketSink::GetTypeId (void) diff --git a/src/applications/model/ping6.cc b/src/applications/model/ping6.cc index 434a7b2e4..c9a120407 100644 --- a/src/applications/model/ping6.cc +++ b/src/applications/model/ping6.cc @@ -38,11 +38,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Ping6Application") - ; +NS_LOG_COMPONENT_DEFINE ("Ping6Application"); -NS_OBJECT_ENSURE_REGISTERED (Ping6) - ; +NS_OBJECT_ENSURE_REGISTERED (Ping6); TypeId Ping6::GetTypeId () { diff --git a/src/applications/model/radvd-interface.cc b/src/applications/model/radvd-interface.cc index 681595192..b555b036b 100644 --- a/src/applications/model/radvd-interface.cc +++ b/src/applications/model/radvd-interface.cc @@ -24,8 +24,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("RadvdInterface") - ; +NS_LOG_COMPONENT_DEFINE ("RadvdInterface"); RadvdInterface::RadvdInterface (uint32_t interface) : m_interface (interface) diff --git a/src/applications/model/radvd-prefix.cc b/src/applications/model/radvd-prefix.cc index bf5cc4f75..c025a9dfd 100644 --- a/src/applications/model/radvd-prefix.cc +++ b/src/applications/model/radvd-prefix.cc @@ -24,8 +24,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("RadvdPrefix") - ; +NS_LOG_COMPONENT_DEFINE ("RadvdPrefix"); RadvdPrefix::RadvdPrefix (Ipv6Address network, uint8_t prefixLength, uint32_t preferredLifeTime, uint32_t validLifeTime, bool onLinkFlag, bool autonomousFlag, bool routerAddrFlag) : m_network (network), diff --git a/src/applications/model/radvd.cc b/src/applications/model/radvd.cc index 5635c0d1b..c7eee39bf 100644 --- a/src/applications/model/radvd.cc +++ b/src/applications/model/radvd.cc @@ -40,11 +40,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("RadvdApplication") - ; +NS_LOG_COMPONENT_DEFINE ("RadvdApplication"); -NS_OBJECT_ENSURE_REGISTERED (Radvd) - ; +NS_OBJECT_ENSURE_REGISTERED (Radvd); TypeId Radvd::GetTypeId () { diff --git a/src/applications/model/seq-ts-header.cc b/src/applications/model/seq-ts-header.cc index 45ec8acdf..437dfbd7e 100644 --- a/src/applications/model/seq-ts-header.cc +++ b/src/applications/model/seq-ts-header.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("SeqTsHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SeqTsHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (SeqTsHeader); SeqTsHeader::SeqTsHeader () : m_seq (0), diff --git a/src/applications/model/udp-client.cc b/src/applications/model/udp-client.cc index f74ffe6a2..79794be38 100644 --- a/src/applications/model/udp-client.cc +++ b/src/applications/model/udp-client.cc @@ -35,10 +35,8 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("UdpClient") - ; -NS_OBJECT_ENSURE_REGISTERED (UdpClient) - ; +NS_LOG_COMPONENT_DEFINE ("UdpClient"); +NS_OBJECT_ENSURE_REGISTERED (UdpClient); TypeId UdpClient::GetTypeId (void) diff --git a/src/applications/model/udp-echo-client.cc b/src/applications/model/udp-echo-client.cc index 27f37deaa..cbc74ad6e 100644 --- a/src/applications/model/udp-echo-client.cc +++ b/src/applications/model/udp-echo-client.cc @@ -31,10 +31,8 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("UdpEchoClientApplication") - ; -NS_OBJECT_ENSURE_REGISTERED (UdpEchoClient) - ; +NS_LOG_COMPONENT_DEFINE ("UdpEchoClientApplication"); +NS_OBJECT_ENSURE_REGISTERED (UdpEchoClient); TypeId UdpEchoClient::GetTypeId (void) diff --git a/src/applications/model/udp-echo-server.cc b/src/applications/model/udp-echo-server.cc index fe62fec69..f02d3d1a4 100644 --- a/src/applications/model/udp-echo-server.cc +++ b/src/applications/model/udp-echo-server.cc @@ -34,10 +34,8 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("UdpEchoServerApplication") - ; -NS_OBJECT_ENSURE_REGISTERED (UdpEchoServer) - ; +NS_LOG_COMPONENT_DEFINE ("UdpEchoServerApplication"); +NS_OBJECT_ENSURE_REGISTERED (UdpEchoServer); TypeId UdpEchoServer::GetTypeId (void) diff --git a/src/applications/model/udp-server.cc b/src/applications/model/udp-server.cc index c14d7b170..4655844d6 100644 --- a/src/applications/model/udp-server.cc +++ b/src/applications/model/udp-server.cc @@ -36,10 +36,8 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("UdpServer") - ; -NS_OBJECT_ENSURE_REGISTERED (UdpServer) - ; +NS_LOG_COMPONENT_DEFINE ("UdpServer"); +NS_OBJECT_ENSURE_REGISTERED (UdpServer); TypeId diff --git a/src/applications/model/udp-trace-client.cc b/src/applications/model/udp-trace-client.cc index a3aeac5a5..bb50ce0a6 100644 --- a/src/applications/model/udp-trace-client.cc +++ b/src/applications/model/udp-trace-client.cc @@ -37,10 +37,8 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("UdpTraceClient") - ; -NS_OBJECT_ENSURE_REGISTERED (UdpTraceClient) - ; +NS_LOG_COMPONENT_DEFINE ("UdpTraceClient"); +NS_OBJECT_ENSURE_REGISTERED (UdpTraceClient); /** * \brief Default trace to send diff --git a/src/applications/model/v4ping.cc b/src/applications/model/v4ping.cc index 8269ff8ba..a827a376d 100644 --- a/src/applications/model/v4ping.cc +++ b/src/applications/model/v4ping.cc @@ -28,10 +28,8 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("V4Ping") - ; -NS_OBJECT_ENSURE_REGISTERED (V4Ping) - ; +NS_LOG_COMPONENT_DEFINE ("V4Ping"); +NS_OBJECT_ENSURE_REGISTERED (V4Ping); TypeId V4Ping::GetTypeId (void) diff --git a/src/bridge/model/bridge-channel.cc b/src/bridge/model/bridge-channel.cc index 6f8e014f5..a1a1b97a5 100644 --- a/src/bridge/model/bridge-channel.cc +++ b/src/bridge/model/bridge-channel.cc @@ -23,8 +23,7 @@ NS_LOG_COMPONENT_DEFINE ("BridgeChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BridgeChannel) - ; +NS_OBJECT_ENSURE_REGISTERED (BridgeChannel); TypeId BridgeChannel::GetTypeId (void) diff --git a/src/bridge/model/bridge-net-device.cc b/src/bridge/model/bridge-net-device.cc index 05f41372d..47de15667 100644 --- a/src/bridge/model/bridge-net-device.cc +++ b/src/bridge/model/bridge-net-device.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("BridgeNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BridgeNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (BridgeNetDevice); TypeId diff --git a/src/buildings/helper/building-allocator.cc b/src/buildings/helper/building-allocator.cc index 3a5e711ca..8d02c0c78 100644 --- a/src/buildings/helper/building-allocator.cc +++ b/src/buildings/helper/building-allocator.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("BuildingAllocator"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (GridBuildingAllocator) - ; +NS_OBJECT_ENSURE_REGISTERED (GridBuildingAllocator); GridBuildingAllocator::GridBuildingAllocator () : m_current (0) diff --git a/src/buildings/helper/building-position-allocator.cc b/src/buildings/helper/building-position-allocator.cc index 78657a3f4..e2931bea7 100644 --- a/src/buildings/helper/building-position-allocator.cc +++ b/src/buildings/helper/building-position-allocator.cc @@ -37,8 +37,7 @@ NS_LOG_COMPONENT_DEFINE ("BuildingPositionAllocator"); using namespace ns3; -NS_OBJECT_ENSURE_REGISTERED (RandomBuildingPositionAllocator) - ; +NS_OBJECT_ENSURE_REGISTERED (RandomBuildingPositionAllocator); RandomBuildingPositionAllocator::RandomBuildingPositionAllocator () @@ -105,8 +104,7 @@ RandomBuildingPositionAllocator::AssignStreams (int64_t stream) } -NS_OBJECT_ENSURE_REGISTERED (RandomRoomPositionAllocator) - ; +NS_OBJECT_ENSURE_REGISTERED (RandomRoomPositionAllocator); RandomRoomPositionAllocator::RandomRoomPositionAllocator () @@ -194,8 +192,7 @@ RandomRoomPositionAllocator::AssignStreams (int64_t stream) -NS_OBJECT_ENSURE_REGISTERED (SameRoomPositionAllocator) - ; +NS_OBJECT_ENSURE_REGISTERED (SameRoomPositionAllocator); SameRoomPositionAllocator::SameRoomPositionAllocator () { @@ -285,8 +282,7 @@ SameRoomPositionAllocator::AssignStreams (int64_t stream) return 1; } -NS_OBJECT_ENSURE_REGISTERED (FixedRoomPositionAllocator) - ; +NS_OBJECT_ENSURE_REGISTERED (FixedRoomPositionAllocator); FixedRoomPositionAllocator::FixedRoomPositionAllocator ( diff --git a/src/buildings/model/building-list.cc b/src/buildings/model/building-list.cc index 0d43f5b47..063870de3 100644 --- a/src/buildings/model/building-list.cc +++ b/src/buildings/model/building-list.cc @@ -30,8 +30,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("BuildingList") - ; +NS_LOG_COMPONENT_DEFINE ("BuildingList"); /** * \brief private implementation detail of the BuildingList API. @@ -58,8 +57,7 @@ private: std::vector > m_buildings; }; -NS_OBJECT_ENSURE_REGISTERED (BuildingListPriv) - ; +NS_OBJECT_ENSURE_REGISTERED (BuildingListPriv); TypeId BuildingListPriv::GetTypeId (void) diff --git a/src/buildings/model/building.cc b/src/buildings/model/building.cc index ae00da418..3200ccc75 100644 --- a/src/buildings/model/building.cc +++ b/src/buildings/model/building.cc @@ -34,8 +34,7 @@ NS_LOG_COMPONENT_DEFINE ("Building"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Building) - ; +NS_OBJECT_ENSURE_REGISTERED (Building); TypeId Building::GetTypeId (void) diff --git a/src/buildings/model/buildings-propagation-loss-model.cc b/src/buildings/model/buildings-propagation-loss-model.cc index bc1639fe9..b5c78ec05 100644 --- a/src/buildings/model/buildings-propagation-loss-model.cc +++ b/src/buildings/model/buildings-propagation-loss-model.cc @@ -35,8 +35,7 @@ NS_LOG_COMPONENT_DEFINE ("BuildingsPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BuildingsPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (BuildingsPropagationLossModel); BuildingsPropagationLossModel::ShadowingLoss::ShadowingLoss () { diff --git a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc index d1ce0fd96..0d441c08b 100644 --- a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc +++ b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc @@ -41,8 +41,7 @@ NS_LOG_COMPONENT_DEFINE ("HybridBuildingsPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (HybridBuildingsPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (HybridBuildingsPropagationLossModel); diff --git a/src/buildings/model/itu-r-1238-propagation-loss-model.cc b/src/buildings/model/itu-r-1238-propagation-loss-model.cc index 46b4cc51c..fcc739c66 100644 --- a/src/buildings/model/itu-r-1238-propagation-loss-model.cc +++ b/src/buildings/model/itu-r-1238-propagation-loss-model.cc @@ -32,8 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("ItuR1238PropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ItuR1238PropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (ItuR1238PropagationLossModel); TypeId diff --git a/src/buildings/model/mobility-building-info.cc b/src/buildings/model/mobility-building-info.cc index d228c928c..001c83c5a 100644 --- a/src/buildings/model/mobility-building-info.cc +++ b/src/buildings/model/mobility-building-info.cc @@ -30,8 +30,7 @@ NS_LOG_COMPONENT_DEFINE ("MobilityBuildingInfo"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MobilityBuildingInfo) - ; +NS_OBJECT_ENSURE_REGISTERED (MobilityBuildingInfo); TypeId MobilityBuildingInfo::GetTypeId (void) diff --git a/src/buildings/model/oh-buildings-propagation-loss-model.cc b/src/buildings/model/oh-buildings-propagation-loss-model.cc index 3ff096022..85eb8daf1 100644 --- a/src/buildings/model/oh-buildings-propagation-loss-model.cc +++ b/src/buildings/model/oh-buildings-propagation-loss-model.cc @@ -35,8 +35,7 @@ NS_LOG_COMPONENT_DEFINE ("OhBuildingsPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (OhBuildingsPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (OhBuildingsPropagationLossModel); diff --git a/src/click/model/ipv4-click-routing.cc b/src/click/model/ipv4-click-routing.cc index 5f221c087..5608fff81 100644 --- a/src/click/model/ipv4-click-routing.cc +++ b/src/click/model/ipv4-click-routing.cc @@ -45,8 +45,7 @@ namespace ns3 { #define INTERFACE_ID_FIRST 1 #define INTERFACE_ID_FIRST_DROP 33 -NS_OBJECT_ENSURE_REGISTERED (Ipv4ClickRouting) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv4ClickRouting); std::map < simclick_node_t *, Ptr > Ipv4ClickRouting::m_clickInstanceFromSimNode; diff --git a/src/click/model/ipv4-l3-click-protocol.cc b/src/click/model/ipv4-l3-click-protocol.cc index 8dc13a2f6..5c5a7e5de 100644 --- a/src/click/model/ipv4-l3-click-protocol.cc +++ b/src/click/model/ipv4-l3-click-protocol.cc @@ -44,8 +44,7 @@ namespace ns3 { const uint16_t Ipv4L3ClickProtocol::PROT_NUMBER = 0x0800; -NS_OBJECT_ENSURE_REGISTERED (Ipv4L3ClickProtocol) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv4L3ClickProtocol); TypeId Ipv4L3ClickProtocol::GetTypeId (void) diff --git a/src/config-store/examples/config-store-save.cc b/src/config-store/examples/config-store-save.cc index 619f4fa12..81c956da3 100644 --- a/src/config-store/examples/config-store-save.cc +++ b/src/config-store/examples/config-store-save.cc @@ -22,8 +22,7 @@ public: int16_t m_int16; }; -NS_OBJECT_ENSURE_REGISTERED (ConfigExample) - ; +NS_OBJECT_ENSURE_REGISTERED (ConfigExample); // Assign a new default value to A::TestInt16 (-5) // Configure a TestInt16 value for a special instance of A (to -3) diff --git a/src/config-store/model/config-store.cc b/src/config-store/model/config-store.cc index 7c35093d4..79821b1d3 100644 --- a/src/config-store/model/config-store.cc +++ b/src/config-store/model/config-store.cc @@ -23,8 +23,7 @@ NS_LOG_COMPONENT_DEFINE ("ConfigStore"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ConfigStore) - ; +NS_OBJECT_ENSURE_REGISTERED (ConfigStore); TypeId ConfigStore::GetTypeId (void) diff --git a/src/config-store/model/gtk-config-store.cc b/src/config-store/model/gtk-config-store.cc index 02c385a93..3730fba66 100644 --- a/src/config-store/model/gtk-config-store.cc +++ b/src/config-store/model/gtk-config-store.cc @@ -26,8 +26,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("GtkconfigStore") - ; +NS_LOG_COMPONENT_DEFINE ("GtkconfigStore"); GtkConfigStore::GtkConfigStore () diff --git a/src/core/model/attribute-construction-list.cc b/src/core/model/attribute-construction-list.cc index 577a928d4..e54246483 100644 --- a/src/core/model/attribute-construction-list.cc +++ b/src/core/model/attribute-construction-list.cc @@ -22,8 +22,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE("AttributeConstructionList") - ; +NS_LOG_COMPONENT_DEFINE("AttributeConstructionList"); AttributeConstructionList::AttributeConstructionList () { diff --git a/src/core/model/calendar-scheduler.cc b/src/core/model/calendar-scheduler.cc index fb86cbd84..ccfe59ce8 100644 --- a/src/core/model/calendar-scheduler.cc +++ b/src/core/model/calendar-scheduler.cc @@ -28,11 +28,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("CalendarScheduler") - ; +NS_LOG_COMPONENT_DEFINE ("CalendarScheduler"); -NS_OBJECT_ENSURE_REGISTERED (CalendarScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (CalendarScheduler); TypeId CalendarScheduler::GetTypeId (void) diff --git a/src/core/model/default-simulator-impl.cc b/src/core/model/default-simulator-impl.cc index 2cfa22b94..bada92fa2 100644 --- a/src/core/model/default-simulator-impl.cc +++ b/src/core/model/default-simulator-impl.cc @@ -38,8 +38,7 @@ NS_LOG_COMPONENT_DEFINE ("DefaultSimulatorImpl"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (DefaultSimulatorImpl) - ; +NS_OBJECT_ENSURE_REGISTERED (DefaultSimulatorImpl); TypeId DefaultSimulatorImpl::GetTypeId (void) diff --git a/src/core/model/global-value.cc b/src/core/model/global-value.cc index ce1ee9465..4bd97ea38 100644 --- a/src/core/model/global-value.cc +++ b/src/core/model/global-value.cc @@ -31,8 +31,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("GlobalValue") - ; +NS_LOG_COMPONENT_DEFINE ("GlobalValue"); GlobalValue::GlobalValue (std::string name, std::string help, const AttributeValue &initialValue, diff --git a/src/core/model/hash-fnv.cc b/src/core/model/hash-fnv.cc index 671e6dd68..cffe60800 100644 --- a/src/core/model/hash-fnv.cc +++ b/src/core/model/hash-fnv.cc @@ -38,8 +38,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Hash-Fnv") - ; +NS_LOG_COMPONENT_DEFINE ("Hash-Fnv"); namespace Hash { diff --git a/src/core/model/hash-function.cc b/src/core/model/hash-function.cc index c89fea335..37a331c3f 100644 --- a/src/core/model/hash-function.cc +++ b/src/core/model/hash-function.cc @@ -24,8 +24,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("HashFunction") - ; +NS_LOG_COMPONENT_DEFINE ("HashFunction"); namespace Hash { diff --git a/src/core/model/hash-murmur3.cc b/src/core/model/hash-murmur3.cc index 4d50acdb5..a3440528b 100644 --- a/src/core/model/hash-murmur3.cc +++ b/src/core/model/hash-murmur3.cc @@ -36,8 +36,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Hash-Murmur3") - ; +NS_LOG_COMPONENT_DEFINE ("Hash-Murmur3"); namespace Hash { diff --git a/src/core/model/hash.cc b/src/core/model/hash.cc index 644918824..78765ea0f 100644 --- a/src/core/model/hash.cc +++ b/src/core/model/hash.cc @@ -24,8 +24,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Hash") - ; +NS_LOG_COMPONENT_DEFINE ("Hash"); Hasher::Hasher () { diff --git a/src/core/model/heap-scheduler.cc b/src/core/model/heap-scheduler.cc index 7ca222758..ac946c920 100644 --- a/src/core/model/heap-scheduler.cc +++ b/src/core/model/heap-scheduler.cc @@ -29,8 +29,7 @@ NS_LOG_COMPONENT_DEFINE ("HeapScheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (HeapScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (HeapScheduler); TypeId HeapScheduler::GetTypeId (void) diff --git a/src/core/model/list-scheduler.cc b/src/core/model/list-scheduler.cc index 4107566b6..f4a9d2bf0 100644 --- a/src/core/model/list-scheduler.cc +++ b/src/core/model/list-scheduler.cc @@ -30,8 +30,7 @@ NS_LOG_COMPONENT_DEFINE ("ListScheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ListScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (ListScheduler); TypeId ListScheduler::GetTypeId (void) diff --git a/src/core/model/map-scheduler.cc b/src/core/model/map-scheduler.cc index 01431adeb..2df704524 100644 --- a/src/core/model/map-scheduler.cc +++ b/src/core/model/map-scheduler.cc @@ -29,8 +29,7 @@ NS_LOG_COMPONENT_DEFINE ("MapScheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MapScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (MapScheduler); TypeId MapScheduler::GetTypeId (void) diff --git a/src/core/model/names.cc b/src/core/model/names.cc index 946ffe2d5..306141a6f 100644 --- a/src/core/model/names.cc +++ b/src/core/model/names.cc @@ -25,8 +25,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Names") - ; +NS_LOG_COMPONENT_DEFINE ("Names"); class NameNode { diff --git a/src/core/model/object-base.cc b/src/core/model/object-base.cc index 6adbdb3ef..470189684 100644 --- a/src/core/model/object-base.cc +++ b/src/core/model/object-base.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("ObjectBase"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ObjectBase) - ; +NS_OBJECT_ENSURE_REGISTERED (ObjectBase); static TypeId GetObjectIid (void) diff --git a/src/core/model/object-factory.cc b/src/core/model/object-factory.cc index 4047e8dd4..9fae501e4 100644 --- a/src/core/model/object-factory.cc +++ b/src/core/model/object-factory.cc @@ -23,8 +23,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE("ObjectFactory") - ; +NS_LOG_COMPONENT_DEFINE("ObjectFactory"); ObjectFactory::ObjectFactory () { diff --git a/src/core/model/object.cc b/src/core/model/object.cc index f159e2311..fcd633242 100644 --- a/src/core/model/object.cc +++ b/src/core/model/object.cc @@ -41,8 +41,7 @@ namespace ns3 { * The Object implementation *********************************************************************/ -NS_OBJECT_ENSURE_REGISTERED (Object) - ; +NS_OBJECT_ENSURE_REGISTERED (Object); Object::AggregateIterator::AggregateIterator () : m_object (0), diff --git a/src/core/model/random-variable-stream.cc b/src/core/model/random-variable-stream.cc index 730741811..51ca7f111 100644 --- a/src/core/model/random-variable-stream.cc +++ b/src/core/model/random-variable-stream.cc @@ -40,8 +40,7 @@ NS_LOG_COMPONENT_DEFINE ("RandomVariableStream"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RandomVariableStream) - ; +NS_OBJECT_ENSURE_REGISTERED (RandomVariableStream); TypeId RandomVariableStream::GetTypeId (void) @@ -131,8 +130,7 @@ RandomVariableStream::Peek(void) const return m_rng; } -NS_OBJECT_ENSURE_REGISTERED(UniformRandomVariable) - ; +NS_OBJECT_ENSURE_REGISTERED(UniformRandomVariable); TypeId UniformRandomVariable::GetTypeId (void) @@ -202,8 +200,7 @@ UniformRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_min, m_max + 1); } -NS_OBJECT_ENSURE_REGISTERED(ConstantRandomVariable) - ; +NS_OBJECT_ENSURE_REGISTERED(ConstantRandomVariable); TypeId ConstantRandomVariable::GetTypeId (void) @@ -257,8 +254,7 @@ ConstantRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_constant); } -NS_OBJECT_ENSURE_REGISTERED(SequentialRandomVariable) - ; +NS_OBJECT_ENSURE_REGISTERED(SequentialRandomVariable); TypeId SequentialRandomVariable::GetTypeId (void) @@ -357,8 +353,7 @@ SequentialRandomVariable::GetInteger (void) return (uint32_t)GetValue (); } -NS_OBJECT_ENSURE_REGISTERED(ExponentialRandomVariable) - ; +NS_OBJECT_ENSURE_REGISTERED(ExponentialRandomVariable); TypeId ExponentialRandomVariable::GetTypeId (void) @@ -439,8 +434,7 @@ ExponentialRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_mean, m_bound); } -NS_OBJECT_ENSURE_REGISTERED(ParetoRandomVariable) - ; +NS_OBJECT_ENSURE_REGISTERED(ParetoRandomVariable); TypeId ParetoRandomVariable::GetTypeId (void) @@ -535,8 +529,7 @@ ParetoRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_mean, m_shape, m_bound); } -NS_OBJECT_ENSURE_REGISTERED(WeibullRandomVariable) - ; +NS_OBJECT_ENSURE_REGISTERED(WeibullRandomVariable); TypeId WeibullRandomVariable::GetTypeId (void) @@ -629,8 +622,7 @@ WeibullRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_scale, m_shape, m_bound); } -NS_OBJECT_ENSURE_REGISTERED(NormalRandomVariable) - ; +NS_OBJECT_ENSURE_REGISTERED(NormalRandomVariable); const double NormalRandomVariable::INFINITE_VALUE = 1e307; @@ -749,8 +741,7 @@ NormalRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_mean, m_variance, m_bound); } -NS_OBJECT_ENSURE_REGISTERED(LogNormalRandomVariable) - ; +NS_OBJECT_ENSURE_REGISTERED(LogNormalRandomVariable); TypeId LogNormalRandomVariable::GetTypeId (void) @@ -869,8 +860,7 @@ LogNormalRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_mu, m_sigma); } -NS_OBJECT_ENSURE_REGISTERED(GammaRandomVariable) - ; +NS_OBJECT_ENSURE_REGISTERED(GammaRandomVariable); TypeId GammaRandomVariable::GetTypeId (void) @@ -1045,8 +1035,7 @@ GammaRandomVariable::GetNormalValue (double mean, double variance, double bound) } } -NS_OBJECT_ENSURE_REGISTERED(ErlangRandomVariable) - ; +NS_OBJECT_ENSURE_REGISTERED(ErlangRandomVariable); TypeId ErlangRandomVariable::GetTypeId (void) @@ -1157,8 +1146,7 @@ ErlangRandomVariable::GetExponentialValue (double mean, double bound) } } -NS_OBJECT_ENSURE_REGISTERED(TriangularRandomVariable) - ; +NS_OBJECT_ENSURE_REGISTERED(TriangularRandomVariable); TypeId TriangularRandomVariable::GetTypeId (void) @@ -1252,8 +1240,7 @@ TriangularRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_mean, m_min, m_max); } -NS_OBJECT_ENSURE_REGISTERED(ZipfRandomVariable) - ; +NS_OBJECT_ENSURE_REGISTERED(ZipfRandomVariable); TypeId ZipfRandomVariable::GetTypeId (void) @@ -1343,8 +1330,7 @@ ZipfRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_n, m_alpha); } -NS_OBJECT_ENSURE_REGISTERED(ZetaRandomVariable) - ; +NS_OBJECT_ENSURE_REGISTERED(ZetaRandomVariable); TypeId ZetaRandomVariable::GetTypeId (void) @@ -1427,8 +1413,7 @@ ZetaRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_alpha); } -NS_OBJECT_ENSURE_REGISTERED(DeterministicRandomVariable) - ; +NS_OBJECT_ENSURE_REGISTERED(DeterministicRandomVariable); TypeId DeterministicRandomVariable::GetTypeId (void) @@ -1500,8 +1485,7 @@ DeterministicRandomVariable::GetInteger (void) return (uint32_t)GetValue (); } -NS_OBJECT_ENSURE_REGISTERED(EmpiricalRandomVariable) - ; +NS_OBJECT_ENSURE_REGISTERED(EmpiricalRandomVariable); // ValueCDF methods EmpiricalRandomVariable::ValueCDF::ValueCDF () diff --git a/src/core/model/random-variable.cc b/src/core/model/random-variable.cc index a6bdff1a6..5c6dbfbad 100644 --- a/src/core/model/random-variable.cc +++ b/src/core/model/random-variable.cc @@ -44,8 +44,7 @@ namespace ns3 { // ----------------------------------------------------------------------------- // RandomVariableBase methods -NS_LOG_COMPONENT_DEFINE ("RandomVariable") - ; +NS_LOG_COMPONENT_DEFINE ("RandomVariable"); /** \ingroup legacyrandom */ class RandomVariableBase diff --git a/src/core/model/realtime-simulator-impl.cc b/src/core/model/realtime-simulator-impl.cc index f570bfdc5..abce3fd0a 100644 --- a/src/core/model/realtime-simulator-impl.cc +++ b/src/core/model/realtime-simulator-impl.cc @@ -43,8 +43,7 @@ NS_LOG_COMPONENT_DEFINE ("RealtimeSimulatorImpl"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RealtimeSimulatorImpl) - ; +NS_OBJECT_ENSURE_REGISTERED (RealtimeSimulatorImpl); TypeId RealtimeSimulatorImpl::GetTypeId (void) diff --git a/src/core/model/scheduler.cc b/src/core/model/scheduler.cc index a69a5fcac..ca4f1234c 100644 --- a/src/core/model/scheduler.cc +++ b/src/core/model/scheduler.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("Scheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Scheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (Scheduler); Scheduler::~Scheduler () { diff --git a/src/core/model/synchronizer.cc b/src/core/model/synchronizer.cc index d5668e39a..5f808d6d1 100644 --- a/src/core/model/synchronizer.cc +++ b/src/core/model/synchronizer.cc @@ -23,8 +23,7 @@ NS_LOG_COMPONENT_DEFINE ("Synchronizer"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Synchronizer) - ; +NS_OBJECT_ENSURE_REGISTERED (Synchronizer); TypeId Synchronizer::GetTypeId (void) diff --git a/src/core/model/test.cc b/src/core/model/test.cc index 6e90544ea..77c54a65f 100644 --- a/src/core/model/test.cc +++ b/src/core/model/test.cc @@ -30,8 +30,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Test") - ; +NS_LOG_COMPONENT_DEFINE ("Test"); bool TestDoubleIsEqual (const double x1, const double x2, const double epsilon) diff --git a/src/core/model/type-id.cc b/src/core/model/type-id.cc index 97399698e..079cf6c7a 100644 --- a/src/core/model/type-id.cc +++ b/src/core/model/type-id.cc @@ -34,8 +34,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("TypeId") - ; +NS_LOG_COMPONENT_DEFINE ("TypeId"); // IidManager needs to be in ns3 namespace for NS_ASSERT and NS_LOG // to find g_log diff --git a/src/core/test/attribute-test-suite.cc b/src/core/test/attribute-test-suite.cc index b38a59efa..ae985edfe 100644 --- a/src/core/test/attribute-test-suite.cc +++ b/src/core/test/attribute-test-suite.cc @@ -72,8 +72,7 @@ public: Derived () {} }; -NS_OBJECT_ENSURE_REGISTERED (Derived) - ; +NS_OBJECT_ENSURE_REGISTERED (Derived); class AttributeObjectTest : public Object { @@ -264,8 +263,7 @@ private: Time m_timeWithBounds; }; -NS_OBJECT_ENSURE_REGISTERED (AttributeObjectTest) - ; +NS_OBJECT_ENSURE_REGISTERED (AttributeObjectTest); // =========================================================================== // Test case template used for generic Attribute Value types -- used to make diff --git a/src/core/test/object-test-suite.cc b/src/core/test/object-test-suite.cc index 619fbccd9..75f8bdc94 100644 --- a/src/core/test/object-test-suite.cc +++ b/src/core/test/object-test-suite.cc @@ -89,14 +89,10 @@ public: } }; -NS_OBJECT_ENSURE_REGISTERED (BaseA) - ; -NS_OBJECT_ENSURE_REGISTERED (DerivedA) - ; -NS_OBJECT_ENSURE_REGISTERED (BaseB) - ; -NS_OBJECT_ENSURE_REGISTERED (DerivedB) - ; +NS_OBJECT_ENSURE_REGISTERED (BaseA); +NS_OBJECT_ENSURE_REGISTERED (DerivedA); +NS_OBJECT_ENSURE_REGISTERED (BaseB); +NS_OBJECT_ENSURE_REGISTERED (DerivedB); } // namespace anonymous diff --git a/src/csma/model/csma-channel.cc b/src/csma/model/csma-channel.cc index 53bc96c79..a95fbe436 100644 --- a/src/csma/model/csma-channel.cc +++ b/src/csma/model/csma-channel.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("CsmaChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (CsmaChannel) - ; +NS_OBJECT_ENSURE_REGISTERED (CsmaChannel); TypeId CsmaChannel::GetTypeId (void) diff --git a/src/csma/model/csma-net-device.cc b/src/csma/model/csma-net-device.cc index f98d0686e..fcd5cc114 100644 --- a/src/csma/model/csma-net-device.cc +++ b/src/csma/model/csma-net-device.cc @@ -37,8 +37,7 @@ NS_LOG_COMPONENT_DEFINE ("CsmaNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (CsmaNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (CsmaNetDevice); TypeId CsmaNetDevice::GetTypeId (void) diff --git a/src/dsdv/model/dsdv-packet.cc b/src/dsdv/model/dsdv-packet.cc index 6cea8d024..0fe4ffeb9 100644 --- a/src/dsdv/model/dsdv-packet.cc +++ b/src/dsdv/model/dsdv-packet.cc @@ -34,8 +34,9 @@ namespace ns3 { namespace dsdv { -NS_OBJECT_ENSURE_REGISTERED (DsdvHeader) - ; + +NS_OBJECT_ENSURE_REGISTERED (DsdvHeader); + DsdvHeader::DsdvHeader (Ipv4Address dst, uint32_t hopCount, uint32_t dstSeqNo) : m_dst (dst), m_hopCount (hopCount), diff --git a/src/dsdv/model/dsdv-routing-protocol.cc b/src/dsdv/model/dsdv-routing-protocol.cc index 57b6aba76..5d60a74ad 100644 --- a/src/dsdv/model/dsdv-routing-protocol.cc +++ b/src/dsdv/model/dsdv-routing-protocol.cc @@ -44,8 +44,8 @@ NS_LOG_COMPONENT_DEFINE ("DsdvRoutingProtocol"); namespace ns3 { namespace dsdv { -NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol) - ; + +NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol); /// UDP Port for DSDV control traffic const uint32_t RoutingProtocol::DSDV_PORT = 269; diff --git a/src/dsr/model/dsr-fs-header.cc b/src/dsr/model/dsr-fs-header.cc index 59f481140..73de37669 100644 --- a/src/dsr/model/dsr-fs-header.cc +++ b/src/dsr/model/dsr-fs-header.cc @@ -39,8 +39,7 @@ namespace dsr { NS_LOG_COMPONENT_DEFINE ("DsrFsHeader"); -NS_OBJECT_ENSURE_REGISTERED (DsrFsHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrFsHeader); TypeId DsrFsHeader::GetTypeId () { @@ -259,8 +258,7 @@ Buffer DsrOptionField::GetDsrOptionBuffer () return m_optionData; } -NS_OBJECT_ENSURE_REGISTERED (DsrRoutingHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrRoutingHeader); TypeId DsrRoutingHeader::GetTypeId () { diff --git a/src/dsr/model/dsr-gratuitous-reply-table.cc b/src/dsr/model/dsr-gratuitous-reply-table.cc index 3b468df6a..572cfbcf5 100644 --- a/src/dsr/model/dsr-gratuitous-reply-table.cc +++ b/src/dsr/model/dsr-gratuitous-reply-table.cc @@ -38,8 +38,7 @@ NS_LOG_COMPONENT_DEFINE ("DsrGraReplyTable"); namespace ns3 { namespace dsr { -NS_OBJECT_ENSURE_REGISTERED (GraReply) - ; +NS_OBJECT_ENSURE_REGISTERED (GraReply); TypeId GraReply::GetTypeId () { diff --git a/src/dsr/model/dsr-network-queue.cc b/src/dsr/model/dsr-network-queue.cc index 0688a5729..bbbce0199 100644 --- a/src/dsr/model/dsr-network-queue.cc +++ b/src/dsr/model/dsr-network-queue.cc @@ -43,8 +43,7 @@ NS_LOG_COMPONENT_DEFINE ("DsrNetworkQueue"); namespace ns3 { namespace dsr { -NS_OBJECT_ENSURE_REGISTERED (DsrNetworkQueue) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrNetworkQueue); TypeId DsrNetworkQueue::GetTypeId (void) diff --git a/src/dsr/model/dsr-option-header.cc b/src/dsr/model/dsr-option-header.cc index 97548065a..9f44e1e5b 100644 --- a/src/dsr/model/dsr-option-header.cc +++ b/src/dsr/model/dsr-option-header.cc @@ -42,8 +42,7 @@ namespace ns3 { namespace dsr { NS_LOG_COMPONENT_DEFINE ("DsrOptionHeader"); -NS_OBJECT_ENSURE_REGISTERED (DsrOptionHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionHeader); TypeId DsrOptionHeader::GetTypeId () { @@ -131,8 +130,7 @@ DsrOptionHeader::Alignment DsrOptionHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1Header) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1Header); TypeId DsrOptionPad1Header::GetTypeId () { @@ -183,8 +181,7 @@ uint32_t DsrOptionPad1Header::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadnHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadnHeader); TypeId DsrOptionPadnHeader::GetTypeId () { @@ -244,8 +241,7 @@ uint32_t DsrOptionPadnHeader::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreqHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreqHeader); TypeId DsrOptionRreqHeader::GetTypeId () { @@ -392,8 +388,7 @@ DsrOptionHeader::Alignment DsrOptionRreqHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrepHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrepHeader); TypeId DsrOptionRrepHeader::GetTypeId () { @@ -514,8 +509,7 @@ DsrOptionHeader::Alignment DsrOptionRrepHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionSRHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionSRHeader); TypeId DsrOptionSRHeader::GetTypeId () { @@ -657,8 +651,7 @@ DsrOptionHeader::Alignment DsrOptionSRHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrHeader); TypeId DsrOptionRerrHeader::GetTypeId () { @@ -786,8 +779,7 @@ DsrOptionHeader::Alignment DsrOptionRerrHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnreachHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnreachHeader); TypeId DsrOptionRerrUnreachHeader::GetTypeId () { @@ -915,8 +907,7 @@ DsrOptionHeader::Alignment DsrOptionRerrUnreachHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnsupportHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnsupportHeader); TypeId DsrOptionRerrUnsupportHeader::GetTypeId () { @@ -1034,8 +1025,7 @@ DsrOptionHeader::Alignment DsrOptionRerrUnsupportHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReqHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReqHeader); TypeId DsrOptionAckReqHeader::GetTypeId () { @@ -1110,8 +1100,7 @@ DsrOptionHeader::Alignment DsrOptionAckReqHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckHeader); TypeId DsrOptionAckHeader::GetTypeId () { diff --git a/src/dsr/model/dsr-options.cc b/src/dsr/model/dsr-options.cc index e9a1f55da..76fe86113 100644 --- a/src/dsr/model/dsr-options.cc +++ b/src/dsr/model/dsr-options.cc @@ -65,8 +65,7 @@ NS_LOG_COMPONENT_DEFINE ("DsrOptions"); namespace ns3 { namespace dsr { -NS_OBJECT_ENSURE_REGISTERED (DsrOptions) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptions); TypeId DsrOptions::GetTypeId () { @@ -372,8 +371,7 @@ Ptr DsrOptions::GetNodeWithAddress (Ipv4Address ipv4Address) return 0; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1); TypeId DsrOptionPad1::GetTypeId () { @@ -413,8 +411,7 @@ uint8_t DsrOptionPad1::Process (Ptr packet, Ptr dsrP, Ipv4Addres return pad1Header.GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadn) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadn); TypeId DsrOptionPadn::GetTypeId () { @@ -454,8 +451,7 @@ uint8_t DsrOptionPadn::Process (Ptr packet, Ptr dsrP, Ipv4Addres return padnHeader.GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreq) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreq); TypeId DsrOptionRreq::GetTypeId () { @@ -953,8 +949,7 @@ uint8_t DsrOptionRreq::Process (Ptr packet, Ptr dsrP, Ipv4Addres //unreachable: return rreq.GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrep) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrep); TypeId DsrOptionRrep::GetTypeId () { @@ -1154,8 +1149,7 @@ uint8_t DsrOptionRrep::Process (Ptr packet, Ptr dsrP, Ipv4Addres return rrep.GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionSR) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionSR); TypeId DsrOptionSR::GetTypeId () { @@ -1313,8 +1307,7 @@ uint8_t DsrOptionSR::Process (Ptr packet, Ptr dsrP, Ipv4Address m_dropTrace (packet); return 0; } - // -fstrict-overflow sensitive, see bug 1868 - if (numberAddress - segsLeft < 2) // The index is invalid + if (numberAddress - segsLeft - 2 < 0) // The index is invalid { NS_LOG_LOGIC ("Malformed header. Drop!"); m_dropTrace (packet); @@ -1396,8 +1389,7 @@ uint8_t DsrOptionSR::Process (Ptr packet, Ptr dsrP, Ipv4Address return sourceRoute.GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerr) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerr); TypeId DsrOptionRerr::GetTypeId () { @@ -1576,8 +1568,7 @@ uint8_t DsrOptionRerr::DoSendError (Ptr p, DsrOptionRerrUnreachHeader &r return serializedSize; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReq) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReq); TypeId DsrOptionAckReq::GetTypeId () { @@ -1632,8 +1623,7 @@ uint8_t DsrOptionAckReq::Process (Ptr packet, Ptr dsrP, Ipv4Addr return ackReq.GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionAck) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrOptionAck); TypeId DsrOptionAck::GetTypeId () { diff --git a/src/dsr/model/dsr-passive-buff.cc b/src/dsr/model/dsr-passive-buff.cc index 1b9cd6a59..af3b2516f 100644 --- a/src/dsr/model/dsr-passive-buff.cc +++ b/src/dsr/model/dsr-passive-buff.cc @@ -41,8 +41,7 @@ NS_LOG_COMPONENT_DEFINE ("PassiveBuffer"); namespace ns3 { namespace dsr { -NS_OBJECT_ENSURE_REGISTERED (PassiveBuffer) - ; +NS_OBJECT_ENSURE_REGISTERED (PassiveBuffer); TypeId PassiveBuffer::GetTypeId () { diff --git a/src/dsr/model/dsr-rcache.cc b/src/dsr/model/dsr-rcache.cc index 86c96fcc4..1cc77cdc1 100644 --- a/src/dsr/model/dsr-rcache.cc +++ b/src/dsr/model/dsr-rcache.cc @@ -131,8 +131,7 @@ RouteCacheEntry::Print (std::ostream & os) const << "\t"; } -NS_OBJECT_ENSURE_REGISTERED (RouteCache) - ; +NS_OBJECT_ENSURE_REGISTERED (RouteCache); TypeId RouteCache::GetTypeId () { diff --git a/src/dsr/model/dsr-routing.cc b/src/dsr/model/dsr-routing.cc index 3bd409eec..552f5735c 100644 --- a/src/dsr/model/dsr-routing.cc +++ b/src/dsr/model/dsr-routing.cc @@ -79,8 +79,7 @@ NS_LOG_COMPONENT_DEFINE ("DsrRouting"); namespace ns3 { namespace dsr { -NS_OBJECT_ENSURE_REGISTERED (DsrRouting) - ; +NS_OBJECT_ENSURE_REGISTERED (DsrRouting); /* see http://www.iana.org/assignments/protocol-numbers */ const uint8_t DsrRouting::PROT_NUMBER = 48; diff --git a/src/dsr/model/dsr-rreq-table.cc b/src/dsr/model/dsr-rreq-table.cc index a8c77922f..362292639 100644 --- a/src/dsr/model/dsr-rreq-table.cc +++ b/src/dsr/model/dsr-rreq-table.cc @@ -39,8 +39,7 @@ NS_LOG_COMPONENT_DEFINE ("RreqTable"); namespace ns3 { namespace dsr { -NS_OBJECT_ENSURE_REGISTERED (RreqTable) - ; +NS_OBJECT_ENSURE_REGISTERED (RreqTable); TypeId RreqTable::GetTypeId () { diff --git a/src/emu/model/emu-net-device.cc b/src/emu/model/emu-net-device.cc index f364261e8..b82051f55 100644 --- a/src/emu/model/emu-net-device.cc +++ b/src/emu/model/emu-net-device.cc @@ -55,8 +55,7 @@ NS_LOG_COMPONENT_DEFINE ("EmuNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (EmuNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (EmuNetDevice); #define EMU_MAGIC 65867 diff --git a/src/energy/model/basic-energy-source.cc b/src/energy/model/basic-energy-source.cc index 3a6d3e0c9..cc3400412 100644 --- a/src/energy/model/basic-energy-source.cc +++ b/src/energy/model/basic-energy-source.cc @@ -29,8 +29,7 @@ NS_LOG_COMPONENT_DEFINE ("BasicEnergySource"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BasicEnergySource) - ; +NS_OBJECT_ENSURE_REGISTERED (BasicEnergySource); TypeId BasicEnergySource::GetTypeId (void) diff --git a/src/energy/model/device-energy-model.cc b/src/energy/model/device-energy-model.cc index 11662b23a..5b8d4a81e 100644 --- a/src/energy/model/device-energy-model.cc +++ b/src/energy/model/device-energy-model.cc @@ -25,8 +25,7 @@ NS_LOG_COMPONENT_DEFINE ("DeviceEnergyModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (DeviceEnergyModel) - ; +NS_OBJECT_ENSURE_REGISTERED (DeviceEnergyModel); TypeId DeviceEnergyModel::GetTypeId (void) diff --git a/src/energy/model/energy-source.cc b/src/energy/model/energy-source.cc index 6210b453d..4608b1e94 100644 --- a/src/energy/model/energy-source.cc +++ b/src/energy/model/energy-source.cc @@ -25,8 +25,7 @@ NS_LOG_COMPONENT_DEFINE ("EnergySource"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (EnergySource) - ; +NS_OBJECT_ENSURE_REGISTERED (EnergySource); TypeId EnergySource::GetTypeId (void) diff --git a/src/energy/model/li-ion-energy-source.cc b/src/energy/model/li-ion-energy-source.cc index 61dd10769..3fb9b4ef3 100644 --- a/src/energy/model/li-ion-energy-source.cc +++ b/src/energy/model/li-ion-energy-source.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("LiIonEnergySource"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LiIonEnergySource) - ; +NS_OBJECT_ENSURE_REGISTERED (LiIonEnergySource); TypeId LiIonEnergySource::GetTypeId (void) diff --git a/src/energy/model/rv-battery-model.cc b/src/energy/model/rv-battery-model.cc index b0ae8d96c..a26ec8720 100644 --- a/src/energy/model/rv-battery-model.cc +++ b/src/energy/model/rv-battery-model.cc @@ -30,8 +30,7 @@ NS_LOG_COMPONENT_DEFINE ("RvBatteryModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RvBatteryModel) - ; +NS_OBJECT_ENSURE_REGISTERED (RvBatteryModel); TypeId RvBatteryModel::GetTypeId (void) diff --git a/src/energy/model/simple-device-energy-model.cc b/src/energy/model/simple-device-energy-model.cc index e6da60df7..edefb05ae 100644 --- a/src/energy/model/simple-device-energy-model.cc +++ b/src/energy/model/simple-device-energy-model.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("SimpleDeviceEnergyModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SimpleDeviceEnergyModel) - ; +NS_OBJECT_ENSURE_REGISTERED (SimpleDeviceEnergyModel); TypeId SimpleDeviceEnergyModel::GetTypeId (void) diff --git a/src/energy/model/wifi-radio-energy-model.cc b/src/energy/model/wifi-radio-energy-model.cc index 71a54168d..fa3479842 100644 --- a/src/energy/model/wifi-radio-energy-model.cc +++ b/src/energy/model/wifi-radio-energy-model.cc @@ -29,8 +29,7 @@ NS_LOG_COMPONENT_DEFINE ("WifiRadioEnergyModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiRadioEnergyModel) - ; +NS_OBJECT_ENSURE_REGISTERED (WifiRadioEnergyModel); TypeId WifiRadioEnergyModel::GetTypeId (void) diff --git a/src/energy/test/li-ion-energy-source-test.cc b/src/energy/test/li-ion-energy-source-test.cc index 34ba36f09..409944cf5 100644 --- a/src/energy/test/li-ion-energy-source-test.cc +++ b/src/energy/test/li-ion-energy-source-test.cc @@ -27,8 +27,7 @@ using namespace ns3; -NS_LOG_COMPONENT_DEFINE ("LiIonEnergySourceTestSuite") - ; +NS_LOG_COMPONENT_DEFINE ("LiIonEnergySourceTestSuite"); class LiIonEnergyTestCase : public TestCase { diff --git a/src/fd-net-device/model/fd-net-device.cc b/src/fd-net-device/model/fd-net-device.cc index b7551fc31..acf47ab21 100644 --- a/src/fd-net-device/model/fd-net-device.cc +++ b/src/fd-net-device/model/fd-net-device.cc @@ -74,8 +74,7 @@ FdReader::Data FdNetDeviceFdReader::DoRead (void) return FdReader::Data (buf, len); } -NS_OBJECT_ENSURE_REGISTERED (FdNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (FdNetDevice); TypeId FdNetDevice::GetTypeId (void) diff --git a/src/flow-monitor/model/flow-monitor.cc b/src/flow-monitor/model/flow-monitor.cc index 1749775bd..ab8e39625 100644 --- a/src/flow-monitor/model/flow-monitor.cc +++ b/src/flow-monitor/model/flow-monitor.cc @@ -31,11 +31,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("FlowMonitor") - ; +NS_LOG_COMPONENT_DEFINE ("FlowMonitor"); -NS_OBJECT_ENSURE_REGISTERED (FlowMonitor) - ; +NS_OBJECT_ENSURE_REGISTERED (FlowMonitor); TypeId diff --git a/src/flow-monitor/model/histogram.cc b/src/flow-monitor/model/histogram.cc index 5441ccf71..d72894c83 100644 --- a/src/flow-monitor/model/histogram.cc +++ b/src/flow-monitor/model/histogram.cc @@ -30,8 +30,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Histogram") - ; +NS_LOG_COMPONENT_DEFINE ("Histogram"); // uint32_t // Histogram::GetSize () const diff --git a/src/flow-monitor/model/ipv4-flow-probe.cc b/src/flow-monitor/model/ipv4-flow-probe.cc index 44bab05dc..8d2114e4e 100644 --- a/src/flow-monitor/model/ipv4-flow-probe.cc +++ b/src/flow-monitor/model/ipv4-flow-probe.cc @@ -30,8 +30,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Ipv4FlowProbe") - ; +NS_LOG_COMPONENT_DEFINE ("Ipv4FlowProbe"); ////////////////////////////////////// // Ipv4FlowProbeTag class implementation // diff --git a/src/internet/helper/ipv6-address-helper.cc b/src/internet/helper/ipv6-address-helper.cc index c48150061..3bb104da0 100644 --- a/src/internet/helper/ipv6-address-helper.cc +++ b/src/internet/helper/ipv6-address-helper.cc @@ -34,8 +34,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Ipv6AddressHelper") - ; +NS_LOG_COMPONENT_DEFINE ("Ipv6AddressHelper"); Ipv6AddressHelper::Ipv6AddressHelper () { diff --git a/src/internet/model/arp-cache.cc b/src/internet/model/arp-cache.cc index 1cf1b92e8..7a9f8ab28 100644 --- a/src/internet/model/arp-cache.cc +++ b/src/internet/model/arp-cache.cc @@ -33,8 +33,7 @@ NS_LOG_COMPONENT_DEFINE ("ArpCache"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ArpCache) - ; +NS_OBJECT_ENSURE_REGISTERED (ArpCache); TypeId ArpCache::GetTypeId (void) diff --git a/src/internet/model/arp-header.cc b/src/internet/model/arp-header.cc index e7da992ee..21ca72f20 100644 --- a/src/internet/model/arp-header.cc +++ b/src/internet/model/arp-header.cc @@ -27,8 +27,7 @@ NS_LOG_COMPONENT_DEFINE ("ArpHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ArpHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (ArpHeader); void ArpHeader::SetRequest (Address sourceHardwareAddress, diff --git a/src/internet/model/arp-l3-protocol.cc b/src/internet/model/arp-l3-protocol.cc index 949eaa070..715e6a193 100644 --- a/src/internet/model/arp-l3-protocol.cc +++ b/src/internet/model/arp-l3-protocol.cc @@ -38,8 +38,7 @@ namespace ns3 { const uint16_t ArpL3Protocol::PROT_NUMBER = 0x0806; -NS_OBJECT_ENSURE_REGISTERED (ArpL3Protocol) - ; +NS_OBJECT_ENSURE_REGISTERED (ArpL3Protocol); TypeId ArpL3Protocol::GetTypeId (void) diff --git a/src/internet/model/global-router-interface.cc b/src/internet/model/global-router-interface.cc index cdc9d6d35..7fc245016 100644 --- a/src/internet/model/global-router-interface.cc +++ b/src/internet/model/global-router-interface.cc @@ -504,8 +504,7 @@ std::ostream& operator<< (std::ostream& os, GlobalRoutingLSA& lsa) // // --------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (GlobalRouter) - ; +NS_OBJECT_ENSURE_REGISTERED (GlobalRouter); TypeId GlobalRouter::GetTypeId (void) diff --git a/src/internet/model/icmpv4-l4-protocol.cc b/src/internet/model/icmpv4-l4-protocol.cc index 698995f84..c2989e889 100644 --- a/src/internet/model/icmpv4-l4-protocol.cc +++ b/src/internet/model/icmpv4-l4-protocol.cc @@ -11,11 +11,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Icmpv4L4Protocol") - ; +NS_LOG_COMPONENT_DEFINE ("Icmpv4L4Protocol"); -NS_OBJECT_ENSURE_REGISTERED (Icmpv4L4Protocol) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv4L4Protocol); // see rfc 792 const uint8_t Icmpv4L4Protocol::PROT_NUMBER = 1; diff --git a/src/internet/model/icmpv4.cc b/src/internet/model/icmpv4.cc index a78f7e8ce..c157535a5 100644 --- a/src/internet/model/icmpv4.cc +++ b/src/internet/model/icmpv4.cc @@ -30,8 +30,7 @@ namespace ns3 { * Icmpv4Header ********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (Icmpv4Header) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv4Header); TypeId Icmpv4Header::GetTypeId (void) @@ -134,8 +133,7 @@ Icmpv4Header::GetCode (void) const * Icmpv4Echo ********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (Icmpv4Echo) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv4Echo); void Icmpv4Echo::SetIdentifier (uint16_t id) @@ -272,8 +270,7 @@ Icmpv4Echo::Print (std::ostream &os) const * Icmpv4DestinationUnreachable ********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (Icmpv4DestinationUnreachable) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv4DestinationUnreachable); TypeId Icmpv4DestinationUnreachable::GetTypeId (void) @@ -396,8 +393,7 @@ Icmpv4DestinationUnreachable::Print (std::ostream &os) const * Icmpv4TimeExceeded ********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (Icmpv4TimeExceeded) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv4TimeExceeded); TypeId Icmpv4TimeExceeded::GetTypeId (void) diff --git a/src/internet/model/icmpv6-header.cc b/src/internet/model/icmpv6-header.cc index aa4cac5bc..e5b702cb2 100644 --- a/src/internet/model/icmpv6-header.cc +++ b/src/internet/model/icmpv6-header.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("Icmpv6Header"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Icmpv6Header) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6Header); TypeId Icmpv6Header::GetTypeId () { @@ -173,8 +172,7 @@ void Icmpv6Header::CalculatePseudoHeaderChecksum (Ipv6Address src, Ipv6Address d m_checksum = ~(it.CalculateIpChecksum (40)); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6NS) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6NS); Icmpv6NS::Icmpv6NS () { @@ -296,8 +294,7 @@ uint32_t Icmpv6NS::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6NA) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6NA); TypeId Icmpv6NA::GetTypeId () { @@ -480,8 +477,7 @@ uint32_t Icmpv6NA::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6RA) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6RA); TypeId Icmpv6RA::GetTypeId () { @@ -700,8 +696,7 @@ uint32_t Icmpv6RA::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6RS) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6RS); TypeId Icmpv6RS::GetTypeId () { @@ -791,8 +786,7 @@ uint32_t Icmpv6RS::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6Redirection) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6Redirection); TypeId Icmpv6Redirection::GetTypeId () { @@ -922,8 +916,7 @@ uint32_t Icmpv6Redirection::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6Echo) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6Echo); TypeId Icmpv6Echo::GetTypeId () { @@ -1040,8 +1033,7 @@ uint32_t Icmpv6Echo::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6DestinationUnreachable) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6DestinationUnreachable); TypeId Icmpv6DestinationUnreachable::GetTypeId () { @@ -1138,8 +1130,7 @@ uint32_t Icmpv6DestinationUnreachable::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6TooBig) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6TooBig); TypeId Icmpv6TooBig::GetTypeId () { @@ -1249,8 +1240,7 @@ uint32_t Icmpv6TooBig::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6TimeExceeded) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6TimeExceeded); TypeId Icmpv6TimeExceeded::GetTypeId () { @@ -1349,8 +1339,7 @@ uint32_t Icmpv6TimeExceeded::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6ParameterError) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6ParameterError); TypeId Icmpv6ParameterError::GetTypeId () { @@ -1460,8 +1449,7 @@ uint32_t Icmpv6ParameterError::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionHeader); TypeId Icmpv6OptionHeader::GetTypeId () { @@ -1539,8 +1527,7 @@ void Icmpv6OptionHeader::Serialize (Buffer::Iterator start) const NS_LOG_FUNCTION (this << &start); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionMtu) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionMtu); TypeId Icmpv6OptionMtu::GetTypeId () { @@ -1636,8 +1623,7 @@ uint32_t Icmpv6OptionMtu::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionPrefixInformation) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionPrefixInformation); TypeId Icmpv6OptionPrefixInformation::GetTypeId () { @@ -1810,8 +1796,7 @@ uint32_t Icmpv6OptionPrefixInformation::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionLinkLayerAddress) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionLinkLayerAddress); TypeId Icmpv6OptionLinkLayerAddress::GetTypeId () { @@ -1910,17 +1895,15 @@ uint32_t Icmpv6OptionLinkLayerAddress::Deserialize (Buffer::Iterator start) SetType (i.ReadU8 ()); SetLength (i.ReadU8 ()); - // -fstrict-overflow sensitive, see bug 1868 - NS_ASSERT (GetLength () * 8 <= 32 + 2); + NS_ASSERT (GetLength () * 8 - 2 <= 32); i.Read (mac, (GetLength () * 8) - 2); - m_addr.CopyFrom (mac, (GetLength () * 8) - 2); + m_addr.CopyFrom (mac, (GetLength () * 8)-2); return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionRedirected) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionRedirected); TypeId Icmpv6OptionRedirected::GetTypeId () { diff --git a/src/internet/model/icmpv6-l4-protocol.cc b/src/internet/model/icmpv6-l4-protocol.cc index 3831bf527..7a634db32 100644 --- a/src/internet/model/icmpv6-l4-protocol.cc +++ b/src/internet/model/icmpv6-l4-protocol.cc @@ -39,11 +39,9 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Icmpv6L4Protocol) - ; +NS_OBJECT_ENSURE_REGISTERED (Icmpv6L4Protocol); -NS_LOG_COMPONENT_DEFINE ("Icmpv6L4Protocol") - ; +NS_LOG_COMPONENT_DEFINE ("Icmpv6L4Protocol"); const uint8_t Icmpv6L4Protocol::PROT_NUMBER = 58; diff --git a/src/internet/model/ip-l4-protocol.cc b/src/internet/model/ip-l4-protocol.cc index 5af5469ed..252406ed8 100644 --- a/src/internet/model/ip-l4-protocol.cc +++ b/src/internet/model/ip-l4-protocol.cc @@ -29,8 +29,7 @@ NS_LOG_COMPONENT_DEFINE ("IpL4Protocol"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (IpL4Protocol) - ; +NS_OBJECT_ENSURE_REGISTERED (IpL4Protocol); TypeId IpL4Protocol::GetTypeId (void) diff --git a/src/internet/model/ipv4-end-point-demux.cc b/src/internet/model/ipv4-end-point-demux.cc index 5c5eaf138..7e06770eb 100644 --- a/src/internet/model/ipv4-end-point-demux.cc +++ b/src/internet/model/ipv4-end-point-demux.cc @@ -24,8 +24,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Ipv4EndPointDemux") - ; +NS_LOG_COMPONENT_DEFINE ("Ipv4EndPointDemux"); Ipv4EndPointDemux::Ipv4EndPointDemux () : m_ephemeral (49152), m_portLast (65535), m_portFirst (49152) diff --git a/src/internet/model/ipv4-global-routing.cc b/src/internet/model/ipv4-global-routing.cc index f87f8b7cf..e7d7b80c7 100644 --- a/src/internet/model/ipv4-global-routing.cc +++ b/src/internet/model/ipv4-global-routing.cc @@ -34,8 +34,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4GlobalRouting"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4GlobalRouting) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv4GlobalRouting); TypeId Ipv4GlobalRouting::GetTypeId (void) diff --git a/src/internet/model/ipv4-header.cc b/src/internet/model/ipv4-header.cc index 714e03100..d033ab058 100644 --- a/src/internet/model/ipv4-header.cc +++ b/src/internet/model/ipv4-header.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4Header"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4Header) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv4Header); Ipv4Header::Ipv4Header () : m_calcChecksum (false), @@ -247,8 +246,7 @@ uint16_t Ipv4Header::GetFragmentOffset (void) const { NS_LOG_FUNCTION (this); - // -fstrict-overflow sensitive, see bug 1868 - if ( m_fragmentOffset + m_payloadSize > 65535 - 5*4 ) + if ((m_fragmentOffset+m_payloadSize+5*4) > 65535) { NS_LOG_WARN("Fragment will exceed the maximum packet size once reassembled"); } diff --git a/src/internet/model/ipv4-interface.cc b/src/internet/model/ipv4-interface.cc index 89da2e6c8..c924707e7 100644 --- a/src/internet/model/ipv4-interface.cc +++ b/src/internet/model/ipv4-interface.cc @@ -34,8 +34,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4Interface"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4Interface) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv4Interface); TypeId Ipv4Interface::GetTypeId (void) diff --git a/src/internet/model/ipv4-l3-protocol.cc b/src/internet/model/ipv4-l3-protocol.cc index 13a3a3a66..eafe9a3a7 100644 --- a/src/internet/model/ipv4-l3-protocol.cc +++ b/src/internet/model/ipv4-l3-protocol.cc @@ -46,8 +46,7 @@ namespace ns3 { const uint16_t Ipv4L3Protocol::PROT_NUMBER = 0x0800; -NS_OBJECT_ENSURE_REGISTERED (Ipv4L3Protocol) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv4L3Protocol); TypeId Ipv4L3Protocol::GetTypeId (void) @@ -1290,8 +1289,8 @@ Ipv4L3Protocol::ProcessFragment (Ptr& packet, Ipv4Header& ipHeader, uint { NS_LOG_FUNCTION (this << packet << ipHeader << iif); - uint64_t addressCombination = uint64_t (ipHeader.GetSource ().Get ()) << 32 | uint64_t (ipHeader.GetDestination ().Get ()); - uint32_t idProto = uint32_t (ipHeader.GetIdentification ()) << 16 | uint32_t (ipHeader.GetProtocol ()); + uint64_t addressCombination = uint64_t (ipHeader.GetSource ().Get ()) << 32 & uint64_t (ipHeader.GetDestination ().Get ()); + uint32_t idProto = uint32_t (ipHeader.GetIdentification ()) << 16 & uint32_t (ipHeader.GetProtocol ()); std::pair key; bool ret = false; Ptr p = packet->Copy (); diff --git a/src/internet/model/ipv4-list-routing.cc b/src/internet/model/ipv4-list-routing.cc index 113065316..7ada35f27 100644 --- a/src/internet/model/ipv4-list-routing.cc +++ b/src/internet/model/ipv4-list-routing.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4ListRouting"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4ListRouting) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv4ListRouting); TypeId Ipv4ListRouting::GetTypeId (void) diff --git a/src/internet/model/ipv4-packet-probe.cc b/src/internet/model/ipv4-packet-probe.cc index 6b01fa8f3..d59f55a47 100644 --- a/src/internet/model/ipv4-packet-probe.cc +++ b/src/internet/model/ipv4-packet-probe.cc @@ -32,8 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4PacketProbe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4PacketProbe) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv4PacketProbe); TypeId Ipv4PacketProbe::GetTypeId () diff --git a/src/internet/model/ipv4-raw-socket-factory.cc b/src/internet/model/ipv4-raw-socket-factory.cc index 036539947..02bfc8a5a 100644 --- a/src/internet/model/ipv4-raw-socket-factory.cc +++ b/src/internet/model/ipv4-raw-socket-factory.cc @@ -25,8 +25,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4RawSocketFactory"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketFactory) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketFactory); TypeId Ipv4RawSocketFactory::GetTypeId (void) { diff --git a/src/internet/model/ipv4-raw-socket-impl.cc b/src/internet/model/ipv4-raw-socket-impl.cc index b47dab22c..397a1276b 100644 --- a/src/internet/model/ipv4-raw-socket-impl.cc +++ b/src/internet/model/ipv4-raw-socket-impl.cc @@ -17,8 +17,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4RawSocketImpl"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketImpl) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketImpl); TypeId Ipv4RawSocketImpl::GetTypeId (void) diff --git a/src/internet/model/ipv4-routing-protocol.cc b/src/internet/model/ipv4-routing-protocol.cc index 423e8778a..4a9a542f7 100644 --- a/src/internet/model/ipv4-routing-protocol.cc +++ b/src/internet/model/ipv4-routing-protocol.cc @@ -25,8 +25,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4RoutingProtocol"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4RoutingProtocol) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv4RoutingProtocol); TypeId Ipv4RoutingProtocol::GetTypeId (void) { diff --git a/src/internet/model/ipv4-static-routing.cc b/src/internet/model/ipv4-static-routing.cc index e8defff83..53196d2df 100644 --- a/src/internet/model/ipv4-static-routing.cc +++ b/src/internet/model/ipv4-static-routing.cc @@ -40,8 +40,7 @@ using std::make_pair; namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4StaticRouting) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv4StaticRouting); TypeId Ipv4StaticRouting::GetTypeId (void) diff --git a/src/internet/model/ipv4.cc b/src/internet/model/ipv4.cc index aa3cc638a..f0e03e2fa 100644 --- a/src/internet/model/ipv4.cc +++ b/src/internet/model/ipv4.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv4); TypeId Ipv4::GetTypeId (void) diff --git a/src/internet/model/ipv6-end-point-demux.cc b/src/internet/model/ipv6-end-point-demux.cc index db66d2c91..9bd886759 100644 --- a/src/internet/model/ipv6-end-point-demux.cc +++ b/src/internet/model/ipv6-end-point-demux.cc @@ -24,8 +24,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Ipv6EndPointDemux") - ; +NS_LOG_COMPONENT_DEFINE ("Ipv6EndPointDemux"); Ipv6EndPointDemux::Ipv6EndPointDemux () : m_ephemeral (49152), diff --git a/src/internet/model/ipv6-end-point.cc b/src/internet/model/ipv6-end-point.cc index c3840909b..374b80925 100644 --- a/src/internet/model/ipv6-end-point.cc +++ b/src/internet/model/ipv6-end-point.cc @@ -27,8 +27,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Ipv6EndPoint") - ; +NS_LOG_COMPONENT_DEFINE ("Ipv6EndPoint"); Ipv6EndPoint::Ipv6EndPoint (Ipv6Address addr, uint16_t port) : m_localAddr (addr), diff --git a/src/internet/model/ipv6-extension-demux.cc b/src/internet/model/ipv6-extension-demux.cc index ed5c58272..04688ae17 100644 --- a/src/internet/model/ipv6-extension-demux.cc +++ b/src/internet/model/ipv6-extension-demux.cc @@ -28,8 +28,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDemux) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDemux); TypeId Ipv6ExtensionDemux::GetTypeId () { diff --git a/src/internet/model/ipv6-extension-header.cc b/src/internet/model/ipv6-extension-header.cc index 3f9bfa392..07fa203cd 100644 --- a/src/internet/model/ipv6-extension-header.cc +++ b/src/internet/model/ipv6-extension-header.cc @@ -26,11 +26,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Ipv6ExtensionHeader") - ; +NS_LOG_COMPONENT_DEFINE ("Ipv6ExtensionHeader"); -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHeader); TypeId Ipv6ExtensionHeader::GetTypeId () { @@ -201,8 +199,7 @@ Buffer OptionField::GetOptionBuffer () } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHopHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHopHeader); TypeId Ipv6ExtensionHopByHopHeader::GetTypeId () { @@ -257,8 +254,7 @@ uint32_t Ipv6ExtensionHopByHopHeader::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestinationHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestinationHeader); TypeId Ipv6ExtensionDestinationHeader::GetTypeId () { @@ -313,8 +309,7 @@ uint32_t Ipv6ExtensionDestinationHeader::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragmentHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragmentHeader); TypeId Ipv6ExtensionFragmentHeader::GetTypeId () { @@ -407,8 +402,7 @@ uint32_t Ipv6ExtensionFragmentHeader::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingHeader); TypeId Ipv6ExtensionRoutingHeader::GetTypeId () { @@ -487,8 +481,7 @@ uint32_t Ipv6ExtensionRoutingHeader::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRoutingHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRoutingHeader); TypeId Ipv6ExtensionLooseRoutingHeader::GetTypeId () { @@ -595,8 +588,7 @@ uint32_t Ipv6ExtensionLooseRoutingHeader::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESPHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESPHeader); TypeId Ipv6ExtensionESPHeader::GetTypeId () { @@ -642,8 +634,7 @@ uint32_t Ipv6ExtensionESPHeader::Deserialize (Buffer::Iterator start) return 0; } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAHHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAHHeader); TypeId Ipv6ExtensionAHHeader::GetTypeId () { diff --git a/src/internet/model/ipv6-extension.cc b/src/internet/model/ipv6-extension.cc index 348156d8e..6da12e683 100755 --- a/src/internet/model/ipv6-extension.cc +++ b/src/internet/model/ipv6-extension.cc @@ -44,8 +44,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv6Extension"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6Extension) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6Extension); TypeId Ipv6Extension::GetTypeId () { @@ -183,8 +182,7 @@ Ipv6Extension::AssignStreams (int64_t stream) return 1; } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHop) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHop); TypeId Ipv6ExtensionHopByHop::GetTypeId () { @@ -236,8 +234,7 @@ uint8_t Ipv6ExtensionHopByHop::Process (Ptr& packet, uint8_t offset, Ipv } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestination) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestination); TypeId Ipv6ExtensionDestination::GetTypeId () { @@ -289,8 +286,7 @@ uint8_t Ipv6ExtensionDestination::Process (Ptr& packet, uint8_t offset, } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragment) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragment); TypeId Ipv6ExtensionFragment::GetTypeId () { @@ -707,8 +703,7 @@ void Ipv6ExtensionFragment::Fragments::CancelTimeout () } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRouting) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRouting); TypeId Ipv6ExtensionRouting::GetTypeId () { @@ -793,8 +788,7 @@ uint8_t Ipv6ExtensionRouting::Process (Ptr& packet, uint8_t offset, Ipv6 } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingDemux) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingDemux); TypeId Ipv6ExtensionRoutingDemux::GetTypeId () { @@ -856,8 +850,7 @@ void Ipv6ExtensionRoutingDemux::Remove (Ptr extensionRouti } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRouting) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRouting); TypeId Ipv6ExtensionLooseRouting::GetTypeId () { @@ -1010,8 +1003,7 @@ uint8_t Ipv6ExtensionLooseRouting::Process (Ptr& packet, uint8_t offset, } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESP) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESP); TypeId Ipv6ExtensionESP::GetTypeId () { @@ -1049,8 +1041,7 @@ uint8_t Ipv6ExtensionESP::Process (Ptr& packet, uint8_t offset, Ipv6Head } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAH) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAH); TypeId Ipv6ExtensionAH::GetTypeId () { diff --git a/src/internet/model/ipv6-header.cc b/src/internet/model/ipv6-header.cc index 58583f350..a7ea7a1a2 100644 --- a/src/internet/model/ipv6-header.cc +++ b/src/internet/model/ipv6-header.cc @@ -29,8 +29,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv6Header"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6Header) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6Header); Ipv6Header::Ipv6Header () : m_version (6), diff --git a/src/internet/model/ipv6-interface-address.cc b/src/internet/model/ipv6-interface-address.cc index 3f806e1ba..f928efc09 100644 --- a/src/internet/model/ipv6-interface-address.cc +++ b/src/internet/model/ipv6-interface-address.cc @@ -28,8 +28,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Ipv6InterfaceAddress") - ; +NS_LOG_COMPONENT_DEFINE ("Ipv6InterfaceAddress"); Ipv6InterfaceAddress::Ipv6InterfaceAddress () : m_address (Ipv6Address ()), diff --git a/src/internet/model/ipv6-interface.cc b/src/internet/model/ipv6-interface.cc index 23f40f19e..9c5ac1aa1 100644 --- a/src/internet/model/ipv6-interface.cc +++ b/src/internet/model/ipv6-interface.cc @@ -34,11 +34,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Ipv6Interface") - ; +NS_LOG_COMPONENT_DEFINE ("Ipv6Interface"); -NS_OBJECT_ENSURE_REGISTERED (Ipv6Interface) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6Interface); TypeId Ipv6Interface::GetTypeId () { diff --git a/src/internet/model/ipv6-l3-protocol.cc b/src/internet/model/ipv6-l3-protocol.cc index a92579ab5..54bf5367a 100644 --- a/src/internet/model/ipv6-l3-protocol.cc +++ b/src/internet/model/ipv6-l3-protocol.cc @@ -49,11 +49,9 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6L3Protocol) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6L3Protocol); -NS_LOG_COMPONENT_DEFINE ("Ipv6L3Protocol") - ; +NS_LOG_COMPONENT_DEFINE ("Ipv6L3Protocol"); const uint16_t Ipv6L3Protocol::PROT_NUMBER = 0x86DD; diff --git a/src/internet/model/ipv6-list-routing.cc b/src/internet/model/ipv6-list-routing.cc index a3bd421c0..89a0e69bb 100644 --- a/src/internet/model/ipv6-list-routing.cc +++ b/src/internet/model/ipv6-list-routing.cc @@ -29,8 +29,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv6ListRouting"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6ListRouting) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6ListRouting); TypeId Ipv6ListRouting::GetTypeId (void) diff --git a/src/internet/model/ipv6-option-demux.cc b/src/internet/model/ipv6-option-demux.cc index becab0f7e..b23dcffd6 100644 --- a/src/internet/model/ipv6-option-demux.cc +++ b/src/internet/model/ipv6-option-demux.cc @@ -28,8 +28,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionDemux) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionDemux); TypeId Ipv6OptionDemux::GetTypeId () { diff --git a/src/internet/model/ipv6-option-header.cc b/src/internet/model/ipv6-option-header.cc index 5387bdad5..d43a4db9b 100644 --- a/src/internet/model/ipv6-option-header.cc +++ b/src/internet/model/ipv6-option-header.cc @@ -26,11 +26,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Ipv6OptionHeader") - ; +NS_LOG_COMPONENT_DEFINE ("Ipv6OptionHeader"); -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionHeader); TypeId Ipv6OptionHeader::GetTypeId () { @@ -118,8 +116,7 @@ Ipv6OptionHeader::Alignment Ipv6OptionHeader::GetAlignment () const return (Alignment){ 1,0}; } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1Header) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1Header); TypeId Ipv6OptionPad1Header::GetTypeId () { @@ -170,8 +167,7 @@ uint32_t Ipv6OptionPad1Header::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadnHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadnHeader); TypeId Ipv6OptionPadnHeader::GetTypeId () { @@ -231,8 +227,7 @@ uint32_t Ipv6OptionPadnHeader::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogramHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogramHeader); TypeId Ipv6OptionJumbogramHeader::GetTypeId () { @@ -303,8 +298,7 @@ Ipv6OptionHeader::Alignment Ipv6OptionJumbogramHeader::GetAlignment () const return (Alignment){ 4,2}; //4n+2 } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlertHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlertHeader); TypeId Ipv6OptionRouterAlertHeader::GetTypeId () { diff --git a/src/internet/model/ipv6-option.cc b/src/internet/model/ipv6-option.cc index 521fb229d..9a530d384 100644 --- a/src/internet/model/ipv6-option.cc +++ b/src/internet/model/ipv6-option.cc @@ -29,8 +29,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv6Option"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6Option) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6Option); TypeId Ipv6Option::GetTypeId () { @@ -56,8 +55,7 @@ void Ipv6Option::SetNode (Ptr node) } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1); TypeId Ipv6OptionPad1::GetTypeId () { @@ -101,8 +99,7 @@ uint8_t Ipv6OptionPad1::Process (Ptr packet, uint8_t offset, Ipv6Header } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadn) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadn); TypeId Ipv6OptionPadn::GetTypeId () { @@ -146,8 +143,7 @@ uint8_t Ipv6OptionPadn::Process (Ptr packet, uint8_t offset, Ipv6Header } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogram) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogram); TypeId Ipv6OptionJumbogram::GetTypeId () { @@ -191,8 +187,7 @@ uint8_t Ipv6OptionJumbogram::Process (Ptr packet, uint8_t offset, Ipv6He } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlert) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlert); TypeId Ipv6OptionRouterAlert::GetTypeId () { diff --git a/src/internet/model/ipv6-packet-probe.cc b/src/internet/model/ipv6-packet-probe.cc index 131e07260..bd301c94a 100644 --- a/src/internet/model/ipv6-packet-probe.cc +++ b/src/internet/model/ipv6-packet-probe.cc @@ -33,8 +33,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv6PacketProbe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6PacketProbe) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6PacketProbe); TypeId Ipv6PacketProbe::GetTypeId () diff --git a/src/internet/model/ipv6-pmtu-cache.cc b/src/internet/model/ipv6-pmtu-cache.cc index 788f79aa8..aba06ba9d 100644 --- a/src/internet/model/ipv6-pmtu-cache.cc +++ b/src/internet/model/ipv6-pmtu-cache.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv6PmtuCache"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6PmtuCache) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6PmtuCache); TypeId Ipv6PmtuCache::GetTypeId () { diff --git a/src/internet/model/ipv6-raw-socket-factory.cc b/src/internet/model/ipv6-raw-socket-factory.cc index ee4bfeb9b..cc0e9d85c 100644 --- a/src/internet/model/ipv6-raw-socket-factory.cc +++ b/src/internet/model/ipv6-raw-socket-factory.cc @@ -24,8 +24,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketFactory) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketFactory); TypeId Ipv6RawSocketFactory::GetTypeId () { diff --git a/src/internet/model/ipv6-raw-socket-impl.cc b/src/internet/model/ipv6-raw-socket-impl.cc index 12037927d..482dd7ebc 100644 --- a/src/internet/model/ipv6-raw-socket-impl.cc +++ b/src/internet/model/ipv6-raw-socket-impl.cc @@ -38,12 +38,10 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Ipv6RawSocketImpl") - ; +NS_LOG_COMPONENT_DEFINE ("Ipv6RawSocketImpl"); -NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketImpl) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketImpl); TypeId Ipv6RawSocketImpl::GetTypeId () { diff --git a/src/internet/model/ipv6-routing-protocol.cc b/src/internet/model/ipv6-routing-protocol.cc index 7dd6ff440..88cd22f07 100644 --- a/src/internet/model/ipv6-routing-protocol.cc +++ b/src/internet/model/ipv6-routing-protocol.cc @@ -26,8 +26,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6RoutingProtocol) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6RoutingProtocol); TypeId Ipv6RoutingProtocol::GetTypeId () { diff --git a/src/internet/model/ipv6-static-routing.cc b/src/internet/model/ipv6-static-routing.cc index 4094c0460..0c6938963 100644 --- a/src/internet/model/ipv6-static-routing.cc +++ b/src/internet/model/ipv6-static-routing.cc @@ -32,10 +32,8 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Ipv6StaticRouting") - ; -NS_OBJECT_ENSURE_REGISTERED (Ipv6StaticRouting) - ; +NS_LOG_COMPONENT_DEFINE ("Ipv6StaticRouting"); +NS_OBJECT_ENSURE_REGISTERED (Ipv6StaticRouting); TypeId Ipv6StaticRouting::GetTypeId () { diff --git a/src/internet/model/ipv6.cc b/src/internet/model/ipv6.cc index dcd0fb669..6e3bab17a 100644 --- a/src/internet/model/ipv6.cc +++ b/src/internet/model/ipv6.cc @@ -29,8 +29,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv6); TypeId Ipv6::GetTypeId (void) { diff --git a/src/internet/model/loopback-net-device.cc b/src/internet/model/loopback-net-device.cc index ab8fdb316..69fde8fef 100644 --- a/src/internet/model/loopback-net-device.cc +++ b/src/internet/model/loopback-net-device.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("LoopbackNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LoopbackNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (LoopbackNetDevice); TypeId LoopbackNetDevice::GetTypeId (void) diff --git a/src/internet/model/ndisc-cache.cc b/src/internet/model/ndisc-cache.cc index d56a3b5e1..55cc44272 100644 --- a/src/internet/model/ndisc-cache.cc +++ b/src/internet/model/ndisc-cache.cc @@ -30,11 +30,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("NdiscCache") - ; +NS_LOG_COMPONENT_DEFINE ("NdiscCache"); -NS_OBJECT_ENSURE_REGISTERED (NdiscCache) - ; +NS_OBJECT_ENSURE_REGISTERED (NdiscCache); TypeId NdiscCache::GetTypeId () { diff --git a/src/internet/model/nsc-sysctl.cc b/src/internet/model/nsc-sysctl.cc index 0ad7995a9..9f166238e 100644 --- a/src/internet/model/nsc-sysctl.cc +++ b/src/internet/model/nsc-sysctl.cc @@ -152,8 +152,7 @@ Ns3NscStack::Set (std::string name, std::string value) } } -NS_OBJECT_ENSURE_REGISTERED (Ns3NscStack) - ; +NS_OBJECT_ENSURE_REGISTERED (Ns3NscStack); TypeId Ns3NscStack::Ns3NscStack::GetTypeId (void) diff --git a/src/internet/model/nsc-tcp-l4-protocol.cc b/src/internet/model/nsc-tcp-l4-protocol.cc index 7ab1e40c3..30ddda209 100644 --- a/src/internet/model/nsc-tcp-l4-protocol.cc +++ b/src/internet/model/nsc-tcp-l4-protocol.cc @@ -49,8 +49,7 @@ NS_LOG_COMPONENT_DEFINE ("NscTcpL4Protocol"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (NscTcpL4Protocol) - ; +NS_OBJECT_ENSURE_REGISTERED (NscTcpL4Protocol); /* see http://www.iana.org/assignments/protocol-numbers */ const uint8_t NscTcpL4Protocol::PROT_NUMBER = 6; diff --git a/src/internet/model/nsc-tcp-socket-impl.cc b/src/internet/model/nsc-tcp-socket-impl.cc index 6e9a34877..a4a69ec2d 100644 --- a/src/internet/model/nsc-tcp-socket-impl.cc +++ b/src/internet/model/nsc-tcp-socket-impl.cc @@ -47,8 +47,7 @@ NS_LOG_COMPONENT_DEFINE ("NscTcpSocketImpl"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (NscTcpSocketImpl) - ; +NS_OBJECT_ENSURE_REGISTERED (NscTcpSocketImpl); TypeId NscTcpSocketImpl::GetTypeId () diff --git a/src/internet/model/rtt-estimator.cc b/src/internet/model/rtt-estimator.cc index 3242e4cff..e2fa1dc88 100644 --- a/src/internet/model/rtt-estimator.cc +++ b/src/internet/model/rtt-estimator.cc @@ -38,8 +38,7 @@ NS_LOG_COMPONENT_DEFINE ("RttEstimator"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RttEstimator) - ; +NS_OBJECT_ENSURE_REGISTERED (RttEstimator); TypeId RttEstimator::GetTypeId (void) @@ -232,8 +231,7 @@ void RttEstimator::Reset () //----------------------------------------------------------------------------- // Mean-Deviation Estimator -NS_OBJECT_ENSURE_REGISTERED (RttMeanDeviation) - ; +NS_OBJECT_ENSURE_REGISTERED (RttMeanDeviation); TypeId RttMeanDeviation::GetTypeId (void) diff --git a/src/internet/model/tcp-header.cc b/src/internet/model/tcp-header.cc index 19ae994d3..cedc7bc62 100644 --- a/src/internet/model/tcp-header.cc +++ b/src/internet/model/tcp-header.cc @@ -26,8 +26,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (TcpHeader); TcpHeader::TcpHeader () : m_sourcePort (0), diff --git a/src/internet/model/tcp-l4-protocol.cc b/src/internet/model/tcp-l4-protocol.cc index 3f8db5eb2..c064fa35e 100644 --- a/src/internet/model/tcp-l4-protocol.cc +++ b/src/internet/model/tcp-l4-protocol.cc @@ -51,8 +51,7 @@ NS_LOG_COMPONENT_DEFINE ("TcpL4Protocol"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpL4Protocol) - ; +NS_OBJECT_ENSURE_REGISTERED (TcpL4Protocol); //TcpL4Protocol stuff---------------------------------------------------------- diff --git a/src/internet/model/tcp-newreno.cc b/src/internet/model/tcp-newreno.cc index 417622d6c..417862718 100644 --- a/src/internet/model/tcp-newreno.cc +++ b/src/internet/model/tcp-newreno.cc @@ -32,8 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("TcpNewReno"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpNewReno) - ; +NS_OBJECT_ENSURE_REGISTERED (TcpNewReno); TypeId TcpNewReno::GetTypeId (void) diff --git a/src/internet/model/tcp-reno.cc b/src/internet/model/tcp-reno.cc index 4c577a7af..a8e03a6d7 100644 --- a/src/internet/model/tcp-reno.cc +++ b/src/internet/model/tcp-reno.cc @@ -32,8 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("TcpReno"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpReno) - ; +NS_OBJECT_ENSURE_REGISTERED (TcpReno); TypeId TcpReno::GetTypeId (void) diff --git a/src/internet/model/tcp-rfc793.cc b/src/internet/model/tcp-rfc793.cc index a7125e20e..0ff780e12 100644 --- a/src/internet/model/tcp-rfc793.cc +++ b/src/internet/model/tcp-rfc793.cc @@ -25,8 +25,7 @@ NS_LOG_COMPONENT_DEFINE ("TcpRfc793"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpRfc793) - ; +NS_OBJECT_ENSURE_REGISTERED (TcpRfc793); TypeId TcpRfc793::GetTypeId (void) diff --git a/src/internet/model/tcp-socket-base.cc b/src/internet/model/tcp-socket-base.cc index 131eea69d..23dbff6b2 100644 --- a/src/internet/model/tcp-socket-base.cc +++ b/src/internet/model/tcp-socket-base.cc @@ -54,8 +54,7 @@ NS_LOG_COMPONENT_DEFINE ("TcpSocketBase"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpSocketBase) - ; +NS_OBJECT_ENSURE_REGISTERED (TcpSocketBase); TypeId TcpSocketBase::GetTypeId (void) diff --git a/src/internet/model/tcp-socket-factory.cc b/src/internet/model/tcp-socket-factory.cc index db35e8b78..ca1ae25b8 100644 --- a/src/internet/model/tcp-socket-factory.cc +++ b/src/internet/model/tcp-socket-factory.cc @@ -23,8 +23,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpSocketFactory) - ; +NS_OBJECT_ENSURE_REGISTERED (TcpSocketFactory); TypeId TcpSocketFactory::GetTypeId (void) diff --git a/src/internet/model/tcp-socket.cc b/src/internet/model/tcp-socket.cc index e230d7ca0..2963ffc9b 100644 --- a/src/internet/model/tcp-socket.cc +++ b/src/internet/model/tcp-socket.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("TcpSocket"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpSocket) - ; +NS_OBJECT_ENSURE_REGISTERED (TcpSocket); const char* const TcpSocket::TcpStateName[LAST_STATE] = { "CLOSED", "LISTEN", "SYN_SENT", "SYN_RCVD", "ESTABLISHED", "CLOSE_WAIT", "LAST_ACK", "FIN_WAIT_1", "FIN_WAIT_2", "CLOSING", "TIME_WAIT" }; diff --git a/src/internet/model/tcp-tahoe.cc b/src/internet/model/tcp-tahoe.cc index 93e92aa83..fb27c802e 100644 --- a/src/internet/model/tcp-tahoe.cc +++ b/src/internet/model/tcp-tahoe.cc @@ -32,8 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("TcpTahoe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpTahoe) - ; +NS_OBJECT_ENSURE_REGISTERED (TcpTahoe); TypeId TcpTahoe::GetTypeId (void) diff --git a/src/internet/model/tcp-westwood.cc b/src/internet/model/tcp-westwood.cc index 6eef513a8..70a0a92b7 100644 --- a/src/internet/model/tcp-westwood.cc +++ b/src/internet/model/tcp-westwood.cc @@ -46,8 +46,7 @@ NS_LOG_COMPONENT_DEFINE("TcpWestwood"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED(TcpWestwood) - ; +NS_OBJECT_ENSURE_REGISTERED(TcpWestwood); TypeId TcpWestwood::GetTypeId (void) diff --git a/src/internet/model/udp-header.cc b/src/internet/model/udp-header.cc index 17b6b6486..99c9f5280 100644 --- a/src/internet/model/udp-header.cc +++ b/src/internet/model/udp-header.cc @@ -23,8 +23,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UdpHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (UdpHeader); /* The magic values below are used only for debugging. * They can be used to easily detect memory corruption diff --git a/src/internet/model/udp-l4-protocol.cc b/src/internet/model/udp-l4-protocol.cc index 39d66f784..ad126a6ea 100644 --- a/src/internet/model/udp-l4-protocol.cc +++ b/src/internet/model/udp-l4-protocol.cc @@ -44,8 +44,7 @@ NS_LOG_COMPONENT_DEFINE ("UdpL4Protocol"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UdpL4Protocol) - ; +NS_OBJECT_ENSURE_REGISTERED (UdpL4Protocol); /* see http://www.iana.org/assignments/protocol-numbers */ const uint8_t UdpL4Protocol::PROT_NUMBER = 17; diff --git a/src/internet/model/udp-socket-factory.cc b/src/internet/model/udp-socket-factory.cc index 59cbe7451..1d00324d9 100644 --- a/src/internet/model/udp-socket-factory.cc +++ b/src/internet/model/udp-socket-factory.cc @@ -22,8 +22,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UdpSocketFactory) - ; +NS_OBJECT_ENSURE_REGISTERED (UdpSocketFactory); TypeId UdpSocketFactory::GetTypeId (void) { diff --git a/src/internet/model/udp-socket-impl.cc b/src/internet/model/udp-socket-impl.cc index 14eb7efb0..defde0ec2 100644 --- a/src/internet/model/udp-socket-impl.cc +++ b/src/internet/model/udp-socket-impl.cc @@ -43,8 +43,7 @@ NS_LOG_COMPONENT_DEFINE ("UdpSocketImpl"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UdpSocketImpl) - ; +NS_OBJECT_ENSURE_REGISTERED (UdpSocketImpl); // The correct maximum UDP message size is 65507, as determined by the following formula: // 0xffff - (sizeof(IP Header) + sizeof(UDP Header)) = 65535-(20+8) = 65507 diff --git a/src/internet/model/udp-socket.cc b/src/internet/model/udp-socket.cc index e593e1b7b..a544151b9 100644 --- a/src/internet/model/udp-socket.cc +++ b/src/internet/model/udp-socket.cc @@ -30,8 +30,7 @@ NS_LOG_COMPONENT_DEFINE ("UdpSocket"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UdpSocket) - ; +NS_OBJECT_ENSURE_REGISTERED (UdpSocket); TypeId UdpSocket::GetTypeId (void) diff --git a/src/internet/test/error-channel.cc b/src/internet/test/error-channel.cc index e4227a45f..562160ad1 100644 --- a/src/internet/test/error-channel.cc +++ b/src/internet/test/error-channel.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("ErrorChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ErrorChannel) - ; +NS_OBJECT_ENSURE_REGISTERED (ErrorChannel); TypeId ErrorChannel::GetTypeId (void) @@ -105,8 +104,7 @@ ErrorChannel::GetDevice (uint32_t i) const return m_devices[i]; } -NS_OBJECT_ENSURE_REGISTERED (BinaryErrorModel) - ; +NS_OBJECT_ENSURE_REGISTERED (BinaryErrorModel); TypeId BinaryErrorModel::GetTypeId (void) { diff --git a/src/lte/helper/epc-helper.cc b/src/lte/helper/epc-helper.cc index d9569a35e..f4b0d96ab 100644 --- a/src/lte/helper/epc-helper.cc +++ b/src/lte/helper/epc-helper.cc @@ -27,11 +27,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("EpcHelper") - ; +NS_LOG_COMPONENT_DEFINE ("EpcHelper"); -NS_OBJECT_ENSURE_REGISTERED (EpcHelper) - ; +NS_OBJECT_ENSURE_REGISTERED (EpcHelper); EpcHelper::EpcHelper () diff --git a/src/lte/helper/lte-global-pathloss-database.cc b/src/lte/helper/lte-global-pathloss-database.cc index 479ffd6fe..e6b77bae0 100644 --- a/src/lte/helper/lte-global-pathloss-database.cc +++ b/src/lte/helper/lte-global-pathloss-database.cc @@ -28,8 +28,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("LteGlobalPathlossDatabase") - ; +NS_LOG_COMPONENT_DEFINE ("LteGlobalPathlossDatabase"); LteGlobalPathlossDatabase::~LteGlobalPathlossDatabase (void) diff --git a/src/lte/helper/lte-helper.cc b/src/lte/helper/lte-helper.cc index f5c1c0de3..744f71ca2 100644 --- a/src/lte/helper/lte-helper.cc +++ b/src/lte/helper/lte-helper.cc @@ -65,8 +65,7 @@ NS_LOG_COMPONENT_DEFINE ("LteHelper"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteHelper) - ; +NS_OBJECT_ENSURE_REGISTERED (LteHelper); LteHelper::LteHelper (void) : m_fadingStreamsAssigned (false), diff --git a/src/lte/helper/lte-hex-grid-enb-topology-helper.cc b/src/lte/helper/lte-hex-grid-enb-topology-helper.cc index 785e37698..41788b5ba 100644 --- a/src/lte/helper/lte-hex-grid-enb-topology-helper.cc +++ b/src/lte/helper/lte-hex-grid-enb-topology-helper.cc @@ -32,8 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("LteHexGridEnbTopologyHelper"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteHexGridEnbTopologyHelper) - ; +NS_OBJECT_ENSURE_REGISTERED (LteHexGridEnbTopologyHelper); LteHexGridEnbTopologyHelper::LteHexGridEnbTopologyHelper () { diff --git a/src/lte/helper/lte-stats-calculator.cc b/src/lte/helper/lte-stats-calculator.cc index 9bb4b7776..3a4e48c52 100644 --- a/src/lte/helper/lte-stats-calculator.cc +++ b/src/lte/helper/lte-stats-calculator.cc @@ -29,8 +29,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("LteStatsCalculator") - ; +NS_LOG_COMPONENT_DEFINE ("LteStatsCalculator"); LteStatsCalculator::LteStatsCalculator () : m_dlOutputFilename (""), diff --git a/src/lte/helper/mac-stats-calculator.cc b/src/lte/helper/mac-stats-calculator.cc index 75a60e64e..46d6357e6 100644 --- a/src/lte/helper/mac-stats-calculator.cc +++ b/src/lte/helper/mac-stats-calculator.cc @@ -25,11 +25,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("MacStatsCalculator") - ; +NS_LOG_COMPONENT_DEFINE ("MacStatsCalculator"); -NS_OBJECT_ENSURE_REGISTERED (MacStatsCalculator) - ; +NS_OBJECT_ENSURE_REGISTERED (MacStatsCalculator); MacStatsCalculator::MacStatsCalculator () : m_dlFirstWrite (true), diff --git a/src/lte/helper/phy-rx-stats-calculator.cc b/src/lte/helper/phy-rx-stats-calculator.cc index 49e9449da..908b7b5ab 100644 --- a/src/lte/helper/phy-rx-stats-calculator.cc +++ b/src/lte/helper/phy-rx-stats-calculator.cc @@ -27,11 +27,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("PhyRxStatsCalculator") - ; +NS_LOG_COMPONENT_DEFINE ("PhyRxStatsCalculator"); -NS_OBJECT_ENSURE_REGISTERED (PhyRxStatsCalculator) - ; +NS_OBJECT_ENSURE_REGISTERED (PhyRxStatsCalculator); PhyRxStatsCalculator::PhyRxStatsCalculator () : m_dlRxFirstWrite (true), diff --git a/src/lte/helper/phy-stats-calculator.cc b/src/lte/helper/phy-stats-calculator.cc index 4176a168b..15fdf32a6 100644 --- a/src/lte/helper/phy-stats-calculator.cc +++ b/src/lte/helper/phy-stats-calculator.cc @@ -25,11 +25,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("PhyStatsCalculator") - ; +NS_LOG_COMPONENT_DEFINE ("PhyStatsCalculator"); -NS_OBJECT_ENSURE_REGISTERED (PhyStatsCalculator) - ; +NS_OBJECT_ENSURE_REGISTERED (PhyStatsCalculator); PhyStatsCalculator::PhyStatsCalculator () : m_RsrpSinrFirstWrite (true), diff --git a/src/lte/helper/phy-tx-stats-calculator.cc b/src/lte/helper/phy-tx-stats-calculator.cc index ecf885529..4c7c43c8c 100644 --- a/src/lte/helper/phy-tx-stats-calculator.cc +++ b/src/lte/helper/phy-tx-stats-calculator.cc @@ -27,11 +27,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("PhyTxStatsCalculator") - ; +NS_LOG_COMPONENT_DEFINE ("PhyTxStatsCalculator"); -NS_OBJECT_ENSURE_REGISTERED (PhyTxStatsCalculator) - ; +NS_OBJECT_ENSURE_REGISTERED (PhyTxStatsCalculator); PhyTxStatsCalculator::PhyTxStatsCalculator () : m_dlTxFirstWrite (true), diff --git a/src/lte/helper/point-to-point-epc-helper.cc b/src/lte/helper/point-to-point-epc-helper.cc index 77ebf5e6b..7933bf526 100644 --- a/src/lte/helper/point-to-point-epc-helper.cc +++ b/src/lte/helper/point-to-point-epc-helper.cc @@ -42,11 +42,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("PointToPointEpcHelper") - ; +NS_LOG_COMPONENT_DEFINE ("PointToPointEpcHelper"); -NS_OBJECT_ENSURE_REGISTERED (PointToPointEpcHelper) - ; +NS_OBJECT_ENSURE_REGISTERED (PointToPointEpcHelper); PointToPointEpcHelper::PointToPointEpcHelper () diff --git a/src/lte/helper/radio-bearer-stats-calculator.cc b/src/lte/helper/radio-bearer-stats-calculator.cc index bff62caa0..bb536bd6b 100644 --- a/src/lte/helper/radio-bearer-stats-calculator.cc +++ b/src/lte/helper/radio-bearer-stats-calculator.cc @@ -29,11 +29,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("RadioBearerStatsCalculator") - ; +NS_LOG_COMPONENT_DEFINE ("RadioBearerStatsCalculator"); -NS_OBJECT_ENSURE_REGISTERED ( RadioBearerStatsCalculator) - ; +NS_OBJECT_ENSURE_REGISTERED ( RadioBearerStatsCalculator); RadioBearerStatsCalculator::RadioBearerStatsCalculator () : m_firstWrite (true), diff --git a/src/lte/helper/radio-environment-map-helper.cc b/src/lte/helper/radio-environment-map-helper.cc index 8eb4611c1..3a691c9bf 100644 --- a/src/lte/helper/radio-environment-map-helper.cc +++ b/src/lte/helper/radio-environment-map-helper.cc @@ -46,8 +46,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RadioEnvironmentMapHelper) - ; +NS_OBJECT_ENSURE_REGISTERED (RadioEnvironmentMapHelper); RadioEnvironmentMapHelper::RadioEnvironmentMapHelper () { diff --git a/src/lte/model/a2-a4-rsrq-handover-algorithm.cc b/src/lte/model/a2-a4-rsrq-handover-algorithm.cc index 7d2494732..b6b3455af 100644 --- a/src/lte/model/a2-a4-rsrq-handover-algorithm.cc +++ b/src/lte/model/a2-a4-rsrq-handover-algorithm.cc @@ -34,8 +34,7 @@ NS_LOG_COMPONENT_DEFINE ("A2A4RsrqHandoverAlgorithm"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (A2A4RsrqHandoverAlgorithm) - ; +NS_OBJECT_ENSURE_REGISTERED (A2A4RsrqHandoverAlgorithm); /////////////////////////////////////////// diff --git a/src/lte/model/a3-rsrp-handover-algorithm.cc b/src/lte/model/a3-rsrp-handover-algorithm.cc index 1da66a368..6c81fc855 100644 --- a/src/lte/model/a3-rsrp-handover-algorithm.cc +++ b/src/lte/model/a3-rsrp-handover-algorithm.cc @@ -29,8 +29,7 @@ NS_LOG_COMPONENT_DEFINE ("A3RsrpHandoverAlgorithm"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (A3RsrpHandoverAlgorithm) - ; +NS_OBJECT_ENSURE_REGISTERED (A3RsrpHandoverAlgorithm); A3RsrpHandoverAlgorithm::A3RsrpHandoverAlgorithm () diff --git a/src/lte/model/epc-enb-application.cc b/src/lte/model/epc-enb-application.cc index 96c7c6d14..cf3efc1ac 100644 --- a/src/lte/model/epc-enb-application.cc +++ b/src/lte/model/epc-enb-application.cc @@ -33,8 +33,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("EpcEnbApplication") - ; +NS_LOG_COMPONENT_DEFINE ("EpcEnbApplication"); EpcEnbApplication::EpsFlowId_t::EpsFlowId_t () diff --git a/src/lte/model/epc-gtpu-header.cc b/src/lte/model/epc-gtpu-header.cc index e4cd29f90..5f8e496bf 100644 --- a/src/lte/model/epc-gtpu-header.cc +++ b/src/lte/model/epc-gtpu-header.cc @@ -30,8 +30,7 @@ namespace ns3 { * GTP-U-v1 Header ********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (GtpuHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (GtpuHeader); TypeId GtpuHeader::GetTypeId (void) diff --git a/src/lte/model/epc-mme.cc b/src/lte/model/epc-mme.cc index 223f6904a..e6da9f4b4 100644 --- a/src/lte/model/epc-mme.cc +++ b/src/lte/model/epc-mme.cc @@ -33,8 +33,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (EpcMme) - ; +NS_OBJECT_ENSURE_REGISTERED (EpcMme); EpcMme::EpcMme () : m_s11SapSgw (0) diff --git a/src/lte/model/epc-sgw-pgw-application.cc b/src/lte/model/epc-sgw-pgw-application.cc index 3bcb611c6..75cdfde8f 100644 --- a/src/lte/model/epc-sgw-pgw-application.cc +++ b/src/lte/model/epc-sgw-pgw-application.cc @@ -30,8 +30,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("EpcSgwPgwApplication") - ; +NS_LOG_COMPONENT_DEFINE ("EpcSgwPgwApplication"); ///////////////////////// diff --git a/src/lte/model/epc-tft.cc b/src/lte/model/epc-tft.cc index 337e4d760..bc6ff37a4 100644 --- a/src/lte/model/epc-tft.cc +++ b/src/lte/model/epc-tft.cc @@ -28,8 +28,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("EpcTft") - ; +NS_LOG_COMPONENT_DEFINE ("EpcTft"); std::ostream& operator<< (std::ostream& os, EpcTft::Direction& d) { diff --git a/src/lte/model/epc-ue-nas.cc b/src/lte/model/epc-ue-nas.cc index b832c9906..1828fd5c8 100644 --- a/src/lte/model/epc-ue-nas.cc +++ b/src/lte/model/epc-ue-nas.cc @@ -52,8 +52,7 @@ std::string ToString (EpcUeNas::State s) -NS_OBJECT_ENSURE_REGISTERED (EpcUeNas) - ; +NS_OBJECT_ENSURE_REGISTERED (EpcUeNas); EpcUeNas::EpcUeNas () : m_state (OFF), diff --git a/src/lte/model/epc-x2-header.cc b/src/lte/model/epc-x2-header.cc index ef3861349..5a4b60820 100644 --- a/src/lte/model/epc-x2-header.cc +++ b/src/lte/model/epc-x2-header.cc @@ -27,8 +27,7 @@ NS_LOG_COMPONENT_DEFINE ("EpcX2Header"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (EpcX2Header) - ; +NS_OBJECT_ENSURE_REGISTERED (EpcX2Header); EpcX2Header::EpcX2Header () : m_messageType (0xfa), @@ -146,8 +145,7 @@ EpcX2Header::SetNumberOfIes (uint32_t numberOfIes) ///////////////////////////////////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestHeader); EpcX2HandoverRequestHeader::EpcX2HandoverRequestHeader () : m_numberOfIes (1 + 1 + 1 + 1), @@ -435,8 +433,7 @@ EpcX2HandoverRequestHeader::GetNumberOfIes () const ///////////////////////////////////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestAckHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestAckHeader); EpcX2HandoverRequestAckHeader::EpcX2HandoverRequestAckHeader () : m_numberOfIes (1 + 1 + 1 + 1), @@ -661,8 +658,7 @@ EpcX2HandoverRequestAckHeader::GetNumberOfIes () const ///////////////////////////////////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverPreparationFailureHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverPreparationFailureHeader); EpcX2HandoverPreparationFailureHeader::EpcX2HandoverPreparationFailureHeader () : m_numberOfIes (1 + 1 + 1), @@ -787,8 +783,7 @@ EpcX2HandoverPreparationFailureHeader::GetNumberOfIes () const ///////////////////////////////////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2SnStatusTransferHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (EpcX2SnStatusTransferHeader); EpcX2SnStatusTransferHeader::EpcX2SnStatusTransferHeader () : m_numberOfIes (3), @@ -980,8 +975,7 @@ EpcX2SnStatusTransferHeader::GetNumberOfIes () const ///////////////////////////////////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2UeContextReleaseHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (EpcX2UeContextReleaseHeader); EpcX2UeContextReleaseHeader::EpcX2UeContextReleaseHeader () : m_numberOfIes (1 + 1), @@ -1088,8 +1082,7 @@ EpcX2UeContextReleaseHeader::GetNumberOfIes () const ///////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2LoadInformationHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (EpcX2LoadInformationHeader); EpcX2LoadInformationHeader::EpcX2LoadInformationHeader () : m_numberOfIes (1), @@ -1313,8 +1306,7 @@ EpcX2LoadInformationHeader::GetNumberOfIes () const //////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2ResourceStatusUpdateHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (EpcX2ResourceStatusUpdateHeader); EpcX2ResourceStatusUpdateHeader::EpcX2ResourceStatusUpdateHeader () : m_numberOfIes (3), diff --git a/src/lte/model/epc-x2.cc b/src/lte/model/epc-x2.cc index 3fbb8e959..1790d9de8 100644 --- a/src/lte/model/epc-x2.cc +++ b/src/lte/model/epc-x2.cc @@ -80,8 +80,7 @@ X2CellInfo::operator= (const X2CellInfo& value) /////////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2) - ; +NS_OBJECT_ENSURE_REGISTERED (EpcX2); EpcX2::EpcX2 () : m_x2cUdpPort (4444), diff --git a/src/lte/model/eps-bearer-tag.cc b/src/lte/model/eps-bearer-tag.cc index 03f168aab..84ecd38ce 100644 --- a/src/lte/model/eps-bearer-tag.cc +++ b/src/lte/model/eps-bearer-tag.cc @@ -26,8 +26,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (EpsBearerTag) - ; +NS_OBJECT_ENSURE_REGISTERED (EpsBearerTag); TypeId EpsBearerTag::GetTypeId (void) diff --git a/src/lte/model/fdbet-ff-mac-scheduler.cc b/src/lte/model/fdbet-ff-mac-scheduler.cc index 14f087356..75a57526d 100644 --- a/src/lte/model/fdbet-ff-mac-scheduler.cc +++ b/src/lte/model/fdbet-ff-mac-scheduler.cc @@ -43,8 +43,7 @@ int FdBetType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (FdBetFfMacScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (FdBetFfMacScheduler); diff --git a/src/lte/model/fdmt-ff-mac-scheduler.cc b/src/lte/model/fdmt-ff-mac-scheduler.cc index 4e1259319..3e921d33a 100644 --- a/src/lte/model/fdmt-ff-mac-scheduler.cc +++ b/src/lte/model/fdmt-ff-mac-scheduler.cc @@ -43,8 +43,7 @@ int FdMtType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (FdMtFfMacScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (FdMtFfMacScheduler); diff --git a/src/lte/model/fdtbfq-ff-mac-scheduler.cc b/src/lte/model/fdtbfq-ff-mac-scheduler.cc index f80eade5e..fd80715ac 100644 --- a/src/lte/model/fdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/fdtbfq-ff-mac-scheduler.cc @@ -44,8 +44,7 @@ int FdTbfqType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (FdTbfqFfMacScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (FdTbfqFfMacScheduler); diff --git a/src/lte/model/ff-mac-scheduler.cc b/src/lte/model/ff-mac-scheduler.cc index e3f0c6d21..d03988772 100644 --- a/src/lte/model/ff-mac-scheduler.cc +++ b/src/lte/model/ff-mac-scheduler.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("FfMacScheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (FfMacScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (FfMacScheduler); FfMacScheduler::FfMacScheduler () diff --git a/src/lte/model/lte-amc.cc b/src/lte/model/lte-amc.cc index 21eae6286..e1ac950b8 100644 --- a/src/lte/model/lte-amc.cc +++ b/src/lte/model/lte-amc.cc @@ -36,8 +36,7 @@ NS_LOG_COMPONENT_DEFINE ("LteAmc"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteAmc) - ; +NS_OBJECT_ENSURE_REGISTERED (LteAmc); // from 3GPP R1-081483 "Conveying MCS and TB size via PDCCH" // file TBS_support.xls diff --git a/src/lte/model/lte-anr.cc b/src/lte/model/lte-anr.cc index d1c823f59..a7ae940cf 100644 --- a/src/lte/model/lte-anr.cc +++ b/src/lte/model/lte-anr.cc @@ -33,8 +33,7 @@ NS_LOG_COMPONENT_DEFINE ("LteAnr"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteAnr) - ; +NS_OBJECT_ENSURE_REGISTERED (LteAnr); LteAnr::LteAnr (uint16_t servingCellId) diff --git a/src/lte/model/lte-asn1-header.cc b/src/lte/model/lte-asn1-header.cc index a2c3c0e05..1b6eafc21 100644 --- a/src/lte/model/lte-asn1-header.cc +++ b/src/lte/model/lte-asn1-header.cc @@ -29,8 +29,7 @@ NS_LOG_COMPONENT_DEFINE ("Asn1Header"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Asn1Header) - ; +NS_OBJECT_ENSURE_REGISTERED (Asn1Header); TypeId Asn1Header::GetTypeId (void) diff --git a/src/lte/model/lte-enb-mac.cc b/src/lte/model/lte-enb-mac.cc index f4f2235df..4529df243 100644 --- a/src/lte/model/lte-enb-mac.cc +++ b/src/lte/model/lte-enb-mac.cc @@ -43,8 +43,7 @@ NS_LOG_COMPONENT_DEFINE ("LteEnbMac"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteEnbMac) - ; +NS_OBJECT_ENSURE_REGISTERED (LteEnbMac); diff --git a/src/lte/model/lte-enb-net-device.cc b/src/lte/model/lte-enb-net-device.cc index 9392f5085..944b99b51 100644 --- a/src/lte/model/lte-enb-net-device.cc +++ b/src/lte/model/lte-enb-net-device.cc @@ -48,8 +48,7 @@ NS_LOG_COMPONENT_DEFINE ("LteEnbNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED ( LteEnbNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED ( LteEnbNetDevice); TypeId LteEnbNetDevice::GetTypeId (void) { diff --git a/src/lte/model/lte-enb-phy.cc b/src/lte/model/lte-enb-phy.cc index cc20ba6b6..4c67a716e 100644 --- a/src/lte/model/lte-enb-phy.cc +++ b/src/lte/model/lte-enb-phy.cc @@ -49,8 +49,7 @@ NS_LOG_COMPONENT_DEFINE ("LteEnbPhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteEnbPhy) - ; +NS_OBJECT_ENSURE_REGISTERED (LteEnbPhy); // duration of the data part of a subframe in DL // = 0.001 / 14 * 11 (fixed to 11 symbols) -1ns as margin to avoid overlapping simulator events diff --git a/src/lte/model/lte-enb-rrc.cc b/src/lte/model/lte-enb-rrc.cc index 6358dc3c0..e111199be 100644 --- a/src/lte/model/lte-enb-rrc.cc +++ b/src/lte/model/lte-enb-rrc.cc @@ -120,8 +120,7 @@ std::string ToString (UeManager::State s) } -NS_OBJECT_ENSURE_REGISTERED (UeManager) - ; +NS_OBJECT_ENSURE_REGISTERED (UeManager); UeManager::UeManager () @@ -1220,8 +1219,7 @@ UeManager::SwitchToState (State newState) // eNB RRC methods /////////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (LteEnbRrc) - ; +NS_OBJECT_ENSURE_REGISTERED (LteEnbRrc); LteEnbRrc::LteEnbRrc () : m_x2SapProvider (0), diff --git a/src/lte/model/lte-handover-algorithm.cc b/src/lte/model/lte-handover-algorithm.cc index fe2c8774c..6e0224a37 100644 --- a/src/lte/model/lte-handover-algorithm.cc +++ b/src/lte/model/lte-handover-algorithm.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("LteHandoverAlgorithm"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteHandoverAlgorithm) - ; +NS_OBJECT_ENSURE_REGISTERED (LteHandoverAlgorithm); LteHandoverAlgorithm::LteHandoverAlgorithm () diff --git a/src/lte/model/lte-net-device.cc b/src/lte/model/lte-net-device.cc index b6a6261b4..095a34b69 100644 --- a/src/lte/model/lte-net-device.cc +++ b/src/lte/model/lte-net-device.cc @@ -40,8 +40,7 @@ NS_LOG_COMPONENT_DEFINE ("LteNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED ( LteNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED ( LteNetDevice); //////////////////////////////// // LteNetDevice diff --git a/src/lte/model/lte-pdcp-header.cc b/src/lte/model/lte-pdcp-header.cc index 43922c99e..f8e3190e2 100644 --- a/src/lte/model/lte-pdcp-header.cc +++ b/src/lte/model/lte-pdcp-header.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("LtePdcpHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LtePdcpHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (LtePdcpHeader); LtePdcpHeader::LtePdcpHeader () : m_dcBit (0xff), diff --git a/src/lte/model/lte-pdcp-tag.cc b/src/lte/model/lte-pdcp-tag.cc index 10f170b23..2182872d4 100644 --- a/src/lte/model/lte-pdcp-tag.cc +++ b/src/lte/model/lte-pdcp-tag.cc @@ -25,8 +25,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PdcpTag) - ; +NS_OBJECT_ENSURE_REGISTERED (PdcpTag); PdcpTag::PdcpTag () : m_senderTimestamp (Seconds (0)) diff --git a/src/lte/model/lte-pdcp.cc b/src/lte/model/lte-pdcp.cc index b391bef0e..7087d9968 100644 --- a/src/lte/model/lte-pdcp.cc +++ b/src/lte/model/lte-pdcp.cc @@ -61,8 +61,7 @@ LtePdcpSpecificLteRlcSapUser::ReceivePdcpPdu (Ptr p) /////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (LtePdcp) - ; +NS_OBJECT_ENSURE_REGISTERED (LtePdcp); LtePdcp::LtePdcp () : m_pdcpSapUser (0), diff --git a/src/lte/model/lte-phy-tag.cc b/src/lte/model/lte-phy-tag.cc index d72d63b76..0ec581f62 100644 --- a/src/lte/model/lte-phy-tag.cc +++ b/src/lte/model/lte-phy-tag.cc @@ -26,8 +26,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LtePhyTag) - ; +NS_OBJECT_ENSURE_REGISTERED (LtePhyTag); TypeId LtePhyTag::GetTypeId (void) diff --git a/src/lte/model/lte-phy.cc b/src/lte/model/lte-phy.cc index 9c2e9b950..10fb5be2c 100644 --- a/src/lte/model/lte-phy.cc +++ b/src/lte/model/lte-phy.cc @@ -33,8 +33,7 @@ NS_LOG_COMPONENT_DEFINE ("LtePhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LtePhy) - ; +NS_OBJECT_ENSURE_REGISTERED (LtePhy); LtePhy::LtePhy () diff --git a/src/lte/model/lte-radio-bearer-info.cc b/src/lte/model/lte-radio-bearer-info.cc index db91dfe50..dd7f08d0b 100644 --- a/src/lte/model/lte-radio-bearer-info.cc +++ b/src/lte/model/lte-radio-bearer-info.cc @@ -29,8 +29,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerInfo) - ; +NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerInfo); LteRadioBearerInfo::LteRadioBearerInfo (void) { diff --git a/src/lte/model/lte-radio-bearer-tag.cc b/src/lte/model/lte-radio-bearer-tag.cc index 6cf314185..9d8905f64 100644 --- a/src/lte/model/lte-radio-bearer-tag.cc +++ b/src/lte/model/lte-radio-bearer-tag.cc @@ -25,8 +25,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerTag) - ; +NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerTag); TypeId LteRadioBearerTag::GetTypeId (void) diff --git a/src/lte/model/lte-rlc-am-header.cc b/src/lte/model/lte-rlc-am-header.cc index d61033b1c..e382a3f8a 100644 --- a/src/lte/model/lte-rlc-am-header.cc +++ b/src/lte/model/lte-rlc-am-header.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("LteRlcAmHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRlcAmHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (LteRlcAmHeader); LteRlcAmHeader::LteRlcAmHeader () : m_headerLength (0), diff --git a/src/lte/model/lte-rlc-am.cc b/src/lte/model/lte-rlc-am.cc index 1ee1ad512..5d05e49ae 100644 --- a/src/lte/model/lte-rlc-am.cc +++ b/src/lte/model/lte-rlc-am.cc @@ -30,8 +30,7 @@ NS_LOG_COMPONENT_DEFINE ("LteRlcAm"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRlcAm) - ; +NS_OBJECT_ENSURE_REGISTERED (LteRlcAm); LteRlcAm::LteRlcAm () { diff --git a/src/lte/model/lte-rlc-header.cc b/src/lte/model/lte-rlc-header.cc index 5d5ca00ea..d34729c5a 100644 --- a/src/lte/model/lte-rlc-header.cc +++ b/src/lte/model/lte-rlc-header.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("LteRlcHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRlcHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (LteRlcHeader); LteRlcHeader::LteRlcHeader () : m_headerLength (0), diff --git a/src/lte/model/lte-rlc-sdu-status-tag.cc b/src/lte/model/lte-rlc-sdu-status-tag.cc index 85aa2db06..930d44469 100644 --- a/src/lte/model/lte-rlc-sdu-status-tag.cc +++ b/src/lte/model/lte-rlc-sdu-status-tag.cc @@ -22,8 +22,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRlcSduStatusTag) - ; +NS_OBJECT_ENSURE_REGISTERED (LteRlcSduStatusTag); LteRlcSduStatusTag::LteRlcSduStatusTag () { diff --git a/src/lte/model/lte-rlc-tag.cc b/src/lte/model/lte-rlc-tag.cc index f917b579d..bc8084ff4 100644 --- a/src/lte/model/lte-rlc-tag.cc +++ b/src/lte/model/lte-rlc-tag.cc @@ -24,8 +24,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RlcTag) - ; +NS_OBJECT_ENSURE_REGISTERED (RlcTag); RlcTag::RlcTag () : m_senderTimestamp (Seconds (0)) diff --git a/src/lte/model/lte-rlc-tm.cc b/src/lte/model/lte-rlc-tm.cc index 6a2eea0ea..c8eb6ac28 100644 --- a/src/lte/model/lte-rlc-tm.cc +++ b/src/lte/model/lte-rlc-tm.cc @@ -29,8 +29,7 @@ NS_LOG_COMPONENT_DEFINE ("LteRlcTm"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRlcTm) - ; +NS_OBJECT_ENSURE_REGISTERED (LteRlcTm); LteRlcTm::LteRlcTm () : m_maxTxBufferSize (0), diff --git a/src/lte/model/lte-rlc-um.cc b/src/lte/model/lte-rlc-um.cc index f57b95e03..97adde8de 100644 --- a/src/lte/model/lte-rlc-um.cc +++ b/src/lte/model/lte-rlc-um.cc @@ -30,8 +30,7 @@ NS_LOG_COMPONENT_DEFINE ("LteRlcUm"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRlcUm) - ; +NS_OBJECT_ENSURE_REGISTERED (LteRlcUm); LteRlcUm::LteRlcUm () : m_maxTxBufferSize (10 * 1024), diff --git a/src/lte/model/lte-rlc.cc b/src/lte/model/lte-rlc.cc index d7e9e1a85..e87180f41 100644 --- a/src/lte/model/lte-rlc.cc +++ b/src/lte/model/lte-rlc.cc @@ -81,8 +81,7 @@ LteRlcSpecificLteMacSapUser::ReceivePdu (Ptr p) /////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (LteRlc) - ; +NS_OBJECT_ENSURE_REGISTERED (LteRlc); LteRlc::LteRlc () : m_rlcSapUser (0), @@ -168,8 +167,7 @@ LteRlc::GetLteMacSapUser () //////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (LteRlcSm) - ; +NS_OBJECT_ENSURE_REGISTERED (LteRlcSm); LteRlcSm::LteRlcSm () { diff --git a/src/lte/model/lte-rrc-protocol-ideal.cc b/src/lte/model/lte-rrc-protocol-ideal.cc index 9b790b655..f74cd2eaa 100644 --- a/src/lte/model/lte-rrc-protocol-ideal.cc +++ b/src/lte/model/lte-rrc-protocol-ideal.cc @@ -39,8 +39,7 @@ namespace ns3 { const Time RRC_IDEAL_MSG_DELAY = MilliSeconds (0); -NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolIdeal) - ; +NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolIdeal); LteUeRrcProtocolIdeal::LteUeRrcProtocolIdeal () : m_ueRrcSapProvider (0), @@ -207,8 +206,7 @@ LteUeRrcProtocolIdeal::SetEnbRrcSapProvider () } -NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolIdeal) - ; +NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolIdeal); LteEnbRrcProtocolIdeal::LteEnbRrcProtocolIdeal () : m_enbRrcSapProvider (0) diff --git a/src/lte/model/lte-rrc-protocol-real.cc b/src/lte/model/lte-rrc-protocol-real.cc index 13c9674e9..f623984d9 100644 --- a/src/lte/model/lte-rrc-protocol-real.cc +++ b/src/lte/model/lte-rrc-protocol-real.cc @@ -40,8 +40,7 @@ namespace ns3 { const Time RRC_REAL_MSG_DELAY = MilliSeconds (0); -NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolReal) - ; +NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolReal); LteUeRrcProtocolReal::LteUeRrcProtocolReal () : m_ueRrcSapProvider (0), @@ -351,8 +350,7 @@ LteUeRrcProtocolReal::DoReceivePdcpSdu (LtePdcpSapUser::ReceivePdcpSduParameters } } -NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolReal) - ; +NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolReal); LteEnbRrcProtocolReal::LteEnbRrcProtocolReal () : m_enbRrcSapProvider (0) diff --git a/src/lte/model/lte-spectrum-phy.cc b/src/lte/model/lte-spectrum-phy.cc index 11e023f68..ffe119dac 100644 --- a/src/lte/model/lte-spectrum-phy.cc +++ b/src/lte/model/lte-spectrum-phy.cc @@ -110,8 +110,7 @@ operator < (const TbId_t& a, const TbId_t& b) return ( (a.m_rnti < b.m_rnti) || ( (a.m_rnti == b.m_rnti) && (a.m_layer < b.m_layer) ) ); } -NS_OBJECT_ENSURE_REGISTERED (LteSpectrumPhy) - ; +NS_OBJECT_ENSURE_REGISTERED (LteSpectrumPhy); LteSpectrumPhy::LteSpectrumPhy () : m_state (IDLE), diff --git a/src/lte/model/lte-ue-mac.cc b/src/lte/model/lte-ue-mac.cc index e006ecbf8..f2599565e 100644 --- a/src/lte/model/lte-ue-mac.cc +++ b/src/lte/model/lte-ue-mac.cc @@ -41,8 +41,7 @@ NS_LOG_COMPONENT_DEFINE ("LteUeMac"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteUeMac) - ; +NS_OBJECT_ENSURE_REGISTERED (LteUeMac); /////////////////////////////////////////////////////////// diff --git a/src/lte/model/lte-ue-net-device.cc b/src/lte/model/lte-ue-net-device.cc index a473d7790..351dd90e4 100644 --- a/src/lte/model/lte-ue-net-device.cc +++ b/src/lte/model/lte-ue-net-device.cc @@ -48,8 +48,7 @@ NS_LOG_COMPONENT_DEFINE ("LteUeNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED ( LteUeNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED ( LteUeNetDevice); TypeId LteUeNetDevice::GetTypeId (void) diff --git a/src/lte/model/lte-ue-phy.cc b/src/lte/model/lte-ue-phy.cc index fda1c26c2..a11b9a4df 100644 --- a/src/lte/model/lte-ue-phy.cc +++ b/src/lte/model/lte-ue-phy.cc @@ -118,8 +118,7 @@ std::string ToString (LteUePhy::State s) } -NS_OBJECT_ENSURE_REGISTERED (LteUePhy) - ; +NS_OBJECT_ENSURE_REGISTERED (LteUePhy); LteUePhy::LteUePhy () diff --git a/src/lte/model/lte-ue-rrc.cc b/src/lte/model/lte-ue-rrc.cc index e8c714b8c..8f300c123 100644 --- a/src/lte/model/lte-ue-rrc.cc +++ b/src/lte/model/lte-ue-rrc.cc @@ -115,8 +115,7 @@ std::string ToString (LteUeRrc::State s) // ue RRC methods ///////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (LteUeRrc) - ; +NS_OBJECT_ENSURE_REGISTERED (LteUeRrc); LteUeRrc::LteUeRrc () diff --git a/src/lte/model/no-op-handover-algorithm.cc b/src/lte/model/no-op-handover-algorithm.cc index 6dddc851d..41b629639 100644 --- a/src/lte/model/no-op-handover-algorithm.cc +++ b/src/lte/model/no-op-handover-algorithm.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("NoOpHandoverAlgorithm"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (NoOpHandoverAlgorithm) - ; +NS_OBJECT_ENSURE_REGISTERED (NoOpHandoverAlgorithm); NoOpHandoverAlgorithm::NoOpHandoverAlgorithm () diff --git a/src/lte/model/pf-ff-mac-scheduler.cc b/src/lte/model/pf-ff-mac-scheduler.cc index dee315ac2..fd9083139 100644 --- a/src/lte/model/pf-ff-mac-scheduler.cc +++ b/src/lte/model/pf-ff-mac-scheduler.cc @@ -42,8 +42,7 @@ int PfType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (PfFfMacScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (PfFfMacScheduler); diff --git a/src/lte/model/pss-ff-mac-scheduler.cc b/src/lte/model/pss-ff-mac-scheduler.cc index 5e4d1c362..1fc9804ba 100644 --- a/src/lte/model/pss-ff-mac-scheduler.cc +++ b/src/lte/model/pss-ff-mac-scheduler.cc @@ -46,8 +46,7 @@ int PssType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (PssFfMacScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (PssFfMacScheduler); diff --git a/src/lte/model/rem-spectrum-phy.cc b/src/lte/model/rem-spectrum-phy.cc index 38fc9fc0a..6080355fc 100644 --- a/src/lte/model/rem-spectrum-phy.cc +++ b/src/lte/model/rem-spectrum-phy.cc @@ -35,8 +35,7 @@ NS_LOG_COMPONENT_DEFINE ("RemSpectrumPhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RemSpectrumPhy) - ; +NS_OBJECT_ENSURE_REGISTERED (RemSpectrumPhy); RemSpectrumPhy::RemSpectrumPhy () : m_mobility (0), diff --git a/src/lte/model/rr-ff-mac-scheduler.cc b/src/lte/model/rr-ff-mac-scheduler.cc index 7b47e1b69..2fdc56cda 100644 --- a/src/lte/model/rr-ff-mac-scheduler.cc +++ b/src/lte/model/rr-ff-mac-scheduler.cc @@ -46,8 +46,7 @@ int Type0AllocationRbg[4] = { -NS_OBJECT_ENSURE_REGISTERED (RrFfMacScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (RrFfMacScheduler); class RrSchedulerMemberCschedSapProvider : public FfMacCschedSapProvider diff --git a/src/lte/model/tdbet-ff-mac-scheduler.cc b/src/lte/model/tdbet-ff-mac-scheduler.cc index c37febbc1..bbc288c3f 100644 --- a/src/lte/model/tdbet-ff-mac-scheduler.cc +++ b/src/lte/model/tdbet-ff-mac-scheduler.cc @@ -43,8 +43,7 @@ int TdBetType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (TdBetFfMacScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (TdBetFfMacScheduler); diff --git a/src/lte/model/tdmt-ff-mac-scheduler.cc b/src/lte/model/tdmt-ff-mac-scheduler.cc index 13451a9d5..5417e5ce7 100644 --- a/src/lte/model/tdmt-ff-mac-scheduler.cc +++ b/src/lte/model/tdmt-ff-mac-scheduler.cc @@ -43,8 +43,7 @@ int TdMtType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (TdMtFfMacScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (TdMtFfMacScheduler); diff --git a/src/lte/model/tdtbfq-ff-mac-scheduler.cc b/src/lte/model/tdtbfq-ff-mac-scheduler.cc index e8c3c6d90..f9ce69794 100644 --- a/src/lte/model/tdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/tdtbfq-ff-mac-scheduler.cc @@ -44,8 +44,7 @@ int TdTbfqType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (TdTbfqFfMacScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (TdTbfqFfMacScheduler); diff --git a/src/lte/model/trace-fading-loss-model.cc b/src/lte/model/trace-fading-loss-model.cc index eb08dbb5a..6d6cdbb88 100644 --- a/src/lte/model/trace-fading-loss-model.cc +++ b/src/lte/model/trace-fading-loss-model.cc @@ -34,8 +34,7 @@ NS_LOG_COMPONENT_DEFINE ("TraceFadingLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TraceFadingLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (TraceFadingLossModel); diff --git a/src/lte/model/tta-ff-mac-scheduler.cc b/src/lte/model/tta-ff-mac-scheduler.cc index 73a8f83a0..861d5a74b 100644 --- a/src/lte/model/tta-ff-mac-scheduler.cc +++ b/src/lte/model/tta-ff-mac-scheduler.cc @@ -43,8 +43,7 @@ int TtaType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (TtaFfMacScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (TtaFfMacScheduler); diff --git a/src/lte/test/epc-test-s1u-downlink.cc b/src/lte/test/epc-test-s1u-downlink.cc index e2586d1a6..31c0858ef 100644 --- a/src/lte/test/epc-test-s1u-downlink.cc +++ b/src/lte/test/epc-test-s1u-downlink.cc @@ -44,8 +44,7 @@ using namespace ns3; -NS_LOG_COMPONENT_DEFINE ("EpcTestS1uDownlink") - ; +NS_LOG_COMPONENT_DEFINE ("EpcTestS1uDownlink"); diff --git a/src/lte/test/epc-test-s1u-uplink.cc b/src/lte/test/epc-test-s1u-uplink.cc index 8709f101b..2932f2fec 100644 --- a/src/lte/test/epc-test-s1u-uplink.cc +++ b/src/lte/test/epc-test-s1u-uplink.cc @@ -52,8 +52,7 @@ using namespace ns3; -NS_LOG_COMPONENT_DEFINE ("EpcTestS1uUplink") - ; +NS_LOG_COMPONENT_DEFINE ("EpcTestS1uUplink"); /* * A Udp client. Sends UDP packet carrying sequence number and time diff --git a/src/lte/test/lte-simple-helper.cc b/src/lte/test/lte-simple-helper.cc index ec40e02d9..1fc3786e2 100644 --- a/src/lte/test/lte-simple-helper.cc +++ b/src/lte/test/lte-simple-helper.cc @@ -35,8 +35,7 @@ NS_LOG_COMPONENT_DEFINE ("LteSimpleHelper"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteSimpleHelper) - ; +NS_OBJECT_ENSURE_REGISTERED (LteSimpleHelper); LteSimpleHelper::LteSimpleHelper (void) { diff --git a/src/lte/test/lte-simple-net-device.cc b/src/lte/test/lte-simple-net-device.cc index b505d77ec..b9b69fc58 100644 --- a/src/lte/test/lte-simple-net-device.cc +++ b/src/lte/test/lte-simple-net-device.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("LteSimpleNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteSimpleNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (LteSimpleNetDevice); TypeId LteSimpleNetDevice::GetTypeId (void) diff --git a/src/lte/test/lte-test-entities.cc b/src/lte/test/lte-test-entities.cc index c3967a1c4..69b827ff1 100644 --- a/src/lte/test/lte-test-entities.cc +++ b/src/lte/test/lte-test-entities.cc @@ -608,8 +608,7 @@ LteTestMac::Receive (Ptr nd, Ptr p, uint16_t protocol, -NS_OBJECT_ENSURE_REGISTERED (EpcTestRrc) - ; +NS_OBJECT_ENSURE_REGISTERED (EpcTestRrc); EpcTestRrc::EpcTestRrc () : m_s1SapProvider (0) diff --git a/src/lte/test/lte-test-ue-phy.cc b/src/lte/test/lte-test-ue-phy.cc index 8a790548a..1194c635d 100644 --- a/src/lte/test/lte-test-ue-phy.cc +++ b/src/lte/test/lte-test-ue-phy.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("LteTestUePhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteTestUePhy) - ; +NS_OBJECT_ENSURE_REGISTERED (LteTestUePhy); LteTestUePhy::LteTestUePhy () { diff --git a/src/lte/test/test-lte-epc-e2e-data.cc b/src/lte/test/test-lte-epc-e2e-data.cc index d6b030856..694ff1852 100644 --- a/src/lte/test/test-lte-epc-e2e-data.cc +++ b/src/lte/test/test-lte-epc-e2e-data.cc @@ -47,8 +47,7 @@ using namespace ns3; -NS_LOG_COMPONENT_DEFINE ("LteEpcE2eData") - ; +NS_LOG_COMPONENT_DEFINE ("LteEpcE2eData"); diff --git a/src/mesh/helper/dot11s/dot11s-installer.cc b/src/mesh/helper/dot11s/dot11s-installer.cc index 16bd91854..d6a08ecc2 100644 --- a/src/mesh/helper/dot11s/dot11s-installer.cc +++ b/src/mesh/helper/dot11s/dot11s-installer.cc @@ -25,8 +25,7 @@ namespace ns3 { using namespace dot11s; -NS_OBJECT_ENSURE_REGISTERED (Dot11sStack) - ; +NS_OBJECT_ENSURE_REGISTERED (Dot11sStack); TypeId Dot11sStack::GetTypeId () diff --git a/src/mesh/helper/flame/flame-installer.cc b/src/mesh/helper/flame/flame-installer.cc index 0bc3a6760..b115a2db4 100644 --- a/src/mesh/helper/flame/flame-installer.cc +++ b/src/mesh/helper/flame/flame-installer.cc @@ -26,8 +26,7 @@ namespace ns3 { using namespace flame; -NS_OBJECT_ENSURE_REGISTERED (FlameStack) - ; +NS_OBJECT_ENSURE_REGISTERED (FlameStack); TypeId FlameStack::GetTypeId () diff --git a/src/mesh/model/dot11s/airtime-metric.cc b/src/mesh/model/dot11s/airtime-metric.cc index b46efdb7f..c7a08a98a 100644 --- a/src/mesh/model/dot11s/airtime-metric.cc +++ b/src/mesh/model/dot11s/airtime-metric.cc @@ -25,8 +25,7 @@ namespace ns3 { namespace dot11s { -NS_OBJECT_ENSURE_REGISTERED (AirtimeLinkMetricCalculator) - ; +NS_OBJECT_ENSURE_REGISTERED (AirtimeLinkMetricCalculator); TypeId AirtimeLinkMetricCalculator::GetTypeId () diff --git a/src/mesh/model/dot11s/hwmp-protocol.cc b/src/mesh/model/dot11s/hwmp-protocol.cc index e580f468e..e14bbd678 100644 --- a/src/mesh/model/dot11s/hwmp-protocol.cc +++ b/src/mesh/model/dot11s/hwmp-protocol.cc @@ -41,8 +41,7 @@ NS_LOG_COMPONENT_DEFINE ("HwmpProtocol"); namespace ns3 { namespace dot11s { -NS_OBJECT_ENSURE_REGISTERED (HwmpProtocol) - ; +NS_OBJECT_ENSURE_REGISTERED (HwmpProtocol); TypeId HwmpProtocol::GetTypeId () diff --git a/src/mesh/model/dot11s/hwmp-rtable.cc b/src/mesh/model/dot11s/hwmp-rtable.cc index 7528728c1..e02cfda0b 100644 --- a/src/mesh/model/dot11s/hwmp-rtable.cc +++ b/src/mesh/model/dot11s/hwmp-rtable.cc @@ -31,8 +31,7 @@ namespace dot11s { NS_LOG_COMPONENT_DEFINE ("HwmpRtable"); -NS_OBJECT_ENSURE_REGISTERED (HwmpRtable) - ; +NS_OBJECT_ENSURE_REGISTERED (HwmpRtable); TypeId HwmpRtable::GetTypeId () diff --git a/src/mesh/model/dot11s/hwmp-tag.cc b/src/mesh/model/dot11s/hwmp-tag.cc index d45108fab..f37f60921 100644 --- a/src/mesh/model/dot11s/hwmp-tag.cc +++ b/src/mesh/model/dot11s/hwmp-tag.cc @@ -23,8 +23,7 @@ namespace ns3 { namespace dot11s { -NS_OBJECT_ENSURE_REGISTERED (HwmpTag) - ; +NS_OBJECT_ENSURE_REGISTERED (HwmpTag); //Class HwmpTag: HwmpTag::HwmpTag () : diff --git a/src/mesh/model/dot11s/peer-link-frame.cc b/src/mesh/model/dot11s/peer-link-frame.cc index cd4489ae8..3ae8e4102 100644 --- a/src/mesh/model/dot11s/peer-link-frame.cc +++ b/src/mesh/model/dot11s/peer-link-frame.cc @@ -26,8 +26,7 @@ namespace ns3 { namespace dot11s { -NS_OBJECT_ENSURE_REGISTERED (PeerLinkFrameStart) - ; +NS_OBJECT_ENSURE_REGISTERED (PeerLinkFrameStart); PeerLinkFrameStart::PeerLinkFrameStart () : m_subtype (255), m_capability (0), m_aid (0), m_rates (SupportedRates ()), m_meshId (), diff --git a/src/mesh/model/dot11s/peer-link.cc b/src/mesh/model/dot11s/peer-link.cc index 736c52161..e6eeec17f 100644 --- a/src/mesh/model/dot11s/peer-link.cc +++ b/src/mesh/model/dot11s/peer-link.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("Dot11sPeerManagementProtocol"); namespace ns3 { namespace dot11s { -NS_OBJECT_ENSURE_REGISTERED ( PeerLink) - ; +NS_OBJECT_ENSURE_REGISTERED ( PeerLink); TypeId PeerLink::GetTypeId () diff --git a/src/mesh/model/dot11s/peer-management-protocol.cc b/src/mesh/model/dot11s/peer-management-protocol.cc index 2e2e892c8..9ae96b3a0 100644 --- a/src/mesh/model/dot11s/peer-management-protocol.cc +++ b/src/mesh/model/dot11s/peer-management-protocol.cc @@ -39,8 +39,7 @@ namespace dot11s { /*************************************************** * PeerManager ***************************************************/ -NS_OBJECT_ENSURE_REGISTERED (PeerManagementProtocol) - ; +NS_OBJECT_ENSURE_REGISTERED (PeerManagementProtocol); TypeId PeerManagementProtocol::GetTypeId (void) diff --git a/src/mesh/model/flame/flame-header.cc b/src/mesh/model/flame/flame-header.cc index 26e070226..af7b48637 100644 --- a/src/mesh/model/flame/flame-header.cc +++ b/src/mesh/model/flame/flame-header.cc @@ -26,8 +26,7 @@ namespace ns3 { namespace flame { -NS_OBJECT_ENSURE_REGISTERED (FlameHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (FlameHeader); FlameHeader::FlameHeader () : m_cost (0), m_seqno (0), m_origDst (Mac48Address ()), m_origSrc (Mac48Address ()) diff --git a/src/mesh/model/flame/flame-protocol.cc b/src/mesh/model/flame/flame-protocol.cc index 55da861ba..b1f821041 100644 --- a/src/mesh/model/flame/flame-protocol.cc +++ b/src/mesh/model/flame/flame-protocol.cc @@ -38,10 +38,8 @@ namespace flame { //----------------------------------------------------------------------------- // FlameTag //----------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (FlameTag) - ; -NS_OBJECT_ENSURE_REGISTERED (FlameProtocol) - ; +NS_OBJECT_ENSURE_REGISTERED (FlameTag); +NS_OBJECT_ENSURE_REGISTERED (FlameProtocol); TypeId FlameTag::GetTypeId () diff --git a/src/mesh/model/flame/flame-rtable.cc b/src/mesh/model/flame/flame-rtable.cc index b84e09e69..92d585d92 100644 --- a/src/mesh/model/flame/flame-rtable.cc +++ b/src/mesh/model/flame/flame-rtable.cc @@ -28,8 +28,7 @@ namespace flame { NS_LOG_COMPONENT_DEFINE ("FlameRtable"); -NS_OBJECT_ENSURE_REGISTERED (FlameRtable) - ; +NS_OBJECT_ENSURE_REGISTERED (FlameRtable); TypeId FlameRtable::GetTypeId () diff --git a/src/mesh/model/mesh-l2-routing-protocol.cc b/src/mesh/model/mesh-l2-routing-protocol.cc index 78dbd7e3c..953a49c3a 100644 --- a/src/mesh/model/mesh-l2-routing-protocol.cc +++ b/src/mesh/model/mesh-l2-routing-protocol.cc @@ -27,8 +27,7 @@ NS_LOG_COMPONENT_DEFINE ("MeshL2RoutingProtocol"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MeshL2RoutingProtocol) - ; +NS_OBJECT_ENSURE_REGISTERED (MeshL2RoutingProtocol); TypeId MeshL2RoutingProtocol::GetTypeId (void) diff --git a/src/mesh/model/mesh-point-device.cc b/src/mesh/model/mesh-point-device.cc index b9270710c..2628d2725 100644 --- a/src/mesh/model/mesh-point-device.cc +++ b/src/mesh/model/mesh-point-device.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("MeshPointDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MeshPointDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (MeshPointDevice); TypeId MeshPointDevice::GetTypeId () diff --git a/src/mesh/model/mesh-wifi-interface-mac.cc b/src/mesh/model/mesh-wifi-interface-mac.cc index 0643ed64f..6109410d6 100644 --- a/src/mesh/model/mesh-wifi-interface-mac.cc +++ b/src/mesh/model/mesh-wifi-interface-mac.cc @@ -40,8 +40,7 @@ NS_LOG_COMPONENT_DEFINE ("MeshWifiInterfaceMac"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MeshWifiInterfaceMac) - ; +NS_OBJECT_ENSURE_REGISTERED (MeshWifiInterfaceMac); TypeId MeshWifiInterfaceMac::GetTypeId () diff --git a/src/mobility/helper/mobility-helper.cc b/src/mobility/helper/mobility-helper.cc index 41c178853..82b832967 100644 --- a/src/mobility/helper/mobility-helper.cc +++ b/src/mobility/helper/mobility-helper.cc @@ -31,8 +31,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("MobilityHelper") - ; +NS_LOG_COMPONENT_DEFINE ("MobilityHelper"); MobilityHelper::MobilityHelper () { diff --git a/src/mobility/model/constant-acceleration-mobility-model.cc b/src/mobility/model/constant-acceleration-mobility-model.cc index 20f339c49..6b123944a 100644 --- a/src/mobility/model/constant-acceleration-mobility-model.cc +++ b/src/mobility/model/constant-acceleration-mobility-model.cc @@ -20,8 +20,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ConstantAccelerationMobilityModel) - ; +NS_OBJECT_ENSURE_REGISTERED (ConstantAccelerationMobilityModel); TypeId ConstantAccelerationMobilityModel::GetTypeId (void) { diff --git a/src/mobility/model/constant-position-mobility-model.cc b/src/mobility/model/constant-position-mobility-model.cc index 10b94e537..72a000a3b 100644 --- a/src/mobility/model/constant-position-mobility-model.cc +++ b/src/mobility/model/constant-position-mobility-model.cc @@ -21,8 +21,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ConstantPositionMobilityModel) - ; +NS_OBJECT_ENSURE_REGISTERED (ConstantPositionMobilityModel); TypeId ConstantPositionMobilityModel::GetTypeId (void) diff --git a/src/mobility/model/constant-velocity-mobility-model.cc b/src/mobility/model/constant-velocity-mobility-model.cc index e76bed7d6..7a92bb00c 100644 --- a/src/mobility/model/constant-velocity-mobility-model.cc +++ b/src/mobility/model/constant-velocity-mobility-model.cc @@ -22,8 +22,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ConstantVelocityMobilityModel) - ; +NS_OBJECT_ENSURE_REGISTERED (ConstantVelocityMobilityModel); TypeId ConstantVelocityMobilityModel::GetTypeId (void) { diff --git a/src/mobility/model/gauss-markov-mobility-model.cc b/src/mobility/model/gauss-markov-mobility-model.cc index 1be75357f..897cefcf2 100644 --- a/src/mobility/model/gauss-markov-mobility-model.cc +++ b/src/mobility/model/gauss-markov-mobility-model.cc @@ -27,8 +27,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (GaussMarkovMobilityModel) - ; +NS_OBJECT_ENSURE_REGISTERED (GaussMarkovMobilityModel); TypeId GaussMarkovMobilityModel::GetTypeId (void) diff --git a/src/mobility/model/hierarchical-mobility-model.cc b/src/mobility/model/hierarchical-mobility-model.cc index 6771d872a..6382e9eee 100644 --- a/src/mobility/model/hierarchical-mobility-model.cc +++ b/src/mobility/model/hierarchical-mobility-model.cc @@ -22,8 +22,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (HierarchicalMobilityModel) - ; +NS_OBJECT_ENSURE_REGISTERED (HierarchicalMobilityModel); TypeId HierarchicalMobilityModel::GetTypeId (void) diff --git a/src/mobility/model/mobility-model.cc b/src/mobility/model/mobility-model.cc index 08022e56d..6aebe590a 100644 --- a/src/mobility/model/mobility-model.cc +++ b/src/mobility/model/mobility-model.cc @@ -25,8 +25,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MobilityModel) - ; +NS_OBJECT_ENSURE_REGISTERED (MobilityModel); TypeId MobilityModel::GetTypeId (void) diff --git a/src/mobility/model/position-allocator.cc b/src/mobility/model/position-allocator.cc index a02eb8b2a..9582b6b6d 100644 --- a/src/mobility/model/position-allocator.cc +++ b/src/mobility/model/position-allocator.cc @@ -30,8 +30,7 @@ NS_LOG_COMPONENT_DEFINE ("PositionAllocator"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PositionAllocator) - ; +NS_OBJECT_ENSURE_REGISTERED (PositionAllocator); TypeId PositionAllocator::GetTypeId (void) @@ -49,8 +48,7 @@ PositionAllocator::~PositionAllocator () { } -NS_OBJECT_ENSURE_REGISTERED (ListPositionAllocator) - ; +NS_OBJECT_ENSURE_REGISTERED (ListPositionAllocator); TypeId ListPositionAllocator::GetTypeId (void) @@ -87,8 +85,7 @@ ListPositionAllocator::AssignStreams (int64_t stream) return 0; } -NS_OBJECT_ENSURE_REGISTERED (GridPositionAllocator) - ; +NS_OBJECT_ENSURE_REGISTERED (GridPositionAllocator); TypeId GridPositionAllocator::GetTypeId (void) @@ -216,8 +213,7 @@ GridPositionAllocator::AssignStreams (int64_t stream) return 0; } -NS_OBJECT_ENSURE_REGISTERED (RandomRectanglePositionAllocator) - ; +NS_OBJECT_ENSURE_REGISTERED (RandomRectanglePositionAllocator); TypeId RandomRectanglePositionAllocator::GetTypeId (void) @@ -273,8 +269,7 @@ RandomRectanglePositionAllocator::AssignStreams (int64_t stream) return 2; } -NS_OBJECT_ENSURE_REGISTERED (RandomBoxPositionAllocator) - ; +NS_OBJECT_ENSURE_REGISTERED (RandomBoxPositionAllocator); TypeId RandomBoxPositionAllocator::GetTypeId (void) @@ -342,8 +337,7 @@ RandomBoxPositionAllocator::AssignStreams (int64_t stream) return 3; } -NS_OBJECT_ENSURE_REGISTERED (RandomDiscPositionAllocator) - ; +NS_OBJECT_ENSURE_REGISTERED (RandomDiscPositionAllocator); TypeId RandomDiscPositionAllocator::GetTypeId (void) @@ -424,8 +418,7 @@ RandomDiscPositionAllocator::AssignStreams (int64_t stream) -NS_OBJECT_ENSURE_REGISTERED (UniformDiscPositionAllocator) - ; +NS_OBJECT_ENSURE_REGISTERED (UniformDiscPositionAllocator); TypeId UniformDiscPositionAllocator::GetTypeId (void) diff --git a/src/mobility/model/random-direction-2d-mobility-model.cc b/src/mobility/model/random-direction-2d-mobility-model.cc index 87a2588c2..43d11b670 100644 --- a/src/mobility/model/random-direction-2d-mobility-model.cc +++ b/src/mobility/model/random-direction-2d-mobility-model.cc @@ -31,8 +31,7 @@ namespace ns3 { const double RandomDirection2dMobilityModel::PI = 3.14159265358979323846; -NS_OBJECT_ENSURE_REGISTERED (RandomDirection2dMobilityModel) - ; +NS_OBJECT_ENSURE_REGISTERED (RandomDirection2dMobilityModel); TypeId diff --git a/src/mobility/model/random-walk-2d-mobility-model.cc b/src/mobility/model/random-walk-2d-mobility-model.cc index f76efe765..4e696abb8 100644 --- a/src/mobility/model/random-walk-2d-mobility-model.cc +++ b/src/mobility/model/random-walk-2d-mobility-model.cc @@ -30,8 +30,7 @@ NS_LOG_COMPONENT_DEFINE ("RandomWalk2d"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RandomWalk2dMobilityModel) - ; +NS_OBJECT_ENSURE_REGISTERED (RandomWalk2dMobilityModel); TypeId RandomWalk2dMobilityModel::GetTypeId (void) diff --git a/src/mobility/model/random-waypoint-mobility-model.cc b/src/mobility/model/random-waypoint-mobility-model.cc index a5aa30662..566fba6ea 100644 --- a/src/mobility/model/random-waypoint-mobility-model.cc +++ b/src/mobility/model/random-waypoint-mobility-model.cc @@ -27,8 +27,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RandomWaypointMobilityModel) - ; +NS_OBJECT_ENSURE_REGISTERED (RandomWaypointMobilityModel); TypeId RandomWaypointMobilityModel::GetTypeId (void) diff --git a/src/mobility/model/steady-state-random-waypoint-mobility-model.cc b/src/mobility/model/steady-state-random-waypoint-mobility-model.cc index 30f604761..7b7483966 100644 --- a/src/mobility/model/steady-state-random-waypoint-mobility-model.cc +++ b/src/mobility/model/steady-state-random-waypoint-mobility-model.cc @@ -25,8 +25,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SteadyStateRandomWaypointMobilityModel) - ; +NS_OBJECT_ENSURE_REGISTERED (SteadyStateRandomWaypointMobilityModel); TypeId SteadyStateRandomWaypointMobilityModel::GetTypeId (void) diff --git a/src/mobility/model/waypoint-mobility-model.cc b/src/mobility/model/waypoint-mobility-model.cc index 8275f0fca..58f734ac2 100644 --- a/src/mobility/model/waypoint-mobility-model.cc +++ b/src/mobility/model/waypoint-mobility-model.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("WaypointMobilityModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WaypointMobilityModel) - ; +NS_OBJECT_ENSURE_REGISTERED (WaypointMobilityModel); TypeId diff --git a/src/mpi/model/distributed-simulator-impl.cc b/src/mpi/model/distributed-simulator-impl.cc index 8b6bca355..2436392ea 100644 --- a/src/mpi/model/distributed-simulator-impl.cc +++ b/src/mpi/model/distributed-simulator-impl.cc @@ -41,8 +41,7 @@ NS_LOG_COMPONENT_DEFINE ("DistributedSimulatorImpl"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (DistributedSimulatorImpl) - ; +NS_OBJECT_ENSURE_REGISTERED (DistributedSimulatorImpl); LbtsMessage::~LbtsMessage () { diff --git a/src/netanim/examples/uan-animation.cc b/src/netanim/examples/uan-animation.cc index 813e3583f..0e99194b2 100644 --- a/src/netanim/examples/uan-animation.cc +++ b/src/netanim/examples/uan-animation.cc @@ -47,8 +47,7 @@ using namespace ns3; -NS_LOG_COMPONENT_DEFINE ("UanCwExample") - ; +NS_LOG_COMPONENT_DEFINE ("UanCwExample"); NetAnimExperiment::NetAnimExperiment () : m_numNodes (15), diff --git a/src/network/model/application.cc b/src/network/model/application.cc index f6b38ab11..98719e6ec 100644 --- a/src/network/model/application.cc +++ b/src/network/model/application.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("Application"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Application) - ; +NS_OBJECT_ENSURE_REGISTERED (Application); // Application Methods diff --git a/src/network/model/channel-list.cc b/src/network/model/channel-list.cc index 88fb2179a..9be42c470 100644 --- a/src/network/model/channel-list.cc +++ b/src/network/model/channel-list.cc @@ -26,8 +26,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("ChannelList") - ; +NS_LOG_COMPONENT_DEFINE ("ChannelList"); /** * \brief private implementation detail of the ChannelList API. @@ -56,8 +55,7 @@ private: std::vector > m_channels; }; -NS_OBJECT_ENSURE_REGISTERED (ChannelListPriv) - ; +NS_OBJECT_ENSURE_REGISTERED (ChannelListPriv); TypeId ChannelListPriv::GetTypeId (void) diff --git a/src/network/model/channel.cc b/src/network/model/channel.cc index 59674429e..15f7c716b 100644 --- a/src/network/model/channel.cc +++ b/src/network/model/channel.cc @@ -27,8 +27,7 @@ NS_LOG_COMPONENT_DEFINE ("Channel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Channel) - ; +NS_OBJECT_ENSURE_REGISTERED (Channel); TypeId Channel::GetTypeId (void) diff --git a/src/network/model/chunk.cc b/src/network/model/chunk.cc index 3b2443b9c..6081f0edb 100644 --- a/src/network/model/chunk.cc +++ b/src/network/model/chunk.cc @@ -2,8 +2,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Chunk) - ; +NS_OBJECT_ENSURE_REGISTERED (Chunk); TypeId Chunk::GetTypeId (void) diff --git a/src/network/model/header.cc b/src/network/model/header.cc index 8ad2aa764..39840a736 100644 --- a/src/network/model/header.cc +++ b/src/network/model/header.cc @@ -5,8 +5,7 @@ NS_LOG_COMPONENT_DEFINE ("Header"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Header) - ; +NS_OBJECT_ENSURE_REGISTERED (Header); Header::~Header () { diff --git a/src/network/model/net-device.cc b/src/network/model/net-device.cc index effc9f2f6..7fdca4123 100644 --- a/src/network/model/net-device.cc +++ b/src/network/model/net-device.cc @@ -27,8 +27,7 @@ NS_LOG_COMPONENT_DEFINE ("NetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (NetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (NetDevice); TypeId NetDevice::GetTypeId (void) { diff --git a/src/network/model/node-list.cc b/src/network/model/node-list.cc index 79e6f66b5..87060e834 100644 --- a/src/network/model/node-list.cc +++ b/src/network/model/node-list.cc @@ -29,8 +29,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("NodeList") - ; +NS_LOG_COMPONENT_DEFINE ("NodeList"); /** * \brief private implementation detail of the NodeList API. @@ -57,8 +56,7 @@ private: std::vector > m_nodes; }; -NS_OBJECT_ENSURE_REGISTERED (NodeListPriv) - ; +NS_OBJECT_ENSURE_REGISTERED (NodeListPriv); TypeId NodeListPriv::GetTypeId (void) diff --git a/src/network/model/node.cc b/src/network/model/node.cc index 194e2902d..8feec8f7b 100644 --- a/src/network/model/node.cc +++ b/src/network/model/node.cc @@ -36,8 +36,7 @@ NS_LOG_COMPONENT_DEFINE ("Node"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Node) - ; +NS_OBJECT_ENSURE_REGISTERED (Node); GlobalValue g_checksumEnabled = GlobalValue ("ChecksumEnabled", "A global switch to enable all checksums for all protocols", diff --git a/src/network/model/packet-tag-list.cc b/src/network/model/packet-tag-list.cc index 0f9667553..aff200f63 100644 --- a/src/network/model/packet-tag-list.cc +++ b/src/network/model/packet-tag-list.cc @@ -30,8 +30,7 @@ #include "ns3/log.h" #include -NS_LOG_COMPONENT_DEFINE ("PacketTagList") - ; +NS_LOG_COMPONENT_DEFINE ("PacketTagList"); namespace ns3 { diff --git a/src/network/model/socket-factory.cc b/src/network/model/socket-factory.cc index d05dba8cb..9c234e7ea 100644 --- a/src/network/model/socket-factory.cc +++ b/src/network/model/socket-factory.cc @@ -24,8 +24,7 @@ NS_LOG_COMPONENT_DEFINE ("SocketFactory"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SocketFactory) - ; +NS_OBJECT_ENSURE_REGISTERED (SocketFactory); TypeId SocketFactory::GetTypeId (void) { diff --git a/src/network/model/socket.cc b/src/network/model/socket.cc index 5dcd7cb5f..41503d5b8 100644 --- a/src/network/model/socket.cc +++ b/src/network/model/socket.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("Socket"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Socket) - ; +NS_OBJECT_ENSURE_REGISTERED (Socket); TypeId Socket::GetTypeId (void) @@ -533,8 +532,7 @@ SocketAddressTag::GetAddress (void) const return m_address; } -NS_OBJECT_ENSURE_REGISTERED (SocketAddressTag) - ; +NS_OBJECT_ENSURE_REGISTERED (SocketAddressTag); TypeId SocketAddressTag::GetTypeId (void) @@ -594,8 +592,7 @@ SocketIpTtlTag::GetTtl (void) const return m_ttl; } -NS_OBJECT_ENSURE_REGISTERED (SocketIpTtlTag) - ; +NS_OBJECT_ENSURE_REGISTERED (SocketIpTtlTag); TypeId SocketIpTtlTag::GetTypeId (void) @@ -653,8 +650,7 @@ SocketIpv6HopLimitTag::GetHopLimit (void) const return m_hopLimit; } -NS_OBJECT_ENSURE_REGISTERED (SocketIpv6HopLimitTag) - ; +NS_OBJECT_ENSURE_REGISTERED (SocketIpv6HopLimitTag); TypeId SocketIpv6HopLimitTag::GetTypeId (void) @@ -715,8 +711,7 @@ SocketSetDontFragmentTag::IsEnabled (void) const return m_dontFragment; } -NS_OBJECT_ENSURE_REGISTERED (SocketSetDontFragmentTag) - ; +NS_OBJECT_ENSURE_REGISTERED (SocketSetDontFragmentTag); TypeId SocketSetDontFragmentTag::GetTypeId (void) diff --git a/src/network/model/tag.cc b/src/network/model/tag.cc index e12fb1fad..2de97178b 100644 --- a/src/network/model/tag.cc +++ b/src/network/model/tag.cc @@ -21,8 +21,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Tag) - ; +NS_OBJECT_ENSURE_REGISTERED (Tag); TypeId Tag::GetTypeId (void) diff --git a/src/network/model/trailer.cc b/src/network/model/trailer.cc index a2ca456cc..e66486e45 100644 --- a/src/network/model/trailer.cc +++ b/src/network/model/trailer.cc @@ -5,8 +5,7 @@ NS_LOG_COMPONENT_DEFINE ("Trailer"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Trailer) - ; +NS_OBJECT_ENSURE_REGISTERED (Trailer); Trailer::~Trailer () { diff --git a/src/network/utils/drop-tail-queue.cc b/src/network/utils/drop-tail-queue.cc index 65157ecc4..95218c500 100644 --- a/src/network/utils/drop-tail-queue.cc +++ b/src/network/utils/drop-tail-queue.cc @@ -25,8 +25,7 @@ NS_LOG_COMPONENT_DEFINE ("DropTailQueue"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (DropTailQueue) - ; +NS_OBJECT_ENSURE_REGISTERED (DropTailQueue); TypeId DropTailQueue::GetTypeId (void) { diff --git a/src/network/utils/error-model.cc b/src/network/utils/error-model.cc index 5d792fbd4..86010e6ed 100644 --- a/src/network/utils/error-model.cc +++ b/src/network/utils/error-model.cc @@ -77,8 +77,7 @@ NS_LOG_COMPONENT_DEFINE ("ErrorModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ErrorModel) - ; +NS_OBJECT_ENSURE_REGISTERED (ErrorModel); TypeId ErrorModel::GetTypeId (void) { @@ -146,8 +145,7 @@ ErrorModel::IsEnabled (void) const // RateErrorModel // -NS_OBJECT_ENSURE_REGISTERED (RateErrorModel) - ; +NS_OBJECT_ENSURE_REGISTERED (RateErrorModel); TypeId RateErrorModel::GetTypeId (void) { @@ -286,8 +284,7 @@ RateErrorModel::DoReset (void) // BurstErrorModel // -NS_OBJECT_ENSURE_REGISTERED (BurstErrorModel) - ; +NS_OBJECT_ENSURE_REGISTERED (BurstErrorModel); TypeId BurstErrorModel::GetTypeId (void) { @@ -415,8 +412,7 @@ BurstErrorModel::DoReset (void) // ListErrorModel // -NS_OBJECT_ENSURE_REGISTERED (ListErrorModel) - ; +NS_OBJECT_ENSURE_REGISTERED (ListErrorModel); TypeId ListErrorModel::GetTypeId (void) { @@ -485,8 +481,7 @@ ListErrorModel::DoReset (void) // ReceiveListErrorModel // -NS_OBJECT_ENSURE_REGISTERED (ReceiveListErrorModel) - ; +NS_OBJECT_ENSURE_REGISTERED (ReceiveListErrorModel); TypeId ReceiveListErrorModel::GetTypeId (void) { diff --git a/src/network/utils/ethernet-header.cc b/src/network/utils/ethernet-header.cc index d4d12e052..783baf06c 100644 --- a/src/network/utils/ethernet-header.cc +++ b/src/network/utils/ethernet-header.cc @@ -30,8 +30,7 @@ NS_LOG_COMPONENT_DEFINE ("EthernetHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (EthernetHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (EthernetHeader); EthernetHeader::EthernetHeader (bool hasPreamble) : m_enPreambleSfd (hasPreamble), diff --git a/src/network/utils/ethernet-trailer.cc b/src/network/utils/ethernet-trailer.cc index ed5e50e66..8ab1fb31d 100644 --- a/src/network/utils/ethernet-trailer.cc +++ b/src/network/utils/ethernet-trailer.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("EthernetTrailer"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (EthernetTrailer) - ; +NS_OBJECT_ENSURE_REGISTERED (EthernetTrailer); EthernetTrailer::EthernetTrailer () : m_calcFcs (false), diff --git a/src/network/utils/flow-id-tag.cc b/src/network/utils/flow-id-tag.cc index 083dc69b9..04dfb8b81 100644 --- a/src/network/utils/flow-id-tag.cc +++ b/src/network/utils/flow-id-tag.cc @@ -24,8 +24,7 @@ NS_LOG_COMPONENT_DEFINE ("FlowIdTag"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (FlowIdTag) - ; +NS_OBJECT_ENSURE_REGISTERED (FlowIdTag); TypeId FlowIdTag::GetTypeId (void) diff --git a/src/network/utils/llc-snap-header.cc b/src/network/utils/llc-snap-header.cc index 9e7637fc9..1638b4b6d 100644 --- a/src/network/utils/llc-snap-header.cc +++ b/src/network/utils/llc-snap-header.cc @@ -27,8 +27,7 @@ NS_LOG_COMPONENT_DEFINE ("LlcSnalHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LlcSnapHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (LlcSnapHeader); LlcSnapHeader::LlcSnapHeader () { diff --git a/src/network/utils/packet-burst.cc b/src/network/utils/packet-burst.cc index c0d6e1a80..4785fd913 100644 --- a/src/network/utils/packet-burst.cc +++ b/src/network/utils/packet-burst.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("PacketBurst"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PacketBurst) - ; +NS_OBJECT_ENSURE_REGISTERED (PacketBurst); TypeId PacketBurst::GetTypeId (void) diff --git a/src/network/utils/packet-probe.cc b/src/network/utils/packet-probe.cc index a05752b8c..2d6de134d 100644 --- a/src/network/utils/packet-probe.cc +++ b/src/network/utils/packet-probe.cc @@ -32,8 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("PacketProbe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PacketProbe) - ; +NS_OBJECT_ENSURE_REGISTERED (PacketProbe); TypeId PacketProbe::GetTypeId () diff --git a/src/network/utils/packet-socket-factory.cc b/src/network/utils/packet-socket-factory.cc index 269eb574b..908e69da9 100644 --- a/src/network/utils/packet-socket-factory.cc +++ b/src/network/utils/packet-socket-factory.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("PacketSocketFactory"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PacketSocketFactory) - ; +NS_OBJECT_ENSURE_REGISTERED (PacketSocketFactory); TypeId PacketSocketFactory::GetTypeId (void) diff --git a/src/network/utils/packet-socket.cc b/src/network/utils/packet-socket.cc index 32a6832cf..b8d81edc8 100644 --- a/src/network/utils/packet-socket.cc +++ b/src/network/utils/packet-socket.cc @@ -33,8 +33,7 @@ NS_LOG_COMPONENT_DEFINE ("PacketSocket"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PacketSocket) - ; +NS_OBJECT_ENSURE_REGISTERED (PacketSocket); TypeId PacketSocket::GetTypeId (void) @@ -537,8 +536,7 @@ PacketSocketTag::GetDestAddress (void) const return m_destAddr; } -NS_OBJECT_ENSURE_REGISTERED (PacketSocketTag) - ; +NS_OBJECT_ENSURE_REGISTERED (PacketSocketTag); TypeId PacketSocketTag::GetTypeId (void) @@ -601,8 +599,7 @@ DeviceNameTag::GetDeviceName (void) const return m_deviceName; } -NS_OBJECT_ENSURE_REGISTERED (DeviceNameTag) - ; +NS_OBJECT_ENSURE_REGISTERED (DeviceNameTag); TypeId DeviceNameTag::GetTypeId (void) diff --git a/src/network/utils/packetbb.cc b/src/network/utils/packetbb.cc index 5e0706027..23914076f 100644 --- a/src/network/utils/packetbb.cc +++ b/src/network/utils/packetbb.cc @@ -58,8 +58,7 @@ static const uint8_t TIS_MULTIVALUE = 0x04; namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PbbPacket) - ; +NS_OBJECT_ENSURE_REGISTERED (PbbPacket); PbbTlvBlock::PbbTlvBlock (void) { diff --git a/src/network/utils/pcap-file-wrapper.cc b/src/network/utils/pcap-file-wrapper.cc index 18c8b6aed..542287c61 100644 --- a/src/network/utils/pcap-file-wrapper.cc +++ b/src/network/utils/pcap-file-wrapper.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("PcapFileWrapper"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PcapFileWrapper) - ; +NS_OBJECT_ENSURE_REGISTERED (PcapFileWrapper); TypeId PcapFileWrapper::GetTypeId (void) diff --git a/src/network/utils/queue.cc b/src/network/utils/queue.cc index b39419b3d..26711f37d 100644 --- a/src/network/utils/queue.cc +++ b/src/network/utils/queue.cc @@ -24,8 +24,7 @@ NS_LOG_COMPONENT_DEFINE ("Queue"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Queue) - ; +NS_OBJECT_ENSURE_REGISTERED (Queue); TypeId Queue::GetTypeId (void) diff --git a/src/network/utils/radiotap-header.cc b/src/network/utils/radiotap-header.cc index b7f74e679..839bf6d56 100644 --- a/src/network/utils/radiotap-header.cc +++ b/src/network/utils/radiotap-header.cc @@ -27,8 +27,7 @@ NS_LOG_COMPONENT_DEFINE ("RadiotapHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RadiotapHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (RadiotapHeader); RadiotapHeader::RadiotapHeader() : m_length (8), diff --git a/src/network/utils/red-queue.cc b/src/network/utils/red-queue.cc index 955c6063f..4e7774223 100644 --- a/src/network/utils/red-queue.cc +++ b/src/network/utils/red-queue.cc @@ -69,8 +69,7 @@ NS_LOG_COMPONENT_DEFINE ("RedQueue"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RedQueue) - ; +NS_OBJECT_ENSURE_REGISTERED (RedQueue); TypeId RedQueue::GetTypeId (void) { diff --git a/src/network/utils/simple-channel.cc b/src/network/utils/simple-channel.cc index 0437ee5d4..f0dc1eb65 100644 --- a/src/network/utils/simple-channel.cc +++ b/src/network/utils/simple-channel.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("SimpleChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SimpleChannel) - ; +NS_OBJECT_ENSURE_REGISTERED (SimpleChannel); TypeId SimpleChannel::GetTypeId (void) diff --git a/src/network/utils/simple-net-device.cc b/src/network/utils/simple-net-device.cc index 29c4a2e63..eb8dc6b76 100644 --- a/src/network/utils/simple-net-device.cc +++ b/src/network/utils/simple-net-device.cc @@ -30,8 +30,7 @@ NS_LOG_COMPONENT_DEFINE ("SimpleNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SimpleNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (SimpleNetDevice); TypeId SimpleNetDevice::GetTypeId (void) diff --git a/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc b/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc index defabee5a..8706c51a0 100644 --- a/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc +++ b/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc @@ -32,8 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4NixVectorRouting"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4NixVectorRouting) - ; +NS_OBJECT_ENSURE_REGISTERED (Ipv4NixVectorRouting); TypeId Ipv4NixVectorRouting::GetTypeId (void) diff --git a/src/olsr/model/olsr-header.cc b/src/olsr/model/olsr-header.cc index 67cb1cc24..fa5db6eff 100644 --- a/src/olsr/model/olsr-header.cc +++ b/src/olsr/model/olsr-header.cc @@ -96,8 +96,7 @@ EmfToSeconds (uint8_t olsrFormat) // ---------------- OLSR Packet ------------------------------- -NS_OBJECT_ENSURE_REGISTERED (PacketHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (PacketHeader); PacketHeader::PacketHeader () { @@ -154,8 +153,7 @@ PacketHeader::Deserialize (Buffer::Iterator start) // ---------------- OLSR Message ------------------------------- -NS_OBJECT_ENSURE_REGISTERED (MessageHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (MessageHeader); MessageHeader::MessageHeader () : m_messageType (MessageHeader::MessageType (0)) diff --git a/src/olsr/model/olsr-routing-protocol.cc b/src/olsr/model/olsr-routing-protocol.cc index 3cec9f420..532553b7b 100644 --- a/src/olsr/model/olsr-routing-protocol.cc +++ b/src/olsr/model/olsr-routing-protocol.cc @@ -146,8 +146,7 @@ NS_LOG_COMPONENT_DEFINE ("OlsrRoutingProtocol"); /********** OLSR class **********/ -NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol) - ; +NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol); TypeId RoutingProtocol::GetTypeId (void) diff --git a/src/openflow/model/openflow-switch-net-device.cc b/src/openflow/model/openflow-switch-net-device.cc index aa6ce8524..62b6ef737 100644 --- a/src/openflow/model/openflow-switch-net-device.cc +++ b/src/openflow/model/openflow-switch-net-device.cc @@ -23,8 +23,7 @@ NS_LOG_COMPONENT_DEFINE ("OpenFlowSwitchNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (OpenFlowSwitchNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (OpenFlowSwitchNetDevice); const char * OpenFlowSwitchNetDevice::GetManufacturerDescription () diff --git a/src/point-to-point/model/point-to-point-channel.cc b/src/point-to-point/model/point-to-point-channel.cc index c70f4e42b..d6a69386a 100644 --- a/src/point-to-point/model/point-to-point-channel.cc +++ b/src/point-to-point/model/point-to-point-channel.cc @@ -27,8 +27,7 @@ NS_LOG_COMPONENT_DEFINE ("PointToPointChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PointToPointChannel) - ; +NS_OBJECT_ENSURE_REGISTERED (PointToPointChannel); TypeId PointToPointChannel::GetTypeId (void) diff --git a/src/point-to-point/model/point-to-point-net-device.cc b/src/point-to-point/model/point-to-point-net-device.cc index 1bfb9cd20..645b5cf2f 100644 --- a/src/point-to-point/model/point-to-point-net-device.cc +++ b/src/point-to-point/model/point-to-point-net-device.cc @@ -33,8 +33,7 @@ NS_LOG_COMPONENT_DEFINE ("PointToPointNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PointToPointNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (PointToPointNetDevice); TypeId PointToPointNetDevice::GetTypeId (void) diff --git a/src/point-to-point/model/point-to-point-remote-channel.cc b/src/point-to-point/model/point-to-point-remote-channel.cc index f6aa96aa0..4c982ac67 100644 --- a/src/point-to-point/model/point-to-point-remote-channel.cc +++ b/src/point-to-point/model/point-to-point-remote-channel.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("PointToPointRemoteChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PointToPointRemoteChannel) - ; +NS_OBJECT_ENSURE_REGISTERED (PointToPointRemoteChannel); TypeId PointToPointRemoteChannel::GetTypeId (void) diff --git a/src/point-to-point/model/ppp-header.cc b/src/point-to-point/model/ppp-header.cc index 9c8af8d46..4650fb069 100644 --- a/src/point-to-point/model/ppp-header.cc +++ b/src/point-to-point/model/ppp-header.cc @@ -27,8 +27,7 @@ NS_LOG_COMPONENT_DEFINE ("PppHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PppHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (PppHeader); PppHeader::PppHeader () { diff --git a/src/propagation/model/cost231-propagation-loss-model.cc b/src/propagation/model/cost231-propagation-loss-model.cc index 0513f42b7..2ba8c5256 100644 --- a/src/propagation/model/cost231-propagation-loss-model.cc +++ b/src/propagation/model/cost231-propagation-loss-model.cc @@ -29,10 +29,8 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("Cost231PropagationLossModel") - ; -NS_OBJECT_ENSURE_REGISTERED (Cost231PropagationLossModel) - ; +NS_LOG_COMPONENT_DEFINE ("Cost231PropagationLossModel"); +NS_OBJECT_ENSURE_REGISTERED (Cost231PropagationLossModel); TypeId Cost231PropagationLossModel::GetTypeId (void) diff --git a/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc b/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc index 4b1ae4e04..9064c5f8e 100644 --- a/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc +++ b/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("ItuR1411LosPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ItuR1411LosPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (ItuR1411LosPropagationLossModel); TypeId ItuR1411LosPropagationLossModel::GetTypeId (void) diff --git a/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc b/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc index a27c70e77..b5867679c 100644 --- a/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc +++ b/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("ItuR1411NlosOverRooftopPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ItuR1411NlosOverRooftopPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (ItuR1411NlosOverRooftopPropagationLossModel); TypeId diff --git a/src/propagation/model/jakes-process.cc b/src/propagation/model/jakes-process.cc index afea8c3c1..3012df5a7 100644 --- a/src/propagation/model/jakes-process.cc +++ b/src/propagation/model/jakes-process.cc @@ -43,8 +43,7 @@ JakesProcess::Oscillator::GetValueAt (Time at) const return (m_amplitude * std::cos (at.GetSeconds () * m_omega + m_phase)); } -NS_OBJECT_ENSURE_REGISTERED (JakesProcess) - ; +NS_OBJECT_ENSURE_REGISTERED (JakesProcess); TypeId JakesProcess::GetTypeId () diff --git a/src/propagation/model/jakes-propagation-loss-model.cc b/src/propagation/model/jakes-propagation-loss-model.cc index f49596f6a..eba42c84a 100644 --- a/src/propagation/model/jakes-propagation-loss-model.cc +++ b/src/propagation/model/jakes-propagation-loss-model.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("Jakes"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (JakesPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (JakesPropagationLossModel); const double JakesPropagationLossModel::PI = 3.14159265358979323846; diff --git a/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc b/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc index f0ce146c8..eb3e5710d 100644 --- a/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc +++ b/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("Kun2600MhzPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Kun2600MhzPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (Kun2600MhzPropagationLossModel); TypeId diff --git a/src/propagation/model/okumura-hata-propagation-loss-model.cc b/src/propagation/model/okumura-hata-propagation-loss-model.cc index 5e50172f2..e6c5c7b18 100644 --- a/src/propagation/model/okumura-hata-propagation-loss-model.cc +++ b/src/propagation/model/okumura-hata-propagation-loss-model.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("OkumuraHataPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (OkumuraHataPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (OkumuraHataPropagationLossModel); TypeId diff --git a/src/propagation/model/propagation-delay-model.cc b/src/propagation/model/propagation-delay-model.cc index 2d90dbba3..e920b6a57 100644 --- a/src/propagation/model/propagation-delay-model.cc +++ b/src/propagation/model/propagation-delay-model.cc @@ -25,8 +25,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PropagationDelayModel) - ; +NS_OBJECT_ENSURE_REGISTERED (PropagationDelayModel); TypeId PropagationDelayModel::GetTypeId (void) @@ -49,8 +48,7 @@ PropagationDelayModel::AssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (RandomPropagationDelayModel) - ; +NS_OBJECT_ENSURE_REGISTERED (RandomPropagationDelayModel); TypeId RandomPropagationDelayModel::GetTypeId (void) @@ -86,8 +84,7 @@ RandomPropagationDelayModel::DoAssignStreams (int64_t stream) return 1; } -NS_OBJECT_ENSURE_REGISTERED (ConstantSpeedPropagationDelayModel) - ; +NS_OBJECT_ENSURE_REGISTERED (ConstantSpeedPropagationDelayModel); TypeId ConstantSpeedPropagationDelayModel::GetTypeId (void) diff --git a/src/propagation/model/propagation-loss-model.cc b/src/propagation/model/propagation-loss-model.cc index c1ae58032..dc56736f0 100644 --- a/src/propagation/model/propagation-loss-model.cc +++ b/src/propagation/model/propagation-loss-model.cc @@ -36,8 +36,7 @@ namespace ns3 { // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (PropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (PropagationLossModel); TypeId PropagationLossModel::GetTypeId (void) @@ -96,8 +95,7 @@ PropagationLossModel::AssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (RandomPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (RandomPropagationLossModel); TypeId RandomPropagationLossModel::GetTypeId (void) @@ -140,8 +138,7 @@ RandomPropagationLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (FriisPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (FriisPropagationLossModel); const double FriisPropagationLossModel::PI = 3.14159265358979323846; @@ -282,8 +279,7 @@ FriisPropagationLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // // -- Two-Ray Ground Model ported from NS-2 -- tomhewer@mac.com -- Nov09 // -NS_OBJECT_ENSURE_REGISTERED (TwoRayGroundPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (TwoRayGroundPropagationLossModel); const double TwoRayGroundPropagationLossModel::PI = 3.14159265358979323846; @@ -457,8 +453,7 @@ TwoRayGroundPropagationLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (LogDistancePropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (LogDistancePropagationLossModel); TypeId LogDistancePropagationLossModel::GetTypeId (void) @@ -546,8 +541,7 @@ LogDistancePropagationLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (ThreeLogDistancePropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (ThreeLogDistancePropagationLossModel); TypeId ThreeLogDistancePropagationLossModel::GetTypeId (void) @@ -648,8 +642,7 @@ ThreeLogDistancePropagationLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (NakagamiPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (NakagamiPropagationLossModel); TypeId NakagamiPropagationLossModel::GetTypeId (void) @@ -763,8 +756,7 @@ NakagamiPropagationLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (FixedRssLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (FixedRssLossModel); TypeId FixedRssLossModel::GetTypeId (void) @@ -810,8 +802,7 @@ FixedRssLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (MatrixPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (MatrixPropagationLossModel); TypeId MatrixPropagationLossModel::GetTypeId (void) @@ -890,8 +881,7 @@ MatrixPropagationLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (RangePropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (RangePropagationLossModel); TypeId RangePropagationLossModel::GetTypeId (void) diff --git a/src/propagation/test/itu-r-1411-los-test-suite.cc b/src/propagation/test/itu-r-1411-los-test-suite.cc index 13bb6e0a8..5601ce255 100644 --- a/src/propagation/test/itu-r-1411-los-test-suite.cc +++ b/src/propagation/test/itu-r-1411-los-test-suite.cc @@ -31,8 +31,7 @@ using namespace ns3; -NS_LOG_COMPONENT_DEFINE ("ItuR1411LosPropagationLossModelTest") - ; +NS_LOG_COMPONENT_DEFINE ("ItuR1411LosPropagationLossModelTest"); class ItuR1411LosPropagationLossModelTestCase : public TestCase diff --git a/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc b/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc index fbc0d852e..8e79f9eab 100644 --- a/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc +++ b/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc @@ -31,8 +31,7 @@ using namespace ns3; -NS_LOG_COMPONENT_DEFINE ("ItuR1411NlosOverRooftopPropagationLossModelTest") - ; +NS_LOG_COMPONENT_DEFINE ("ItuR1411NlosOverRooftopPropagationLossModelTest"); class ItuR1411NlosOverRooftopPropagationLossModelTestCase : public TestCase diff --git a/src/propagation/test/kun-2600-mhz-test-suite.cc b/src/propagation/test/kun-2600-mhz-test-suite.cc index 8b2516675..ddc2209eb 100644 --- a/src/propagation/test/kun-2600-mhz-test-suite.cc +++ b/src/propagation/test/kun-2600-mhz-test-suite.cc @@ -31,8 +31,7 @@ using namespace ns3; -NS_LOG_COMPONENT_DEFINE ("Kun2600MhzPropagationLossModelTest") - ; +NS_LOG_COMPONENT_DEFINE ("Kun2600MhzPropagationLossModelTest"); class Kun2600MhzPropagationLossModelTestCase : public TestCase diff --git a/src/propagation/test/okumura-hata-test-suite.cc b/src/propagation/test/okumura-hata-test-suite.cc index 171a52612..b4f5a0ed9 100644 --- a/src/propagation/test/okumura-hata-test-suite.cc +++ b/src/propagation/test/okumura-hata-test-suite.cc @@ -31,8 +31,7 @@ using namespace ns3; -NS_LOG_COMPONENT_DEFINE ("OkumuraHataPropagationLossModelTest") - ; +NS_LOG_COMPONENT_DEFINE ("OkumuraHataPropagationLossModelTest"); class OkumuraHataPropagationLossModelTestCase : public TestCase diff --git a/src/sixlowpan/examples/example-sixlowpan.cc b/src/sixlowpan/examples/example-sixlowpan.cc index fd2935502..3d41825b3 100644 --- a/src/sixlowpan/examples/example-sixlowpan.cc +++ b/src/sixlowpan/examples/example-sixlowpan.cc @@ -50,8 +50,7 @@ using namespace ns3; -NS_LOG_COMPONENT_DEFINE ("ExampleSixlowpan") - ; +NS_LOG_COMPONENT_DEFINE ("ExampleSixlowpan"); int main (int argc, char** argv) { diff --git a/src/sixlowpan/helper/sixlowpan-helper.cc b/src/sixlowpan/helper/sixlowpan-helper.cc index 27fb2c95a..eebc0fa1b 100644 --- a/src/sixlowpan/helper/sixlowpan-helper.cc +++ b/src/sixlowpan/helper/sixlowpan-helper.cc @@ -24,8 +24,7 @@ #include "ns3/node.h" #include "ns3/names.h" -NS_LOG_COMPONENT_DEFINE ("SixLowPanHelper") - ; +NS_LOG_COMPONENT_DEFINE ("SixLowPanHelper"); namespace ns3 { diff --git a/src/sixlowpan/model/sixlowpan-header.cc b/src/sixlowpan/model/sixlowpan-header.cc index 222c8ff45..9c12bc85f 100644 --- a/src/sixlowpan/model/sixlowpan-header.cc +++ b/src/sixlowpan/model/sixlowpan-header.cc @@ -94,8 +94,7 @@ SixLowPanDispatch::GetNhcDispatchType (uint8_t dispatch) /* * SixLowPanHc1 */ -NS_OBJECT_ENSURE_REGISTERED (SixLowPanHc1) - ; +NS_OBJECT_ENSURE_REGISTERED (SixLowPanHc1); SixLowPanHc1::SixLowPanHc1 () : m_hopLimit (0) @@ -539,8 +538,7 @@ std::ostream & operator << (std::ostream & os, const SixLowPanHc1 & h) /* * SixLowPanFrag1 */ -NS_OBJECT_ENSURE_REGISTERED (SixLowPanFrag1) - ; +NS_OBJECT_ENSURE_REGISTERED (SixLowPanFrag1); SixLowPanFrag1::SixLowPanFrag1 () : m_datagramSize (0), @@ -624,8 +622,7 @@ std::ostream & operator << (std::ostream & os, const SixLowPanFrag1 & h) * SixLowPanFragN */ -NS_OBJECT_ENSURE_REGISTERED (SixLowPanFragN) - ; +NS_OBJECT_ENSURE_REGISTERED (SixLowPanFragN); SixLowPanFragN::SixLowPanFragN () : m_datagramSize (0), @@ -723,8 +720,7 @@ std::ostream & operator << (std::ostream & os, const SixLowPanFragN & h) /* * SixLowPanIphcHeader */ -NS_OBJECT_ENSURE_REGISTERED (SixLowPanIphc) - ; +NS_OBJECT_ENSURE_REGISTERED (SixLowPanIphc); SixLowPanIphc::SixLowPanIphc () { @@ -1419,8 +1415,7 @@ std::ostream & operator << (std::ostream & os, const SixLowPanIphc & h) /* * SixLowPanNhcExtensionHeader */ -NS_OBJECT_ENSURE_REGISTERED (SixLowPanNhcExtension) - ; +NS_OBJECT_ENSURE_REGISTERED (SixLowPanNhcExtension); SixLowPanNhcExtension::SixLowPanNhcExtension () { @@ -1547,8 +1542,7 @@ std::ostream & operator << (std::ostream & os, const SixLowPanNhcExtension & h) /* * SixLowPanUdpNhcExtension */ -NS_OBJECT_ENSURE_REGISTERED (SixLowPanUdpNhcExtension) - ; +NS_OBJECT_ENSURE_REGISTERED (SixLowPanUdpNhcExtension); SixLowPanUdpNhcExtension::SixLowPanUdpNhcExtension () { diff --git a/src/sixlowpan/model/sixlowpan-net-device.cc b/src/sixlowpan/model/sixlowpan-net-device.cc index b0c84b926..55128731b 100644 --- a/src/sixlowpan/model/sixlowpan-net-device.cc +++ b/src/sixlowpan/model/sixlowpan-net-device.cc @@ -41,13 +41,11 @@ #include "sixlowpan-net-device.h" #include "sixlowpan-header.h" -NS_LOG_COMPONENT_DEFINE ("SixLowPanNetDevice") - ; +NS_LOG_COMPONENT_DEFINE ("SixLowPanNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SixLowPanNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (SixLowPanNetDevice); TypeId SixLowPanNetDevice::GetTypeId (void) { diff --git a/src/sixlowpan/test/error-channel-sixlow.cc b/src/sixlowpan/test/error-channel-sixlow.cc index 6a9084d2d..4839d1bda 100644 --- a/src/sixlowpan/test/error-channel-sixlow.cc +++ b/src/sixlowpan/test/error-channel-sixlow.cc @@ -24,13 +24,11 @@ #include "ns3/node.h" #include "ns3/log.h" -NS_LOG_COMPONENT_DEFINE ("ErrorChannelSixlow") - ; +NS_LOG_COMPONENT_DEFINE ("ErrorChannelSixlow"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ErrorChannelSixlow) - ; +NS_OBJECT_ENSURE_REGISTERED (ErrorChannelSixlow); TypeId ErrorChannelSixlow::GetTypeId (void) @@ -146,8 +144,7 @@ ErrorChannelSixlow::GetDevice (uint32_t i) const return m_devices[i]; } -NS_OBJECT_ENSURE_REGISTERED (BinaryErrorSixlowModel) - ; +NS_OBJECT_ENSURE_REGISTERED (BinaryErrorSixlowModel); TypeId BinaryErrorSixlowModel::GetTypeId (void) { diff --git a/src/spectrum/model/aloha-noack-mac-header.cc b/src/spectrum/model/aloha-noack-mac-header.cc index acae75f88..0fa11df62 100644 --- a/src/spectrum/model/aloha-noack-mac-header.cc +++ b/src/spectrum/model/aloha-noack-mac-header.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("AlohaNoackMacHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (AlohaNoackMacHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (AlohaNoackMacHeader); TypeId AlohaNoackMacHeader::GetTypeId (void) diff --git a/src/spectrum/model/aloha-noack-net-device.cc b/src/spectrum/model/aloha-noack-net-device.cc index 0d46c83af..c7ecbcc28 100644 --- a/src/spectrum/model/aloha-noack-net-device.cc +++ b/src/spectrum/model/aloha-noack-net-device.cc @@ -55,8 +55,7 @@ std::ostream& operator<< (std::ostream& os, AlohaNoackNetDevice::State state) } -NS_OBJECT_ENSURE_REGISTERED (AlohaNoackNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (AlohaNoackNetDevice); TypeId AlohaNoackNetDevice::GetTypeId (void) diff --git a/src/spectrum/model/constant-spectrum-propagation-loss.cc b/src/spectrum/model/constant-spectrum-propagation-loss.cc index e2a92954e..f100bd0ab 100644 --- a/src/spectrum/model/constant-spectrum-propagation-loss.cc +++ b/src/spectrum/model/constant-spectrum-propagation-loss.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("ConstantSpectrumPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ConstantSpectrumPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (ConstantSpectrumPropagationLossModel); ConstantSpectrumPropagationLossModel::ConstantSpectrumPropagationLossModel () { diff --git a/src/spectrum/model/friis-spectrum-propagation-loss.cc b/src/spectrum/model/friis-spectrum-propagation-loss.cc index 9eaa6a7a4..12a2ca709 100644 --- a/src/spectrum/model/friis-spectrum-propagation-loss.cc +++ b/src/spectrum/model/friis-spectrum-propagation-loss.cc @@ -25,8 +25,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (FriisSpectrumPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (FriisSpectrumPropagationLossModel); FriisSpectrumPropagationLossModel::FriisSpectrumPropagationLossModel () diff --git a/src/spectrum/model/half-duplex-ideal-phy.cc b/src/spectrum/model/half-duplex-ideal-phy.cc index e0db0011a..d377b8794 100644 --- a/src/spectrum/model/half-duplex-ideal-phy.cc +++ b/src/spectrum/model/half-duplex-ideal-phy.cc @@ -36,8 +36,7 @@ NS_LOG_COMPONENT_DEFINE ("HalfDuplexIdealPhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (HalfDuplexIdealPhy) - ; +NS_OBJECT_ENSURE_REGISTERED (HalfDuplexIdealPhy); HalfDuplexIdealPhy::HalfDuplexIdealPhy () : m_mobility (0), diff --git a/src/spectrum/model/multi-model-spectrum-channel.cc b/src/spectrum/model/multi-model-spectrum-channel.cc index 66fd2c415..da4125ad5 100644 --- a/src/spectrum/model/multi-model-spectrum-channel.cc +++ b/src/spectrum/model/multi-model-spectrum-channel.cc @@ -45,8 +45,7 @@ NS_LOG_COMPONENT_DEFINE ("MultiModelSpectrumChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MultiModelSpectrumChannel) - ; +NS_OBJECT_ENSURE_REGISTERED (MultiModelSpectrumChannel); std::ostream& operator<< (std::ostream& lhs, TxSpectrumModelInfoMap_t& rhs) diff --git a/src/spectrum/model/non-communicating-net-device.cc b/src/spectrum/model/non-communicating-net-device.cc index f705c498b..1ce3508a8 100644 --- a/src/spectrum/model/non-communicating-net-device.cc +++ b/src/spectrum/model/non-communicating-net-device.cc @@ -36,8 +36,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (NonCommunicatingNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (NonCommunicatingNetDevice); TypeId NonCommunicatingNetDevice::GetTypeId (void) diff --git a/src/spectrum/model/single-model-spectrum-channel.cc b/src/spectrum/model/single-model-spectrum-channel.cc index f2f9779df..0c6141154 100644 --- a/src/spectrum/model/single-model-spectrum-channel.cc +++ b/src/spectrum/model/single-model-spectrum-channel.cc @@ -44,8 +44,7 @@ NS_LOG_COMPONENT_DEFINE ("SingleModelSpectrumChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SingleModelSpectrumChannel) - ; +NS_OBJECT_ENSURE_REGISTERED (SingleModelSpectrumChannel); SingleModelSpectrumChannel::SingleModelSpectrumChannel () { diff --git a/src/spectrum/model/spectrum-analyzer.cc b/src/spectrum/model/spectrum-analyzer.cc index 76138d3da..661f046fc 100644 --- a/src/spectrum/model/spectrum-analyzer.cc +++ b/src/spectrum/model/spectrum-analyzer.cc @@ -32,8 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("SpectrumAnalyzer"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SpectrumAnalyzer) - ; +NS_OBJECT_ENSURE_REGISTERED (SpectrumAnalyzer); SpectrumAnalyzer::SpectrumAnalyzer () : m_mobility (0), diff --git a/src/spectrum/model/spectrum-channel.cc b/src/spectrum/model/spectrum-channel.cc index 5e8432a36..c82c65638 100644 --- a/src/spectrum/model/spectrum-channel.cc +++ b/src/spectrum/model/spectrum-channel.cc @@ -24,8 +24,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SpectrumChannel) - ; +NS_OBJECT_ENSURE_REGISTERED (SpectrumChannel); TypeId SpectrumChannel::GetTypeId (void) diff --git a/src/spectrum/model/spectrum-phy.cc b/src/spectrum/model/spectrum-phy.cc index 47b8cc0b8..1f8f473d8 100644 --- a/src/spectrum/model/spectrum-phy.cc +++ b/src/spectrum/model/spectrum-phy.cc @@ -30,8 +30,7 @@ NS_LOG_COMPONENT_DEFINE ("SpectrumPhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SpectrumPhy) - ; +NS_OBJECT_ENSURE_REGISTERED (SpectrumPhy); TypeId diff --git a/src/spectrum/model/spectrum-propagation-loss-model.cc b/src/spectrum/model/spectrum-propagation-loss-model.cc index 529ca68c1..3bbb371de 100644 --- a/src/spectrum/model/spectrum-propagation-loss-model.cc +++ b/src/spectrum/model/spectrum-propagation-loss-model.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("SpectrumPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SpectrumPropagationLossModel) - ; +NS_OBJECT_ENSURE_REGISTERED (SpectrumPropagationLossModel); SpectrumPropagationLossModel::SpectrumPropagationLossModel () : m_next (0) diff --git a/src/spectrum/model/waveform-generator.cc b/src/spectrum/model/waveform-generator.cc index a1bf5548a..3d02bc6e0 100644 --- a/src/spectrum/model/waveform-generator.cc +++ b/src/spectrum/model/waveform-generator.cc @@ -32,8 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("WaveformGenerator"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WaveformGenerator) - ; +NS_OBJECT_ENSURE_REGISTERED (WaveformGenerator); WaveformGenerator::WaveformGenerator () : m_mobility (0), diff --git a/src/stats/examples/double-probe-example.cc b/src/stats/examples/double-probe-example.cc index 4a6a73795..511286ac5 100644 --- a/src/stats/examples/double-probe-example.cc +++ b/src/stats/examples/double-probe-example.cc @@ -50,8 +50,7 @@ private: }; -NS_OBJECT_ENSURE_REGISTERED (Emitter) - ; +NS_OBJECT_ENSURE_REGISTERED (Emitter); TypeId Emitter::GetTypeId (void) diff --git a/src/stats/examples/file-helper-example.cc b/src/stats/examples/file-helper-example.cc index e3337ff42..1d4d4880e 100644 --- a/src/stats/examples/file-helper-example.cc +++ b/src/stats/examples/file-helper-example.cc @@ -53,8 +53,7 @@ private: }; -NS_OBJECT_ENSURE_REGISTERED (Emitter) - ; +NS_OBJECT_ENSURE_REGISTERED (Emitter); TypeId Emitter::GetTypeId (void) diff --git a/src/stats/examples/gnuplot-helper-example.cc b/src/stats/examples/gnuplot-helper-example.cc index c53bdc4ff..397f9d2cf 100644 --- a/src/stats/examples/gnuplot-helper-example.cc +++ b/src/stats/examples/gnuplot-helper-example.cc @@ -53,8 +53,7 @@ private: }; -NS_OBJECT_ENSURE_REGISTERED (Emitter) - ; +NS_OBJECT_ENSURE_REGISTERED (Emitter); TypeId Emitter::GetTypeId (void) diff --git a/src/stats/helper/file-helper.cc b/src/stats/helper/file-helper.cc index e198d7365..2eb6e01c7 100644 --- a/src/stats/helper/file-helper.cc +++ b/src/stats/helper/file-helper.cc @@ -30,8 +30,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("FileHelper") - ; +NS_LOG_COMPONENT_DEFINE ("FileHelper"); FileHelper::FileHelper () : m_aggregator (0), diff --git a/src/stats/helper/gnuplot-helper.cc b/src/stats/helper/gnuplot-helper.cc index e25baa04e..9ee82bcc5 100644 --- a/src/stats/helper/gnuplot-helper.cc +++ b/src/stats/helper/gnuplot-helper.cc @@ -32,8 +32,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("GnuplotHelper") - ; +NS_LOG_COMPONENT_DEFINE ("GnuplotHelper"); GnuplotHelper::GnuplotHelper () : m_aggregator (0), diff --git a/src/stats/model/boolean-probe.cc b/src/stats/model/boolean-probe.cc index 8ef1274b3..d27b50271 100644 --- a/src/stats/model/boolean-probe.cc +++ b/src/stats/model/boolean-probe.cc @@ -32,8 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("BooleanProbe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BooleanProbe) - ; +NS_OBJECT_ENSURE_REGISTERED (BooleanProbe); TypeId BooleanProbe::GetTypeId () diff --git a/src/stats/model/data-collection-object.cc b/src/stats/model/data-collection-object.cc index 1ed381adf..3c26492fc 100644 --- a/src/stats/model/data-collection-object.cc +++ b/src/stats/model/data-collection-object.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("DataCollectionObject"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (DataCollectionObject) - ; +NS_OBJECT_ENSURE_REGISTERED (DataCollectionObject); TypeId DataCollectionObject::GetTypeId (void) diff --git a/src/stats/model/double-probe.cc b/src/stats/model/double-probe.cc index ad4f89394..b3ff59191 100644 --- a/src/stats/model/double-probe.cc +++ b/src/stats/model/double-probe.cc @@ -32,8 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("DoubleProbe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (DoubleProbe) - ; +NS_OBJECT_ENSURE_REGISTERED (DoubleProbe); TypeId DoubleProbe::GetTypeId () diff --git a/src/stats/model/file-aggregator.cc b/src/stats/model/file-aggregator.cc index ac0f2db53..4a3743560 100644 --- a/src/stats/model/file-aggregator.cc +++ b/src/stats/model/file-aggregator.cc @@ -28,11 +28,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("FileAggregator") - ; +NS_LOG_COMPONENT_DEFINE ("FileAggregator"); -NS_OBJECT_ENSURE_REGISTERED (FileAggregator) - ; +NS_OBJECT_ENSURE_REGISTERED (FileAggregator); TypeId FileAggregator::GetTypeId () diff --git a/src/stats/model/gnuplot-aggregator.cc b/src/stats/model/gnuplot-aggregator.cc index d280e4b28..a580404ca 100644 --- a/src/stats/model/gnuplot-aggregator.cc +++ b/src/stats/model/gnuplot-aggregator.cc @@ -28,10 +28,8 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("GnuplotAggregator") - ; -NS_OBJECT_ENSURE_REGISTERED (GnuplotAggregator) - ; +NS_LOG_COMPONENT_DEFINE ("GnuplotAggregator"); +NS_OBJECT_ENSURE_REGISTERED (GnuplotAggregator); TypeId GnuplotAggregator::GetTypeId () diff --git a/src/stats/model/probe.cc b/src/stats/model/probe.cc index 4d3d85f3d..260ca0314 100644 --- a/src/stats/model/probe.cc +++ b/src/stats/model/probe.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("Probe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Probe) - ; +NS_OBJECT_ENSURE_REGISTERED (Probe); TypeId Probe::GetTypeId () diff --git a/src/stats/model/time-series-adaptor.cc b/src/stats/model/time-series-adaptor.cc index 0f4d574f3..a1d787bfa 100644 --- a/src/stats/model/time-series-adaptor.cc +++ b/src/stats/model/time-series-adaptor.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("TimeSeriesAdaptor"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TimeSeriesAdaptor) - ; +NS_OBJECT_ENSURE_REGISTERED (TimeSeriesAdaptor); TypeId TimeSeriesAdaptor::GetTypeId (void) diff --git a/src/stats/model/uinteger-16-probe.cc b/src/stats/model/uinteger-16-probe.cc index d699646e6..6e70e5ac3 100644 --- a/src/stats/model/uinteger-16-probe.cc +++ b/src/stats/model/uinteger-16-probe.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("Uinteger16Probe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Uinteger16Probe) - ; +NS_OBJECT_ENSURE_REGISTERED (Uinteger16Probe); TypeId Uinteger16Probe::GetTypeId () diff --git a/src/stats/model/uinteger-32-probe.cc b/src/stats/model/uinteger-32-probe.cc index 275090f26..28f9fdcff 100644 --- a/src/stats/model/uinteger-32-probe.cc +++ b/src/stats/model/uinteger-32-probe.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("Uinteger32Probe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Uinteger32Probe) - ; +NS_OBJECT_ENSURE_REGISTERED (Uinteger32Probe); TypeId Uinteger32Probe::GetTypeId () diff --git a/src/stats/model/uinteger-8-probe.cc b/src/stats/model/uinteger-8-probe.cc index 77d5eea83..823af2847 100644 --- a/src/stats/model/uinteger-8-probe.cc +++ b/src/stats/model/uinteger-8-probe.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("Uinteger8Probe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Uinteger8Probe) - ; +NS_OBJECT_ENSURE_REGISTERED (Uinteger8Probe); TypeId Uinteger8Probe::GetTypeId () diff --git a/src/tap-bridge/model/tap-bridge.cc b/src/tap-bridge/model/tap-bridge.cc index 379d81433..87984282f 100644 --- a/src/tap-bridge/model/tap-bridge.cc +++ b/src/tap-bridge/model/tap-bridge.cc @@ -73,8 +73,7 @@ FdReader::Data TapBridgeFdReader::DoRead (void) #define TAP_MAGIC 95549 -NS_OBJECT_ENSURE_REGISTERED (TapBridge) - ; +NS_OBJECT_ENSURE_REGISTERED (TapBridge); TypeId TapBridge::GetTypeId (void) diff --git a/src/topology-read/helper/topology-reader-helper.cc b/src/topology-read/helper/topology-reader-helper.cc index 6b7568c94..fdfd60681 100644 --- a/src/topology-read/helper/topology-reader-helper.cc +++ b/src/topology-read/helper/topology-reader-helper.cc @@ -28,8 +28,7 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("TopologyReaderHelper") - ; +NS_LOG_COMPONENT_DEFINE ("TopologyReaderHelper"); TopologyReaderHelper::TopologyReaderHelper () { diff --git a/src/topology-read/model/inet-topology-reader.cc b/src/topology-read/model/inet-topology-reader.cc index 85963f161..2f2e5bb69 100644 --- a/src/topology-read/model/inet-topology-reader.cc +++ b/src/topology-read/model/inet-topology-reader.cc @@ -30,11 +30,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("InetTopologyReader") - ; +NS_LOG_COMPONENT_DEFINE ("InetTopologyReader"); -NS_OBJECT_ENSURE_REGISTERED (InetTopologyReader) - ; +NS_OBJECT_ENSURE_REGISTERED (InetTopologyReader); TypeId InetTopologyReader::GetTypeId (void) { diff --git a/src/topology-read/model/orbis-topology-reader.cc b/src/topology-read/model/orbis-topology-reader.cc index dd706b4bd..49fa60727 100644 --- a/src/topology-read/model/orbis-topology-reader.cc +++ b/src/topology-read/model/orbis-topology-reader.cc @@ -30,11 +30,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("OrbisTopologyReader") - ; +NS_LOG_COMPONENT_DEFINE ("OrbisTopologyReader"); -NS_OBJECT_ENSURE_REGISTERED (OrbisTopologyReader) - ; +NS_OBJECT_ENSURE_REGISTERED (OrbisTopologyReader); TypeId OrbisTopologyReader::GetTypeId (void) { diff --git a/src/topology-read/model/rocketfuel-topology-reader.cc b/src/topology-read/model/rocketfuel-topology-reader.cc index 336a58e2c..1988908c1 100644 --- a/src/topology-read/model/rocketfuel-topology-reader.cc +++ b/src/topology-read/model/rocketfuel-topology-reader.cc @@ -30,11 +30,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("RocketfuelTopologyReader") - ; +NS_LOG_COMPONENT_DEFINE ("RocketfuelTopologyReader"); -NS_OBJECT_ENSURE_REGISTERED (RocketfuelTopologyReader) - ; +NS_OBJECT_ENSURE_REGISTERED (RocketfuelTopologyReader); TypeId RocketfuelTopologyReader::GetTypeId (void) { diff --git a/src/topology-read/model/topology-reader.cc b/src/topology-read/model/topology-reader.cc index 73396c5c8..b531a6d98 100644 --- a/src/topology-read/model/topology-reader.cc +++ b/src/topology-read/model/topology-reader.cc @@ -26,11 +26,9 @@ namespace ns3 { -NS_LOG_COMPONENT_DEFINE ("TopologyReader") - ; +NS_LOG_COMPONENT_DEFINE ("TopologyReader"); -NS_OBJECT_ENSURE_REGISTERED (TopologyReader) - ; +NS_OBJECT_ENSURE_REGISTERED (TopologyReader); TypeId TopologyReader::GetTypeId (void) { diff --git a/src/uan/examples/uan-cw-example.cc b/src/uan/examples/uan-cw-example.cc index 7d4ccfa6c..27c1b6576 100644 --- a/src/uan/examples/uan-cw-example.cc +++ b/src/uan/examples/uan-cw-example.cc @@ -53,8 +53,7 @@ using namespace ns3; -NS_LOG_COMPONENT_DEFINE ("UanCwExample") - ; +NS_LOG_COMPONENT_DEFINE ("UanCwExample"); Experiment::Experiment () : m_numNodes (15), diff --git a/src/uan/examples/uan-rc-example.cc b/src/uan/examples/uan-rc-example.cc index 04d009b04..ac9f38ad6 100644 --- a/src/uan/examples/uan-rc-example.cc +++ b/src/uan/examples/uan-rc-example.cc @@ -65,8 +65,7 @@ using namespace ns3; -NS_LOG_COMPONENT_DEFINE ("UanRcExample") - ; +NS_LOG_COMPONENT_DEFINE ("UanRcExample"); Experiment::Experiment () diff --git a/src/uan/model/acoustic-modem-energy-model.cc b/src/uan/model/acoustic-modem-energy-model.cc index cfe872cdc..da226c847 100644 --- a/src/uan/model/acoustic-modem-energy-model.cc +++ b/src/uan/model/acoustic-modem-energy-model.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("AcousticModemEnergyModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (AcousticModemEnergyModel) - ; +NS_OBJECT_ENSURE_REGISTERED (AcousticModemEnergyModel); TypeId AcousticModemEnergyModel::GetTypeId (void) diff --git a/src/uan/model/uan-channel.cc b/src/uan/model/uan-channel.cc index 02da86d4c..f737313da 100644 --- a/src/uan/model/uan-channel.cc +++ b/src/uan/model/uan-channel.cc @@ -40,8 +40,7 @@ NS_LOG_COMPONENT_DEFINE ("UanChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanChannel) - ; +NS_OBJECT_ENSURE_REGISTERED (UanChannel); TypeId UanChannel::GetTypeId () diff --git a/src/uan/model/uan-header-common.cc b/src/uan/model/uan-header-common.cc index a28f65cce..461ee8b39 100644 --- a/src/uan/model/uan-header-common.cc +++ b/src/uan/model/uan-header-common.cc @@ -23,8 +23,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanHeaderCommon) - ; +NS_OBJECT_ENSURE_REGISTERED (UanHeaderCommon); UanHeaderCommon::UanHeaderCommon () { diff --git a/src/uan/model/uan-header-rc.cc b/src/uan/model/uan-header-rc.cc index 0ff19bb0f..14b9af783 100644 --- a/src/uan/model/uan-header-rc.cc +++ b/src/uan/model/uan-header-rc.cc @@ -25,16 +25,11 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcData) - ; -NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcRts) - ; -NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcCtsGlobal) - ; -NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcCts) - ; -NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcAck) - ; +NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcData); +NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcRts); +NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcCtsGlobal); +NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcCts); +NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcAck); UanHeaderRcData::UanHeaderRcData () : Header (), diff --git a/src/uan/model/uan-mac-aloha.cc b/src/uan/model/uan-mac-aloha.cc index 49b290450..ff0a677be 100644 --- a/src/uan/model/uan-mac-aloha.cc +++ b/src/uan/model/uan-mac-aloha.cc @@ -32,8 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("UanMacAloha"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanMacAloha) - ; +NS_OBJECT_ENSURE_REGISTERED (UanMacAloha); UanMacAloha::UanMacAloha () : UanMac (), diff --git a/src/uan/model/uan-mac-cw.cc b/src/uan/model/uan-mac-cw.cc index 6273aaab6..c9d80ec1d 100644 --- a/src/uan/model/uan-mac-cw.cc +++ b/src/uan/model/uan-mac-cw.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("UanMacCw"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanMacCw) - ; +NS_OBJECT_ENSURE_REGISTERED (UanMacCw); UanMacCw::UanMacCw () : UanMac (), diff --git a/src/uan/model/uan-mac-rc-gw.cc b/src/uan/model/uan-mac-rc-gw.cc index 2e6e4d940..47a7357d2 100644 --- a/src/uan/model/uan-mac-rc-gw.cc +++ b/src/uan/model/uan-mac-rc-gw.cc @@ -43,8 +43,7 @@ NS_LOG_COMPONENT_DEFINE ("UanMacRcGw"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanMacRcGw) - ; +NS_OBJECT_ENSURE_REGISTERED (UanMacRcGw); UanMacRcGw::UanMacRcGw () : UanMac (), diff --git a/src/uan/model/uan-mac-rc.cc b/src/uan/model/uan-mac-rc.cc index e86c503c5..6a37e6a2c 100644 --- a/src/uan/model/uan-mac-rc.cc +++ b/src/uan/model/uan-mac-rc.cc @@ -40,8 +40,7 @@ NS_LOG_COMPONENT_DEFINE ("UanMacRc"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanMacRc) - ; +NS_OBJECT_ENSURE_REGISTERED (UanMacRc); Reservation::Reservation () : m_length (0), diff --git a/src/uan/model/uan-mac.cc b/src/uan/model/uan-mac.cc index f9dd40216..d57add264 100644 --- a/src/uan/model/uan-mac.cc +++ b/src/uan/model/uan-mac.cc @@ -22,8 +22,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanMac) - ; +NS_OBJECT_ENSURE_REGISTERED (UanMac); TypeId UanMac::GetTypeId (void) { diff --git a/src/uan/model/uan-net-device.cc b/src/uan/model/uan-net-device.cc index 530a3c4be..79fe6f2ef 100644 --- a/src/uan/model/uan-net-device.cc +++ b/src/uan/model/uan-net-device.cc @@ -34,8 +34,7 @@ NS_LOG_COMPONENT_DEFINE ("UanNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (UanNetDevice); UanNetDevice::UanNetDevice () : NetDevice (), diff --git a/src/uan/model/uan-noise-model-default.cc b/src/uan/model/uan-noise-model-default.cc index 514b4d4bb..2a4043bb1 100644 --- a/src/uan/model/uan-noise-model-default.cc +++ b/src/uan/model/uan-noise-model-default.cc @@ -25,8 +25,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanNoiseModelDefault) - ; +NS_OBJECT_ENSURE_REGISTERED (UanNoiseModelDefault); UanNoiseModelDefault::UanNoiseModelDefault () { diff --git a/src/uan/model/uan-noise-model.cc b/src/uan/model/uan-noise-model.cc index e58972bc9..dc5524a60 100644 --- a/src/uan/model/uan-noise-model.cc +++ b/src/uan/model/uan-noise-model.cc @@ -22,8 +22,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanNoiseModel) - ; +NS_OBJECT_ENSURE_REGISTERED (UanNoiseModel); TypeId UanNoiseModel::GetTypeId (void) { diff --git a/src/uan/model/uan-phy-dual.cc b/src/uan/model/uan-phy-dual.cc index 33da3227f..bd0a1763f 100644 --- a/src/uan/model/uan-phy-dual.cc +++ b/src/uan/model/uan-phy-dual.cc @@ -41,10 +41,8 @@ NS_LOG_COMPONENT_DEFINE ("UanPhyDual"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanPhyDual) - ; -NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrDual) - ; +NS_OBJECT_ENSURE_REGISTERED (UanPhyDual); +NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrDual); UanPhyCalcSinrDual::UanPhyCalcSinrDual () { diff --git a/src/uan/model/uan-phy-gen.cc b/src/uan/model/uan-phy-gen.cc index c9d96ba5d..e830926d0 100644 --- a/src/uan/model/uan-phy-gen.cc +++ b/src/uan/model/uan-phy-gen.cc @@ -40,16 +40,11 @@ NS_LOG_COMPONENT_DEFINE ("UanPhyGen"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanPhyGen) - ; -NS_OBJECT_ENSURE_REGISTERED (UanPhyPerGenDefault) - ; -NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrDefault) - ; -NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrFhFsk) - ; -NS_OBJECT_ENSURE_REGISTERED (UanPhyPerUmodem) - ; +NS_OBJECT_ENSURE_REGISTERED (UanPhyGen); +NS_OBJECT_ENSURE_REGISTERED (UanPhyPerGenDefault); +NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrDefault); +NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrFhFsk); +NS_OBJECT_ENSURE_REGISTERED (UanPhyPerUmodem); /*************** UanPhyCalcSinrDefault definition *****************/ diff --git a/src/uan/model/uan-phy.cc b/src/uan/model/uan-phy.cc index a1432ecff..f29f01883 100644 --- a/src/uan/model/uan-phy.cc +++ b/src/uan/model/uan-phy.cc @@ -22,8 +22,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinr) - ; +NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinr); TypeId UanPhyCalcSinr::GetTypeId (void) { @@ -44,8 +43,7 @@ UanPhyCalcSinr::DoDispose () Object::DoDispose (); } -NS_OBJECT_ENSURE_REGISTERED (UanPhyPer) - ; +NS_OBJECT_ENSURE_REGISTERED (UanPhyPer); TypeId UanPhyPer::GetTypeId (void) { @@ -66,8 +64,7 @@ UanPhyPer::DoDispose () Object::DoDispose (); } -NS_OBJECT_ENSURE_REGISTERED (UanPhy) - ; +NS_OBJECT_ENSURE_REGISTERED (UanPhy); TypeId UanPhy::GetTypeId (void) { diff --git a/src/uan/model/uan-prop-model-ideal.cc b/src/uan/model/uan-prop-model-ideal.cc index 895f0b91a..dbd7167a9 100644 --- a/src/uan/model/uan-prop-model-ideal.cc +++ b/src/uan/model/uan-prop-model-ideal.cc @@ -24,8 +24,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanPropModelIdeal) - ; +NS_OBJECT_ENSURE_REGISTERED (UanPropModelIdeal); UanPropModelIdeal::UanPropModelIdeal () { diff --git a/src/uan/model/uan-prop-model-thorp.cc b/src/uan/model/uan-prop-model-thorp.cc index 668e49a66..a6b3a6288 100644 --- a/src/uan/model/uan-prop-model-thorp.cc +++ b/src/uan/model/uan-prop-model-thorp.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("UanPropModelThorp"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanPropModelThorp) - ; +NS_OBJECT_ENSURE_REGISTERED (UanPropModelThorp); UanPropModelThorp::UanPropModelThorp () { diff --git a/src/uan/model/uan-prop-model.cc b/src/uan/model/uan-prop-model.cc index 64eaad758..9486215ab 100644 --- a/src/uan/model/uan-prop-model.cc +++ b/src/uan/model/uan-prop-model.cc @@ -336,8 +336,7 @@ UanPdp::CreateImpulsePdp (void) return pdp; } -NS_OBJECT_ENSURE_REGISTERED (UanPropModel) - ; +NS_OBJECT_ENSURE_REGISTERED (UanPropModel); TypeId UanPropModel::GetTypeId (void) { diff --git a/src/uan/model/uan-transducer-hd.cc b/src/uan/model/uan-transducer-hd.cc index 6dd3fed25..239214c3c 100644 --- a/src/uan/model/uan-transducer-hd.cc +++ b/src/uan/model/uan-transducer-hd.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("UanTransducerHd"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanTransducerHd) - ; +NS_OBJECT_ENSURE_REGISTERED (UanTransducerHd); UanTransducerHd::UanTransducerHd () : UanTransducer (), diff --git a/src/uan/model/uan-transducer.cc b/src/uan/model/uan-transducer.cc index faca20d51..8b6c4a996 100644 --- a/src/uan/model/uan-transducer.cc +++ b/src/uan/model/uan-transducer.cc @@ -22,8 +22,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanTransducer) - ; +NS_OBJECT_ENSURE_REGISTERED (UanTransducer); TypeId UanTransducer::GetTypeId (void) { diff --git a/src/uan/test/uan-energy-model-test.cc b/src/uan/test/uan-energy-model-test.cc index 9c3d50530..2656b6a1a 100644 --- a/src/uan/test/uan-energy-model-test.cc +++ b/src/uan/test/uan-energy-model-test.cc @@ -38,8 +38,7 @@ using namespace ns3; -NS_LOG_COMPONENT_DEFINE ("UanEnergyModelTestSuite") - ; +NS_LOG_COMPONENT_DEFINE ("UanEnergyModelTestSuite"); class AcousticModemEnergyTestCase : public TestCase { diff --git a/src/virtual-net-device/model/virtual-net-device.cc b/src/virtual-net-device/model/virtual-net-device.cc index f19bc602d..bbbc35515 100644 --- a/src/virtual-net-device/model/virtual-net-device.cc +++ b/src/virtual-net-device/model/virtual-net-device.cc @@ -34,8 +34,7 @@ NS_LOG_COMPONENT_DEFINE ("VirtualNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (VirtualNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (VirtualNetDevice); TypeId VirtualNetDevice::GetTypeId (void) diff --git a/src/visualizer/model/visual-simulator-impl.cc b/src/visualizer/model/visual-simulator-impl.cc index 124b65d96..3d501b356 100644 --- a/src/visualizer/model/visual-simulator-impl.cc +++ b/src/visualizer/model/visual-simulator-impl.cc @@ -28,8 +28,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (VisualSimulatorImpl) - ; +NS_OBJECT_ENSURE_REGISTERED (VisualSimulatorImpl); namespace { diff --git a/src/wifi/helper/athstats-helper.cc b/src/wifi/helper/athstats-helper.cc index b8989e913..4b1afe5a2 100644 --- a/src/wifi/helper/athstats-helper.cc +++ b/src/wifi/helper/athstats-helper.cc @@ -105,8 +105,7 @@ AthstatsHelper::EnableAthstats (std::string filename, NodeContainer n) -NS_OBJECT_ENSURE_REGISTERED (AthstatsWifiTraceSink) - ; +NS_OBJECT_ENSURE_REGISTERED (AthstatsWifiTraceSink); TypeId AthstatsWifiTraceSink::GetTypeId (void) diff --git a/src/wifi/model/aarf-wifi-manager.cc b/src/wifi/model/aarf-wifi-manager.cc index 5b3aac65b..1abbdacdc 100644 --- a/src/wifi/model/aarf-wifi-manager.cc +++ b/src/wifi/model/aarf-wifi-manager.cc @@ -52,8 +52,7 @@ struct AarfWifiRemoteStation : public WifiRemoteStation }; -NS_OBJECT_ENSURE_REGISTERED (AarfWifiManager) - ; +NS_OBJECT_ENSURE_REGISTERED (AarfWifiManager); TypeId AarfWifiManager::GetTypeId (void) diff --git a/src/wifi/model/aarfcd-wifi-manager.cc b/src/wifi/model/aarfcd-wifi-manager.cc index 2328e0de3..0936dcd4a 100644 --- a/src/wifi/model/aarfcd-wifi-manager.cc +++ b/src/wifi/model/aarfcd-wifi-manager.cc @@ -59,8 +59,7 @@ struct AarfcdWifiRemoteStation : public WifiRemoteStation bool m_haveASuccess; }; -NS_OBJECT_ENSURE_REGISTERED (AarfcdWifiManager) - ; +NS_OBJECT_ENSURE_REGISTERED (AarfcdWifiManager); TypeId AarfcdWifiManager::GetTypeId (void) diff --git a/src/wifi/model/adhoc-wifi-mac.cc b/src/wifi/model/adhoc-wifi-mac.cc index 332cc217a..6b66c0a33 100644 --- a/src/wifi/model/adhoc-wifi-mac.cc +++ b/src/wifi/model/adhoc-wifi-mac.cc @@ -40,8 +40,7 @@ NS_LOG_COMPONENT_DEFINE ("AdhocWifiMac"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (AdhocWifiMac) - ; +NS_OBJECT_ENSURE_REGISTERED (AdhocWifiMac); TypeId AdhocWifiMac::GetTypeId (void) diff --git a/src/wifi/model/amrr-wifi-manager.cc b/src/wifi/model/amrr-wifi-manager.cc index fa28482bd..fb9c0ae68 100644 --- a/src/wifi/model/amrr-wifi-manager.cc +++ b/src/wifi/model/amrr-wifi-manager.cc @@ -50,8 +50,7 @@ struct AmrrWifiRemoteStation : public WifiRemoteStation }; -NS_OBJECT_ENSURE_REGISTERED (AmrrWifiManager) - ; +NS_OBJECT_ENSURE_REGISTERED (AmrrWifiManager); TypeId AmrrWifiManager::GetTypeId (void) diff --git a/src/wifi/model/amsdu-subframe-header.cc b/src/wifi/model/amsdu-subframe-header.cc index 86c4ca9e5..62c9776e4 100644 --- a/src/wifi/model/amsdu-subframe-header.cc +++ b/src/wifi/model/amsdu-subframe-header.cc @@ -25,8 +25,7 @@ NS_LOG_COMPONENT_DEFINE ("AmsduSubframeHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (AmsduSubframeHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (AmsduSubframeHeader); TypeId AmsduSubframeHeader::GetTypeId () diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc index 07e3a8de6..eebc9bb9c 100644 --- a/src/wifi/model/ap-wifi-mac.cc +++ b/src/wifi/model/ap-wifi-mac.cc @@ -42,8 +42,7 @@ NS_LOG_COMPONENT_DEFINE ("ApWifiMac"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ApWifiMac) - ; +NS_OBJECT_ENSURE_REGISTERED (ApWifiMac); TypeId ApWifiMac::GetTypeId (void) diff --git a/src/wifi/model/arf-wifi-manager.cc b/src/wifi/model/arf-wifi-manager.cc index 18c8114a9..fd344fe62 100644 --- a/src/wifi/model/arf-wifi-manager.cc +++ b/src/wifi/model/arf-wifi-manager.cc @@ -50,8 +50,7 @@ struct ArfWifiRemoteStation : public WifiRemoteStation uint32_t m_rate; }; -NS_OBJECT_ENSURE_REGISTERED (ArfWifiManager) - ; +NS_OBJECT_ENSURE_REGISTERED (ArfWifiManager); TypeId ArfWifiManager::GetTypeId (void) diff --git a/src/wifi/model/cara-wifi-manager.cc b/src/wifi/model/cara-wifi-manager.cc index 3b9c71373..efdd460e9 100644 --- a/src/wifi/model/cara-wifi-manager.cc +++ b/src/wifi/model/cara-wifi-manager.cc @@ -46,8 +46,7 @@ struct CaraWifiRemoteStation : public WifiRemoteStation uint32_t m_rate; }; -NS_OBJECT_ENSURE_REGISTERED (CaraWifiManager) - ; +NS_OBJECT_ENSURE_REGISTERED (CaraWifiManager); TypeId CaraWifiManager::GetTypeId (void) diff --git a/src/wifi/model/constant-rate-wifi-manager.cc b/src/wifi/model/constant-rate-wifi-manager.cc index 968b7de26..7075ea779 100644 --- a/src/wifi/model/constant-rate-wifi-manager.cc +++ b/src/wifi/model/constant-rate-wifi-manager.cc @@ -30,8 +30,7 @@ NS_LOG_COMPONENT_DEFINE ("ConstantRateWifiManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ConstantRateWifiManager) - ; +NS_OBJECT_ENSURE_REGISTERED (ConstantRateWifiManager); TypeId ConstantRateWifiManager::GetTypeId (void) diff --git a/src/wifi/model/ctrl-headers.cc b/src/wifi/model/ctrl-headers.cc index af82c5e66..bd37fc699 100644 --- a/src/wifi/model/ctrl-headers.cc +++ b/src/wifi/model/ctrl-headers.cc @@ -30,8 +30,7 @@ namespace ns3 { * Block ack request ***********************************/ -NS_OBJECT_ENSURE_REGISTERED (CtrlBAckRequestHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (CtrlBAckRequestHeader); CtrlBAckRequestHeader::CtrlBAckRequestHeader () : m_barAckPolicy (false), @@ -279,8 +278,7 @@ CtrlBAckRequestHeader::IsMultiTid (void) const * Block ack response ***********************************/ -NS_OBJECT_ENSURE_REGISTERED (CtrlBAckResponseHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (CtrlBAckResponseHeader); CtrlBAckResponseHeader::CtrlBAckResponseHeader () : m_baAckPolicy (false), diff --git a/src/wifi/model/dca-txop.cc b/src/wifi/model/dca-txop.cc index 9dae03ffb..9d19b158b 100644 --- a/src/wifi/model/dca-txop.cc +++ b/src/wifi/model/dca-txop.cc @@ -120,8 +120,7 @@ private: DcaTxop *m_txop; }; -NS_OBJECT_ENSURE_REGISTERED (DcaTxop) - ; +NS_OBJECT_ENSURE_REGISTERED (DcaTxop); TypeId DcaTxop::GetTypeId (void) diff --git a/src/wifi/model/dcf.cc b/src/wifi/model/dcf.cc index 7a06521dc..bfacb36c9 100644 --- a/src/wifi/model/dcf.cc +++ b/src/wifi/model/dcf.cc @@ -25,8 +25,7 @@ NS_LOG_COMPONENT_DEFINE ("Dcf"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Dcf) - ; +NS_OBJECT_ENSURE_REGISTERED (Dcf); TypeId Dcf::GetTypeId (void) diff --git a/src/wifi/model/edca-txop-n.cc b/src/wifi/model/edca-txop-n.cc index c62089731..c03bb40b8 100644 --- a/src/wifi/model/edca-txop-n.cc +++ b/src/wifi/model/edca-txop-n.cc @@ -138,8 +138,7 @@ private: EdcaTxopN *m_txop; }; -NS_OBJECT_ENSURE_REGISTERED (EdcaTxopN) - ; +NS_OBJECT_ENSURE_REGISTERED (EdcaTxopN); TypeId EdcaTxopN::GetTypeId (void) diff --git a/src/wifi/model/error-rate-model.cc b/src/wifi/model/error-rate-model.cc index 1be1d9dbf..8cc49a563 100644 --- a/src/wifi/model/error-rate-model.cc +++ b/src/wifi/model/error-rate-model.cc @@ -21,8 +21,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ErrorRateModel) - ; +NS_OBJECT_ENSURE_REGISTERED (ErrorRateModel); TypeId ErrorRateModel::GetTypeId (void) { diff --git a/src/wifi/model/ideal-wifi-manager.cc b/src/wifi/model/ideal-wifi-manager.cc index 3f575c541..b4a540e39 100644 --- a/src/wifi/model/ideal-wifi-manager.cc +++ b/src/wifi/model/ideal-wifi-manager.cc @@ -38,8 +38,7 @@ struct IdealWifiRemoteStation : public WifiRemoteStation double m_lastSnr; //!< SNR of last packet sent to the remote station }; -NS_OBJECT_ENSURE_REGISTERED (IdealWifiManager) - ; +NS_OBJECT_ENSURE_REGISTERED (IdealWifiManager); TypeId IdealWifiManager::GetTypeId (void) diff --git a/src/wifi/model/mgt-headers.cc b/src/wifi/model/mgt-headers.cc index 0c36d3e9e..f5506e89b 100644 --- a/src/wifi/model/mgt-headers.cc +++ b/src/wifi/model/mgt-headers.cc @@ -29,8 +29,7 @@ namespace ns3 { * Probe Request ***********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (MgtProbeRequestHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (MgtProbeRequestHeader); MgtProbeRequestHeader::~MgtProbeRequestHeader () { @@ -123,8 +122,7 @@ MgtProbeRequestHeader::Deserialize (Buffer::Iterator start) * Probe Response ***********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (MgtProbeResponseHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (MgtProbeResponseHeader); MgtProbeResponseHeader::MgtProbeResponseHeader () { @@ -257,8 +255,7 @@ MgtProbeResponseHeader::Deserialize (Buffer::Iterator start) * Assoc Request ***********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (MgtAssocRequestHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (MgtAssocRequestHeader); MgtAssocRequestHeader::MgtAssocRequestHeader () : m_listenInterval (0) @@ -370,8 +367,7 @@ MgtAssocRequestHeader::Deserialize (Buffer::Iterator start) * Assoc Response ***********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (MgtAssocResponseHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (MgtAssocResponseHeader); MgtAssocResponseHeader::MgtAssocResponseHeader () : m_aid (0) @@ -641,8 +637,7 @@ WifiActionHeader::Deserialize (Buffer::Iterator start) * ADDBARequest ****************************************************/ -NS_OBJECT_ENSURE_REGISTERED (MgtAddBaRequestHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (MgtAddBaRequestHeader); MgtAddBaRequestHeader::MgtAddBaRequestHeader () : m_dialogToken (1), @@ -818,8 +813,7 @@ MgtAddBaRequestHeader::SetParameterSet (uint16_t params) * ADDBAResponse ****************************************************/ -NS_OBJECT_ENSURE_REGISTERED (MgtAddBaResponseHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (MgtAddBaResponseHeader); MgtAddBaResponseHeader::MgtAddBaResponseHeader () : m_dialogToken (1), @@ -985,8 +979,7 @@ MgtAddBaResponseHeader::SetParameterSet (uint16_t params) * DelBa ****************************************************/ -NS_OBJECT_ENSURE_REGISTERED (MgtDelBaHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (MgtDelBaHeader); MgtDelBaHeader::MgtDelBaHeader () : m_reasonCode (1) diff --git a/src/wifi/model/minstrel-wifi-manager.cc b/src/wifi/model/minstrel-wifi-manager.cc index 8b02f63ff..a249e4a2b 100644 --- a/src/wifi/model/minstrel-wifi-manager.cc +++ b/src/wifi/model/minstrel-wifi-manager.cc @@ -83,8 +83,7 @@ struct MinstrelWifiRemoteStation : public WifiRemoteStation bool m_initialized; ///< for initializing tables }; -NS_OBJECT_ENSURE_REGISTERED (MinstrelWifiManager) - ; +NS_OBJECT_ENSURE_REGISTERED (MinstrelWifiManager); TypeId MinstrelWifiManager::GetTypeId (void) diff --git a/src/wifi/model/msdu-aggregator.cc b/src/wifi/model/msdu-aggregator.cc index 39ae73c04..fb5eb2446 100644 --- a/src/wifi/model/msdu-aggregator.cc +++ b/src/wifi/model/msdu-aggregator.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("MsduAggregator"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MsduAggregator) - ; +NS_OBJECT_ENSURE_REGISTERED (MsduAggregator); TypeId MsduAggregator::GetTypeId (void) diff --git a/src/wifi/model/msdu-standard-aggregator.cc b/src/wifi/model/msdu-standard-aggregator.cc index 9820c83c2..c77516506 100644 --- a/src/wifi/model/msdu-standard-aggregator.cc +++ b/src/wifi/model/msdu-standard-aggregator.cc @@ -27,8 +27,7 @@ NS_LOG_COMPONENT_DEFINE ("MsduStandardAggregator"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MsduStandardAggregator) - ; +NS_OBJECT_ENSURE_REGISTERED (MsduStandardAggregator); TypeId MsduStandardAggregator::GetTypeId (void) diff --git a/src/wifi/model/nist-error-rate-model.cc b/src/wifi/model/nist-error-rate-model.cc index c7a699c1c..8d2378712 100644 --- a/src/wifi/model/nist-error-rate-model.cc +++ b/src/wifi/model/nist-error-rate-model.cc @@ -27,8 +27,7 @@ NS_LOG_COMPONENT_DEFINE ("NistErrorRateModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (NistErrorRateModel) - ; +NS_OBJECT_ENSURE_REGISTERED (NistErrorRateModel); TypeId NistErrorRateModel::GetTypeId (void) diff --git a/src/wifi/model/onoe-wifi-manager.cc b/src/wifi/model/onoe-wifi-manager.cc index 9f98c7691..279a01059 100644 --- a/src/wifi/model/onoe-wifi-manager.cc +++ b/src/wifi/model/onoe-wifi-manager.cc @@ -48,8 +48,7 @@ struct OnoeWifiRemoteStation : public WifiRemoteStation }; -NS_OBJECT_ENSURE_REGISTERED (OnoeWifiManager) - ; +NS_OBJECT_ENSURE_REGISTERED (OnoeWifiManager); TypeId OnoeWifiManager::GetTypeId (void) diff --git a/src/wifi/model/qos-tag.cc b/src/wifi/model/qos-tag.cc index 7d73fb0bb..bbc2a4125 100644 --- a/src/wifi/model/qos-tag.cc +++ b/src/wifi/model/qos-tag.cc @@ -23,8 +23,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (QosTag) - ; +NS_OBJECT_ENSURE_REGISTERED (QosTag); TypeId QosTag::GetTypeId (void) diff --git a/src/wifi/model/regular-wifi-mac.cc b/src/wifi/model/regular-wifi-mac.cc index b31ecc224..bbabf11af 100644 --- a/src/wifi/model/regular-wifi-mac.cc +++ b/src/wifi/model/regular-wifi-mac.cc @@ -38,8 +38,7 @@ NS_LOG_COMPONENT_DEFINE ("RegularWifiMac"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RegularWifiMac) - ; +NS_OBJECT_ENSURE_REGISTERED (RegularWifiMac); RegularWifiMac::RegularWifiMac () { diff --git a/src/wifi/model/rraa-wifi-manager.cc b/src/wifi/model/rraa-wifi-manager.cc index e966cb9a1..de69c8e10 100644 --- a/src/wifi/model/rraa-wifi-manager.cc +++ b/src/wifi/model/rraa-wifi-manager.cc @@ -52,8 +52,7 @@ struct RraaWifiRemoteStation : public WifiRemoteStation uint32_t m_rate; }; -NS_OBJECT_ENSURE_REGISTERED (RraaWifiManager) - ; +NS_OBJECT_ENSURE_REGISTERED (RraaWifiManager); TypeId RraaWifiManager::GetTypeId (void) diff --git a/src/wifi/model/snr-tag.cc b/src/wifi/model/snr-tag.cc index dc86557e2..92ff352c0 100644 --- a/src/wifi/model/snr-tag.cc +++ b/src/wifi/model/snr-tag.cc @@ -28,8 +28,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SnrTag) - ; +NS_OBJECT_ENSURE_REGISTERED (SnrTag); TypeId SnrTag::GetTypeId (void) diff --git a/src/wifi/model/sta-wifi-mac.cc b/src/wifi/model/sta-wifi-mac.cc index 53b80d67e..aafec75a8 100644 --- a/src/wifi/model/sta-wifi-mac.cc +++ b/src/wifi/model/sta-wifi-mac.cc @@ -60,8 +60,7 @@ NS_LOG_COMPONENT_DEFINE ("StaWifiMac"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (StaWifiMac) - ; +NS_OBJECT_ENSURE_REGISTERED (StaWifiMac); TypeId StaWifiMac::GetTypeId (void) diff --git a/src/wifi/model/wifi-channel.cc b/src/wifi/model/wifi-channel.cc index 7f0afc11e..59295d842 100644 --- a/src/wifi/model/wifi-channel.cc +++ b/src/wifi/model/wifi-channel.cc @@ -35,8 +35,7 @@ NS_LOG_COMPONENT_DEFINE ("WifiChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiChannel) - ; +NS_OBJECT_ENSURE_REGISTERED (WifiChannel); TypeId WifiChannel::GetTypeId (void) diff --git a/src/wifi/model/wifi-information-element-vector.cc b/src/wifi/model/wifi-information-element-vector.cc index 8e4f86819..d3d0079ac 100644 --- a/src/wifi/model/wifi-information-element-vector.cc +++ b/src/wifi/model/wifi-information-element-vector.cc @@ -24,8 +24,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiInformationElementVector) - ; +NS_OBJECT_ENSURE_REGISTERED (WifiInformationElementVector); WifiInformationElementVector::WifiInformationElementVector () : m_maxSize (1500) diff --git a/src/wifi/model/wifi-mac-header.cc b/src/wifi/model/wifi-mac-header.cc index 7482635f2..3902b7729 100644 --- a/src/wifi/model/wifi-mac-header.cc +++ b/src/wifi/model/wifi-mac-header.cc @@ -25,8 +25,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiMacHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (WifiMacHeader); enum { diff --git a/src/wifi/model/wifi-mac-queue.cc b/src/wifi/model/wifi-mac-queue.cc index b2a668634..d7575eeec 100644 --- a/src/wifi/model/wifi-mac-queue.cc +++ b/src/wifi/model/wifi-mac-queue.cc @@ -29,8 +29,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiMacQueue) - ; +NS_OBJECT_ENSURE_REGISTERED (WifiMacQueue); WifiMacQueue::Item::Item (Ptr packet, const WifiMacHeader &hdr, diff --git a/src/wifi/model/wifi-mac-trailer.cc b/src/wifi/model/wifi-mac-trailer.cc index 5ab88bd5b..bb4579e42 100644 --- a/src/wifi/model/wifi-mac-trailer.cc +++ b/src/wifi/model/wifi-mac-trailer.cc @@ -22,8 +22,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiMacTrailer) - ; +NS_OBJECT_ENSURE_REGISTERED (WifiMacTrailer); WifiMacTrailer::WifiMacTrailer () { diff --git a/src/wifi/model/wifi-mac.cc b/src/wifi/model/wifi-mac.cc index 3250e145e..e3f4e96bc 100644 --- a/src/wifi/model/wifi-mac.cc +++ b/src/wifi/model/wifi-mac.cc @@ -24,8 +24,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiMac) - ; +NS_OBJECT_ENSURE_REGISTERED (WifiMac); Time diff --git a/src/wifi/model/wifi-net-device.cc b/src/wifi/model/wifi-net-device.cc index abfecb931..6e6dee136 100644 --- a/src/wifi/model/wifi-net-device.cc +++ b/src/wifi/model/wifi-net-device.cc @@ -34,8 +34,7 @@ NS_LOG_COMPONENT_DEFINE ("WifiNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (WifiNetDevice); TypeId WifiNetDevice::GetTypeId (void) diff --git a/src/wifi/model/wifi-phy-state-helper.cc b/src/wifi/model/wifi-phy-state-helper.cc index faab3fc95..b90ef7708 100644 --- a/src/wifi/model/wifi-phy-state-helper.cc +++ b/src/wifi/model/wifi-phy-state-helper.cc @@ -26,8 +26,7 @@ NS_LOG_COMPONENT_DEFINE ("WifiPhyStateHelper"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiPhyStateHelper) - ; +NS_OBJECT_ENSURE_REGISTERED (WifiPhyStateHelper); TypeId WifiPhyStateHelper::GetTypeId (void) diff --git a/src/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc index 4c4c60b3e..6fb35b9c8 100644 --- a/src/wifi/model/wifi-phy.cc +++ b/src/wifi/model/wifi-phy.cc @@ -48,8 +48,7 @@ WifiPhyListener::~WifiPhyListener () * The actual WifiPhy class ****************************************************************/ -NS_OBJECT_ENSURE_REGISTERED (WifiPhy) - ; +NS_OBJECT_ENSURE_REGISTERED (WifiPhy); TypeId WifiPhy::GetTypeId (void) diff --git a/src/wifi/model/wifi-remote-station-manager.cc b/src/wifi/model/wifi-remote-station-manager.cc index 747f9b590..15bb3fef6 100644 --- a/src/wifi/model/wifi-remote-station-manager.cc +++ b/src/wifi/model/wifi-remote-station-manager.cc @@ -249,8 +249,7 @@ HighLatencyCtsToSelfTxVectorTag::Print (std::ostream &os) const namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiRemoteStationManager) - ; +NS_OBJECT_ENSURE_REGISTERED (WifiRemoteStationManager); TypeId WifiRemoteStationManager::GetTypeId (void) diff --git a/src/wifi/model/yans-error-rate-model.cc b/src/wifi/model/yans-error-rate-model.cc index e2be83a4b..bb168fbd7 100644 --- a/src/wifi/model/yans-error-rate-model.cc +++ b/src/wifi/model/yans-error-rate-model.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("YansErrorRateModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (YansErrorRateModel) - ; +NS_OBJECT_ENSURE_REGISTERED (YansErrorRateModel); TypeId YansErrorRateModel::GetTypeId (void) diff --git a/src/wifi/model/yans-wifi-channel.cc b/src/wifi/model/yans-wifi-channel.cc index 28be0f8aa..01842901d 100644 --- a/src/wifi/model/yans-wifi-channel.cc +++ b/src/wifi/model/yans-wifi-channel.cc @@ -34,8 +34,7 @@ NS_LOG_COMPONENT_DEFINE ("YansWifiChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (YansWifiChannel) - ; +NS_OBJECT_ENSURE_REGISTERED (YansWifiChannel); TypeId YansWifiChannel::GetTypeId (void) diff --git a/src/wifi/model/yans-wifi-phy.cc b/src/wifi/model/yans-wifi-phy.cc index 2f8b0f339..6b89d9ab3 100644 --- a/src/wifi/model/yans-wifi-phy.cc +++ b/src/wifi/model/yans-wifi-phy.cc @@ -42,8 +42,7 @@ NS_LOG_COMPONENT_DEFINE ("YansWifiPhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (YansWifiPhy) - ; +NS_OBJECT_ENSURE_REGISTERED (YansWifiPhy); TypeId YansWifiPhy::GetTypeId (void) diff --git a/src/wimax/model/bandwidth-manager.cc b/src/wimax/model/bandwidth-manager.cc index 843fc4cac..1772233e1 100644 --- a/src/wimax/model/bandwidth-manager.cc +++ b/src/wimax/model/bandwidth-manager.cc @@ -37,8 +37,7 @@ NS_LOG_COMPONENT_DEFINE ("BandwidthManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BandwidthManager) - ; +NS_OBJECT_ENSURE_REGISTERED (BandwidthManager); TypeId BandwidthManager::GetTypeId (void) { diff --git a/src/wimax/model/bs-link-manager.cc b/src/wimax/model/bs-link-manager.cc index c24d4d217..9dc50231f 100644 --- a/src/wimax/model/bs-link-manager.cc +++ b/src/wimax/model/bs-link-manager.cc @@ -36,8 +36,7 @@ NS_LOG_COMPONENT_DEFINE ("BSLinkManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BSLinkManager) - ; +NS_OBJECT_ENSURE_REGISTERED (BSLinkManager); TypeId BSLinkManager::GetTypeId (void) { diff --git a/src/wimax/model/bs-net-device.cc b/src/wimax/model/bs-net-device.cc index 9a4e7e672..5d2ae5471 100644 --- a/src/wimax/model/bs-net-device.cc +++ b/src/wimax/model/bs-net-device.cc @@ -50,8 +50,7 @@ NS_LOG_COMPONENT_DEFINE ("BaseStationNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BaseStationNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (BaseStationNetDevice); TypeId BaseStationNetDevice::GetTypeId (void) { diff --git a/src/wimax/model/bs-scheduler-rtps.cc b/src/wimax/model/bs-scheduler-rtps.cc index 9f7e042fe..d3c6031e7 100644 --- a/src/wimax/model/bs-scheduler-rtps.cc +++ b/src/wimax/model/bs-scheduler-rtps.cc @@ -41,8 +41,7 @@ NS_LOG_COMPONENT_DEFINE ("BSSchedulerRtps"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BSSchedulerRtps) - ; +NS_OBJECT_ENSURE_REGISTERED (BSSchedulerRtps); TypeId BSSchedulerRtps::GetTypeId (void) diff --git a/src/wimax/model/bs-scheduler-simple.cc b/src/wimax/model/bs-scheduler-simple.cc index c8069b4ae..56c89e5df 100644 --- a/src/wimax/model/bs-scheduler-simple.cc +++ b/src/wimax/model/bs-scheduler-simple.cc @@ -39,8 +39,7 @@ NS_LOG_COMPONENT_DEFINE ("BSSchedulerSimple"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BSSchedulerSimple) - ; +NS_OBJECT_ENSURE_REGISTERED (BSSchedulerSimple); TypeId BSSchedulerSimple::GetTypeId (void) { diff --git a/src/wimax/model/bs-scheduler.cc b/src/wimax/model/bs-scheduler.cc index 5c343e594..9d4dd4302 100644 --- a/src/wimax/model/bs-scheduler.cc +++ b/src/wimax/model/bs-scheduler.cc @@ -38,8 +38,7 @@ NS_LOG_COMPONENT_DEFINE ("BSScheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BSScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (BSScheduler); TypeId BSScheduler::GetTypeId (void) diff --git a/src/wimax/model/bs-uplink-scheduler-mbqos.cc b/src/wimax/model/bs-uplink-scheduler-mbqos.cc index 84abb56c1..8b2155cb7 100644 --- a/src/wimax/model/bs-uplink-scheduler-mbqos.cc +++ b/src/wimax/model/bs-uplink-scheduler-mbqos.cc @@ -33,8 +33,7 @@ NS_LOG_COMPONENT_DEFINE ("UplinkSchedulerMBQoS"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerMBQoS) - ; +NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerMBQoS); UplinkSchedulerMBQoS::UplinkSchedulerMBQoS () { diff --git a/src/wimax/model/bs-uplink-scheduler-rtps.cc b/src/wimax/model/bs-uplink-scheduler-rtps.cc index a649081a7..a474ebf65 100644 --- a/src/wimax/model/bs-uplink-scheduler-rtps.cc +++ b/src/wimax/model/bs-uplink-scheduler-rtps.cc @@ -36,8 +36,7 @@ NS_LOG_COMPONENT_DEFINE ("UplinkSchedulerRtps"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED ( UplinkSchedulerRtps) - ; +NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerRtps); UplinkSchedulerRtps::UplinkSchedulerRtps () diff --git a/src/wimax/model/bs-uplink-scheduler-simple.cc b/src/wimax/model/bs-uplink-scheduler-simple.cc index 8c73c87c6..22e44292c 100644 --- a/src/wimax/model/bs-uplink-scheduler-simple.cc +++ b/src/wimax/model/bs-uplink-scheduler-simple.cc @@ -35,8 +35,7 @@ NS_LOG_COMPONENT_DEFINE ("UplinkSchedulerSimple"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerSimple) - ; +NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerSimple); UplinkSchedulerSimple::UplinkSchedulerSimple (void) { diff --git a/src/wimax/model/bs-uplink-scheduler.cc b/src/wimax/model/bs-uplink-scheduler.cc index 33bddabe1..855509b9c 100644 --- a/src/wimax/model/bs-uplink-scheduler.cc +++ b/src/wimax/model/bs-uplink-scheduler.cc @@ -36,8 +36,7 @@ NS_LOG_COMPONENT_DEFINE ("UplinkScheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UplinkScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (UplinkScheduler); UplinkScheduler::UplinkScheduler (void) : m_bs (0), diff --git a/src/wimax/model/burst-profile-manager.cc b/src/wimax/model/burst-profile-manager.cc index 73d408608..4bc4ebaaa 100644 --- a/src/wimax/model/burst-profile-manager.cc +++ b/src/wimax/model/burst-profile-manager.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("BurstProfileManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BurstProfileManager) - ; +NS_OBJECT_ENSURE_REGISTERED (BurstProfileManager); TypeId BurstProfileManager::GetTypeId (void) { diff --git a/src/wimax/model/connection-manager.cc b/src/wimax/model/connection-manager.cc index 123490a5f..2cca97390 100644 --- a/src/wimax/model/connection-manager.cc +++ b/src/wimax/model/connection-manager.cc @@ -35,8 +35,7 @@ NS_LOG_COMPONENT_DEFINE ("ConnectionManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ConnectionManager) - ; +NS_OBJECT_ENSURE_REGISTERED (ConnectionManager); TypeId ConnectionManager::GetTypeId (void) { diff --git a/src/wimax/model/dl-mac-messages.cc b/src/wimax/model/dl-mac-messages.cc index 56239ab05..ae0fd6d51 100644 --- a/src/wimax/model/dl-mac-messages.cc +++ b/src/wimax/model/dl-mac-messages.cc @@ -312,8 +312,7 @@ OfdmDlBurstProfile::Read (Buffer::Iterator start) // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (Dcd) - ; +NS_OBJECT_ENSURE_REGISTERED (Dcd); Dcd::Dcd (void) : m_reserved (0), @@ -545,8 +544,7 @@ OfdmDlMapIe::Read (Buffer::Iterator start) // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (DlMap) - ; +NS_OBJECT_ENSURE_REGISTERED (DlMap); DlMap::DlMap (void) : m_dcdCount (0), diff --git a/src/wimax/model/ipcs-classifier.cc b/src/wimax/model/ipcs-classifier.cc index a3398f8f1..2eae1d756 100644 --- a/src/wimax/model/ipcs-classifier.cc +++ b/src/wimax/model/ipcs-classifier.cc @@ -35,8 +35,7 @@ NS_LOG_COMPONENT_DEFINE ("IpcsClassifier"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (IpcsClassifier) - ; +NS_OBJECT_ENSURE_REGISTERED (IpcsClassifier); TypeId IpcsClassifier::GetTypeId (void) { diff --git a/src/wimax/model/mac-messages.cc b/src/wimax/model/mac-messages.cc index 3dffe6e35..e0027fa7d 100644 --- a/src/wimax/model/mac-messages.cc +++ b/src/wimax/model/mac-messages.cc @@ -27,10 +27,10 @@ #include "wimax-tlv.h" NS_LOG_COMPONENT_DEFINE ("MACMESSAGES"); + namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ManagementMessageType) - ; +NS_OBJECT_ENSURE_REGISTERED (ManagementMessageType); ManagementMessageType::ManagementMessageType (void) : m_type (~0) @@ -105,10 +105,9 @@ ManagementMessageType::Deserialize (Buffer::Iterator start) return i.GetDistanceFrom (start); } -// ---------------------------------------------------------------------------------------------------------- +// --------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (RngReq) - ; +NS_OBJECT_ENSURE_REGISTERED (RngReq); RngReq::RngReq (void) : m_reserved (0), @@ -220,10 +219,9 @@ RngReq::Deserialize (Buffer::Iterator start) return i.GetDistanceFrom (start); } -// ---------------------------------------------------------------------------------------------------------- +// --------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (RngRsp) - ; +NS_OBJECT_ENSURE_REGISTERED (RngRsp); RngRsp::RngRsp (void) : m_reserved (0), @@ -498,10 +496,9 @@ RngRsp::Deserialize (Buffer::Iterator start) return i.GetDistanceFrom (start); } -// ---------------------------------------------------------------------------------------------------------------------- +// --------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (DsaReq) - ; +NS_OBJECT_ENSURE_REGISTERED (DsaReq); DsaReq::DsaReq (void) : m_transactionId (0), @@ -633,10 +630,9 @@ DsaReq::SetServiceFlow (ServiceFlow sf) m_serviceFlow = sf; } -// ---------------------------------------------------------------------------------------------------------------------- +// --------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (DsaRsp) - ; +NS_OBJECT_ENSURE_REGISTERED (DsaRsp); DsaRsp::DsaRsp (void) : m_transactionId (0), @@ -774,10 +770,9 @@ DsaRsp::Deserialize (Buffer::Iterator start) return size + 3; } -// ---------------------------------------------------------------------------------------------------------- +// --------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (DsaAck) - ; +NS_OBJECT_ENSURE_REGISTERED (DsaAck); DsaAck::DsaAck (void) : m_transactionId (0), diff --git a/src/wimax/model/service-flow-manager.cc b/src/wimax/model/service-flow-manager.cc index 6865003e7..2d3eda046 100644 --- a/src/wimax/model/service-flow-manager.cc +++ b/src/wimax/model/service-flow-manager.cc @@ -43,8 +43,7 @@ NS_LOG_COMPONENT_DEFINE ("ServiceFlowManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ServiceFlowManager) - ; +NS_OBJECT_ENSURE_REGISTERED (ServiceFlowManager); TypeId ServiceFlowManager::GetTypeId (void) { diff --git a/src/wimax/model/simple-ofdm-wimax-phy.cc b/src/wimax/model/simple-ofdm-wimax-phy.cc index 10f1f2852..0e65e4199 100644 --- a/src/wimax/model/simple-ofdm-wimax-phy.cc +++ b/src/wimax/model/simple-ofdm-wimax-phy.cc @@ -38,8 +38,7 @@ NS_LOG_COMPONENT_DEFINE ("SimpleOfdmWimaxPhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SimpleOfdmWimaxPhy) - ; +NS_OBJECT_ENSURE_REGISTERED (SimpleOfdmWimaxPhy); TypeId SimpleOfdmWimaxPhy::GetTypeId (void) { diff --git a/src/wimax/model/ss-link-manager.cc b/src/wimax/model/ss-link-manager.cc index fcb262f5e..ba99cf55b 100644 --- a/src/wimax/model/ss-link-manager.cc +++ b/src/wimax/model/ss-link-manager.cc @@ -35,8 +35,7 @@ NS_LOG_COMPONENT_DEFINE ("SSLinkManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SSLinkManager) - ; +NS_OBJECT_ENSURE_REGISTERED (SSLinkManager); TypeId SSLinkManager::GetTypeId (void) { diff --git a/src/wimax/model/ss-manager.cc b/src/wimax/model/ss-manager.cc index 339ac3cb2..689957e57 100644 --- a/src/wimax/model/ss-manager.cc +++ b/src/wimax/model/ss-manager.cc @@ -28,8 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("SSManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SSManager) - ; +NS_OBJECT_ENSURE_REGISTERED (SSManager); TypeId SSManager::GetTypeId (void) { diff --git a/src/wimax/model/ss-net-device.cc b/src/wimax/model/ss-net-device.cc index 96a4fc184..19a0a225c 100644 --- a/src/wimax/model/ss-net-device.cc +++ b/src/wimax/model/ss-net-device.cc @@ -46,8 +46,7 @@ NS_LOG_COMPONENT_DEFINE ("SubscriberStationNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SubscriberStationNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (SubscriberStationNetDevice); Time SubscriberStationNetDevice::GetDefaultLostDlMapInterval () { diff --git a/src/wimax/model/ss-scheduler.cc b/src/wimax/model/ss-scheduler.cc index 773505142..02814229f 100644 --- a/src/wimax/model/ss-scheduler.cc +++ b/src/wimax/model/ss-scheduler.cc @@ -34,8 +34,7 @@ NS_LOG_COMPONENT_DEFINE ("SSScheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SSScheduler) - ; +NS_OBJECT_ENSURE_REGISTERED (SSScheduler); TypeId SSScheduler::GetTypeId (void) { diff --git a/src/wimax/model/ul-mac-messages.cc b/src/wimax/model/ul-mac-messages.cc index 5c6b7c9ad..fae6080a7 100644 --- a/src/wimax/model/ul-mac-messages.cc +++ b/src/wimax/model/ul-mac-messages.cc @@ -25,8 +25,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ucd) - ; +NS_OBJECT_ENSURE_REGISTERED (Ucd); UcdChannelEncodings::UcdChannelEncodings (void) : m_bwReqOppSize (0), @@ -578,8 +577,7 @@ OfdmUlMapIe::Read (Buffer::Iterator start) // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (UlMap) - ; +NS_OBJECT_ENSURE_REGISTERED (UlMap); UlMap::UlMap (void) : m_reserved (0), diff --git a/src/wimax/model/wimax-channel.cc b/src/wimax/model/wimax-channel.cc index 0bcb2d1f9..c877d6c3d 100644 --- a/src/wimax/model/wimax-channel.cc +++ b/src/wimax/model/wimax-channel.cc @@ -27,8 +27,7 @@ NS_LOG_COMPONENT_DEFINE ("WimaxChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WimaxChannel) - ; +NS_OBJECT_ENSURE_REGISTERED (WimaxChannel); TypeId WimaxChannel::GetTypeId (void) { diff --git a/src/wimax/model/wimax-connection.cc b/src/wimax/model/wimax-connection.cc index 9ee3dd228..a396e95c6 100644 --- a/src/wimax/model/wimax-connection.cc +++ b/src/wimax/model/wimax-connection.cc @@ -27,8 +27,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WimaxConnection) - ; +NS_OBJECT_ENSURE_REGISTERED (WimaxConnection); TypeId WimaxConnection::GetTypeId (void) { diff --git a/src/wimax/model/wimax-mac-header.cc b/src/wimax/model/wimax-mac-header.cc index 0a95362da..afa1602c7 100644 --- a/src/wimax/model/wimax-mac-header.cc +++ b/src/wimax/model/wimax-mac-header.cc @@ -25,8 +25,7 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MacHeaderType) - ; +NS_OBJECT_ENSURE_REGISTERED (MacHeaderType); MacHeaderType::MacHeaderType (void) : m_type (0) @@ -93,8 +92,7 @@ uint32_t MacHeaderType::Deserialize (Buffer::Iterator start) // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (GenericMacHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (GenericMacHeader); GenericMacHeader::GenericMacHeader (void) : m_ht (0), @@ -298,8 +296,7 @@ bool GenericMacHeader::check_hcs (void) const // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (BandwidthRequestHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (BandwidthRequestHeader); BandwidthRequestHeader::BandwidthRequestHeader (void) : m_ht (1), @@ -481,8 +478,7 @@ bool BandwidthRequestHeader::check_hcs (void) const // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (GrantManagementSubheader) - ; +NS_OBJECT_ENSURE_REGISTERED (GrantManagementSubheader); GrantManagementSubheader::GrantManagementSubheader (void) : m_si (0), @@ -573,8 +569,7 @@ uint32_t GrantManagementSubheader::Deserialize (Buffer::Iterator start) // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (FragmentationSubheader) - ; +NS_OBJECT_ENSURE_REGISTERED (FragmentationSubheader); FragmentationSubheader::FragmentationSubheader (void) : m_fc (0), diff --git a/src/wimax/model/wimax-mac-queue.cc b/src/wimax/model/wimax-mac-queue.cc index 96b94b006..b537505e4 100644 --- a/src/wimax/model/wimax-mac-queue.cc +++ b/src/wimax/model/wimax-mac-queue.cc @@ -31,8 +31,7 @@ NS_LOG_COMPONENT_DEFINE ("WimaxMacQueue"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WimaxMacQueue) - ; +NS_OBJECT_ENSURE_REGISTERED (WimaxMacQueue); WimaxMacQueue::QueueElement::QueueElement (void) : m_packet (Create ()), diff --git a/src/wimax/model/wimax-mac-to-mac-header.cc b/src/wimax/model/wimax-mac-to-mac-header.cc index b61db932c..6bd3accc2 100644 --- a/src/wimax/model/wimax-mac-to-mac-header.cc +++ b/src/wimax/model/wimax-mac-to-mac-header.cc @@ -24,8 +24,7 @@ #include "ns3/log.h" namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WimaxMacToMacHeader) - ; +NS_OBJECT_ENSURE_REGISTERED (WimaxMacToMacHeader); WimaxMacToMacHeader::WimaxMacToMacHeader (void) : m_len (0) diff --git a/src/wimax/model/wimax-net-device.cc b/src/wimax/model/wimax-net-device.cc index f56beed43..46c8836cb 100644 --- a/src/wimax/model/wimax-net-device.cc +++ b/src/wimax/model/wimax-net-device.cc @@ -43,8 +43,7 @@ NS_LOG_COMPONENT_DEFINE ("WimaxNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WimaxNetDevice) - ; +NS_OBJECT_ENSURE_REGISTERED (WimaxNetDevice); uint32_t WimaxNetDevice::m_nrFrames = 0; uint8_t WimaxNetDevice::m_direction = ~0; diff --git a/src/wimax/model/wimax-phy.cc b/src/wimax/model/wimax-phy.cc index 70bfdecaa..23093f0a6 100644 --- a/src/wimax/model/wimax-phy.cc +++ b/src/wimax/model/wimax-phy.cc @@ -34,8 +34,7 @@ NS_LOG_COMPONENT_DEFINE ("WimaxPhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WimaxPhy) - ; +NS_OBJECT_ENSURE_REGISTERED (WimaxPhy); TypeId WimaxPhy::GetTypeId (void) {