F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix clang-tidy modernize-redundant-void-arg warnings

Browse Source
This commit is contained in:
Eduardo Almeida
2022-10-06 21:33:49 +00:00
parent 27c86ec146
commit 6bb6383562
1770 changed files with 13034 additions and 13034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/stats/wifi-example-apps.cc
View File

@@ -40,7 +40,7 @@ using namespace ns3;
NS_LOG_COMPONENT_DEFINE ("WiFiDistanceApps");
TypeId
Sender::GetTypeId (void)
Sender::GetTypeId ()
{
static TypeId tid = TypeId ("Sender")
.SetParent<Application> ()
@@ -86,7 +86,7 @@ Sender::~Sender()
}
void
Sender::DoDispose (void)
Sender::DoDispose ()
{
NS_LOG_FUNCTION_NOARGS ();
@@ -155,7 +155,7 @@ void Sender::SendPacket ()
//-- Receiver
//------------------------------------------------------
TypeId
Receiver::GetTypeId (void)
Receiver::GetTypeId ()
{
static TypeId tid = TypeId ("Receiver")
.SetParent<Application> ()
@@ -182,7 +182,7 @@ Receiver::~Receiver()
}
void
Receiver::DoDispose (void)
Receiver::DoDispose ()
{
NS_LOG_FUNCTION_NOARGS ();
@@ -276,7 +276,7 @@ Receiver::Receive (Ptr<Socket> socket)
//-- TimestampTag
//------------------------------------------------------
TypeId
TimestampTag::GetTypeId (void)
TimestampTag::GetTypeId ()
{
static TypeId tid = TypeId ("TimestampTag")
.SetParent<Tag> ()
@@ -290,13 +290,13 @@ TimestampTag::GetTypeId (void)
return tid;
}
TypeId
TimestampTag::GetInstanceTypeId (void) const
TimestampTag::GetInstanceTypeId () const
{
return GetTypeId ();
}
uint32_t
TimestampTag::GetSerializedSize (void) const
TimestampTag::GetSerializedSize () const
{
return 8;
}
@@ -320,7 +320,7 @@ TimestampTag::SetTimestamp (Time time)
m_timestamp = time;
}
Time
TimestampTag::GetTimestamp (void) const
TimestampTag::GetTimestamp () const
{
return m_timestamp;
}

24
examples/stats/wifi-example-apps.h
View File

@@ -42,16 +42,16 @@ public:
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
Sender();
virtual ~Sender();
protected:
virtual void DoDispose (void);
virtual void DoDispose ();
private:
virtual void StartApplication (void);
virtual void StopApplication (void);
virtual void StartApplication ();
virtual void StopApplication ();
/**
* Send a packet.
@@ -85,7 +85,7 @@ public:
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
Receiver();
virtual ~Receiver();
@@ -102,11 +102,11 @@ public:
void SetDelayTracker (Ptr<TimeMinMaxAvgTotalCalculator> delay);
protected:
virtual void DoDispose (void);
virtual void DoDispose ();
private:
virtual void StartApplication (void);
virtual void StopApplication (void);
virtual void StartApplication ();
virtual void StopApplication ();
/**
* Receive a packet.
@@ -137,10 +137,10 @@ public:
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
virtual TypeId GetInstanceTypeId (void) const;
static TypeId GetTypeId ();
virtual TypeId GetInstanceTypeId () const;
virtual uint32_t GetSerializedSize (void) const;
virtual uint32_t GetSerializedSize () const;
virtual void Serialize (TagBuffer i) const;
virtual void Deserialize (TagBuffer i);
@@ -153,7 +153,7 @@ public:
* Get the timestamp.
* \return the timestamp.
*/
Time GetTimestamp (void) const;
Time GetTimestamp () const;
void Print (std::ostream &os) const;

2
examples/tcp/dctcp-example.cc
View File

@@ -141,7 +141,7 @@ TraceS3R1Sink (std::size_t index, Ptr<const Packet> p, const Address& a)
}
void
InitializeCounters (void)
InitializeCounters ()
{
for (std::size_t i = 0; i < 10; i++)
{

2
examples/tcp/tcp-pacing.cc
View File

@@ -133,7 +133,7 @@ RxTracer (Ptr<const Packet> p, Ptr<Ipv4> ipv4, uint32_t interface)
}
void
ConnectSocketTraces (void)
ConnectSocketTraces ()
{
Config::ConnectWithoutContext ("/NodeList/0/$ns3::TcpL4Protocol/SocketList/0/CongestionWindow", MakeCallback (&CwndTracer));
Config::ConnectWithoutContext ("/NodeList/0/$ns3::TcpL4Protocol/SocketList/0/PacingRate", MakeCallback (&PacingRateTracer));

4
examples/tcp/tcp-validation.cc
View File

@@ -545,7 +545,7 @@ ScheduleSecondDctcpTraceConnection (std::ofstream* ofStream)
* Schedule trace connection.
*/
void
ScheduleFirstPacketSinkConnection (void)
ScheduleFirstPacketSinkConnection ()
{
Config::ConnectWithoutContextFailSafe ("/NodeList/6/ApplicationList/*/$ns3::PacketSink/Rx", MakeCallback (&TraceFirstRx));
}
@@ -576,7 +576,7 @@ ScheduleSecondTcpRttTraceConnection (std::ofstream* ofStream)
* Schedule trace connection.
*/
void
ScheduleSecondPacketSinkConnection (void)
ScheduleSecondPacketSinkConnection ()
{
Config::ConnectWithoutContext ("/NodeList/7/ApplicationList/*/$ns3::PacketSink/Rx", MakeCallback (&TraceSecondRx));
}

2
examples/tutorial/fourth.cc
View File

@@ -34,7 +34,7 @@ public:
* Register this type.
* \return The TypeId.
*/
static TypeId GetTypeId (void)
static TypeId GetTypeId ()
{
static TypeId tid = TypeId ("MyObject")
.SetParent<Object> ()

10
examples/tutorial/tutorial-app.cc
View File

@@ -37,7 +37,7 @@ TutorialApp::~TutorialApp ()
}
/* static */
TypeId TutorialApp::GetTypeId (void)
TypeId TutorialApp::GetTypeId ()
{
static TypeId tid = TypeId ("TutorialApp")
.SetParent<Application> ()
@@ -58,7 +58,7 @@ TutorialApp::Setup (Ptr<Socket> socket, Address address, uint32_t packetSize, ui
}
void
TutorialApp::StartApplication (void)
TutorialApp::StartApplication ()
{
m_running = true;
m_packetsSent = 0;
@@ -68,7 +68,7 @@ TutorialApp::StartApplication (void)
}
void
TutorialApp::StopApplication (void)
TutorialApp::StopApplication ()
{
m_running = false;
@@ -84,7 +84,7 @@ TutorialApp::StopApplication (void)
}
void
TutorialApp::SendPacket (void)
TutorialApp::SendPacket ()
{
Ptr<Packet> packet = Create<Packet> (m_packetSize);
m_socket->Send (packet);
@@ -96,7 +96,7 @@ TutorialApp::SendPacket (void)
}
void
TutorialApp::ScheduleTx (void)
TutorialApp::ScheduleTx ()
{
if (m_running)
{

10
examples/tutorial/tutorial-app.h
View File

@@ -38,7 +38,7 @@ public:
* Register this type.
* \return The TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
/**
* Setup the socket.
@@ -51,13 +51,13 @@ public:
void Setup (Ptr<Socket> socket, Address address, uint32_t packetSize, uint32_t nPackets, DataRate dataRate);
private:
virtual void StartApplication (void);
virtual void StopApplication (void);
virtual void StartApplication ();
virtual void StopApplication ();
/// Schedule a new transmission.
void ScheduleTx (void);
void ScheduleTx ();
/// Send a packet.
void SendPacket (void);
void SendPacket ();
Ptr<Socket> m_socket; //!< The tranmission socket.
Address m_peer; //!< The destination address.

8
src/antenna/model/angles.cc
View File

@@ -221,21 +221,21 @@ Angles::SetInclination (double inclination)
double
Angles::GetAzimuth (void) const
Angles::GetAzimuth () const
{
return m_azimuth;
}
double
Angles::GetInclination (void) const
Angles::GetInclination () const
{
return m_inclination;
}
void
Angles::NormalizeAngles (void)
Angles::NormalizeAngles ()
{
CheckIfValid ();
@@ -250,7 +250,7 @@ Angles::NormalizeAngles (void)
void
Angles::CheckIfValid (void) const
Angles::CheckIfValid () const
{
if (std::isfinite (m_inclination) || std::isfinite (m_azimuth))
{

8
src/antenna/model/angles.h
View File

@@ -168,14 +168,14 @@ public:
*
* \return azimuth angle in radians
*/
double GetAzimuth (void) const;
double GetAzimuth () const;
/**
* Getter for inclination angle
*
* \return inclination angle in radians
*/
double GetInclination (void) const;
double GetInclination () const;
// friend methods
/**
@@ -212,14 +212,14 @@ private:
* and can be wrapped in [-M_PI, M_PI), an inclination angle outside
* the [0, M_PI] range can be ambiguos and is thus not valid.
*/
void NormalizeAngles (void);
void NormalizeAngles ();
/**
* Check if Angle is valid or not
* Warns the user if the Angle is undefined (non-finite azimuth or inclination),
* throws an assert if the inclination angle is invalid (not in [0, M_PI])
*/
void CheckIfValid (void) const;
void CheckIfValid () const;
double m_azimuth; //!< the azimuth angle in radians

6
src/antenna/model/cosine-antenna-model.h
View File

@@ -63,19 +63,19 @@ public:
* Get the vertical 3 dB beamwidth of the cosine antenna model.
* \return the vertical beamwidth in degrees
*/
double GetVerticalBeamwidth (void) const;
double GetVerticalBeamwidth () const;
/**
* Get the horizontal 3 dB beamwidth of the cosine antenna model.
* \return the horizontal beamwidth in degrees
*/
double GetHorizontalBeamwidth (void) const;
double GetHorizontalBeamwidth () const;
/**
* Get the horizontal orientation of the antenna element.
* \return the horizontal orientation in degrees
*/
double GetOrientation (void) const;
double GetOrientation () const;
private:

12
src/antenna/model/phased-array-model.h
View File

@@ -38,20 +38,20 @@ public:
/**
* Constructor
*/
PhasedArrayModel (void);
PhasedArrayModel ();
/**
* Destructor
*/
virtual ~PhasedArrayModel (void);
virtual ~PhasedArrayModel ();
/**
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
typedef std::vector<std::complex<double> > ComplexVector; //!< type definition for complex vectors
@@ -80,7 +80,7 @@ public:
* Returns the number of antenna elements
* \return the number of antenna elements
*/
virtual uint64_t GetNumberOfElements (void) const = 0;
virtual uint64_t GetNumberOfElements () const = 0;
/**
@@ -94,7 +94,7 @@ public:
* Returns the beamforming vector that is currently being used
* \return the current beamforming vector
*/
ComplexVector GetBeamformingVector (void) const;
ComplexVector GetBeamformingVector () const;
/**
@@ -124,7 +124,7 @@ public:
* Returns a pointer to the AntennaModel instance used to model the elements of the array
* \return pointer to the AntennaModel instance
*/
Ptr<const AntennaModel> GetAntennaElement (void) const;
Ptr<const AntennaModel> GetAntennaElement () const;
/**
* Returns the ID of this antenna array instance

4
src/antenna/model/three-gpp-antenna-model.cc
View File

@@ -42,7 +42,7 @@ ThreeGppAntennaModel::GetTypeId ()
return tid;
}
ThreeGppAntennaModel::ThreeGppAntennaModel (void)
ThreeGppAntennaModel::ThreeGppAntennaModel ()
: m_verticalBeamwidthDegrees {65},
m_horizontalBeamwidthDegrees {65},
m_aMax {30},
@@ -51,7 +51,7 @@ ThreeGppAntennaModel::ThreeGppAntennaModel (void)
{}
ThreeGppAntennaModel::~ThreeGppAntennaModel (void)
ThreeGppAntennaModel::~ThreeGppAntennaModel ()
{}

4
src/antenna/model/three-gpp-antenna-model.h
View File

@@ -35,8 +35,8 @@ namespace ns3 {
class ThreeGppAntennaModel : public AntennaModel
{
public:
ThreeGppAntennaModel (void);
virtual ~ThreeGppAntennaModel (void) override;
ThreeGppAntennaModel ();
virtual ~ThreeGppAntennaModel () override;
/**
* \brief Get the type ID.

10
src/antenna/model/uniform-planar-array.cc
View File

@@ -39,7 +39,7 @@ UniformPlanarArray::~UniformPlanarArray ()
{}
TypeId
UniformPlanarArray::GetTypeId (void)
UniformPlanarArray::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::UniformPlanarArray")
.SetParent<PhasedArrayModel> ()
@@ -102,7 +102,7 @@ UniformPlanarArray::SetNumColumns (uint32_t n)
uint32_t
UniformPlanarArray::GetNumColumns (void) const
UniformPlanarArray::GetNumColumns () const
{
return m_numColumns;
}
@@ -121,7 +121,7 @@ UniformPlanarArray::SetNumRows (uint32_t n)
uint32_t
UniformPlanarArray::GetNumRows (void) const
UniformPlanarArray::GetNumRows () const
{
return m_numRows;
}
@@ -165,7 +165,7 @@ UniformPlanarArray::SetAntennaHorizontalSpacing (double s)
double
UniformPlanarArray::GetAntennaHorizontalSpacing (void) const
UniformPlanarArray::GetAntennaHorizontalSpacing () const
{
return m_disH;
}
@@ -186,7 +186,7 @@ UniformPlanarArray::SetAntennaVerticalSpacing (double s)
double
UniformPlanarArray::GetAntennaVerticalSpacing (void) const
UniformPlanarArray::GetAntennaVerticalSpacing () const
{
return m_disV;
}

16
src/antenna/model/uniform-planar-array.h
View File

@@ -41,19 +41,19 @@ public:
/**
* Constructor
*/
UniformPlanarArray (void);
UniformPlanarArray ();
/**
* Destructor
*/
virtual ~UniformPlanarArray (void);
virtual ~UniformPlanarArray ();
/**
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
/**
@@ -87,7 +87,7 @@ public:
* Returns the number of antenna elements
* \return the number of antenna elements
*/
uint64_t GetNumberOfElements (void) const override;
uint64_t GetNumberOfElements () const override;
private:
/**
@@ -103,7 +103,7 @@ private:
* Get the number of columns of the phased array
* \return the number of columns
*/
uint32_t GetNumColumns (void) const;
uint32_t GetNumColumns () const;
/**
@@ -119,7 +119,7 @@ private:
* Get the number of rows of the phased array
* \return the number of rows
*/
uint32_t GetNumRows (void) const;
uint32_t GetNumRows () const;
/**
* \brief Set the bearing angle
@@ -158,7 +158,7 @@ private:
* Get the horizontal spacing for the antenna elements of the phased array
* \return the horizontal spacing in multiples of wavelength
*/
double GetAntennaHorizontalSpacing (void) const;
double GetAntennaHorizontalSpacing () const;
/**
@@ -174,7 +174,7 @@ private:
* Get the vertical spacing for the antenna elements of the phased array
* \return the vertical spacing in multiples of wavelength
*/
double GetAntennaVerticalSpacing (void) const;
double GetAntennaVerticalSpacing () const;
uint32_t m_numColumns {1}; //!< number of columns
uint32_t m_numRows {1}; //!< number of rows

4
src/antenna/test/test-angles.cc
View File

@@ -50,7 +50,7 @@ public:
OneVectorConstructorTestCase (Vector v, Angles a);
private:
virtual void DoRun (void);
virtual void DoRun ();
Vector m_v; //!< vector
Angles m_a; //!< expected angle
@@ -104,7 +104,7 @@ public:
TwoVectorsConstructorTestCase (Vector v, Vector o, Angles a);
private:
virtual void DoRun (void);
virtual void DoRun ();
Vector m_v; //!< point
Vector m_o; //!< origin

2
src/antenna/test/test-cosine-antenna.cc
View File

@@ -73,7 +73,7 @@ public:
private:
virtual void DoRun (void);
virtual void DoRun ();
Angles m_a; //!< Antenna angle
double m_b; //!< Horizontal and Vertical Beamwidth
double m_o; //!< Orientation

4
src/antenna/test/test-degrees-radians.cc
View File

@@ -51,7 +51,7 @@ public:
private:
virtual void DoRun (void);
virtual void DoRun ();
double m_a; //!< angle in degrees
double m_b; //!< expected angle in radians
@@ -104,7 +104,7 @@ public:
private:
virtual void DoRun (void);
virtual void DoRun ();
double m_a; //!< angle in radians
double m_b; //!< expected angle in degrees

2
src/antenna/test/test-isotropic-antenna.cc
View File

@@ -51,7 +51,7 @@ public:
private:
virtual void DoRun (void);
virtual void DoRun ();
Angles m_a; //!< Antenna angle
double m_expectedGain; //!< Expected gain

2
src/antenna/test/test-parabolic-antenna.cc
View File

@@ -73,7 +73,7 @@ public:
private:
virtual void DoRun (void);
virtual void DoRun ();
Angles m_a; //!< Antenna angle
double m_b; //!< Beamwidth

2
src/antenna/test/test-uniform-planar-array.cc
View File

@@ -76,7 +76,7 @@ private:
/**
* Run the test
*/
virtual void DoRun (void);
virtual void DoRun ();
/**
* Compute the gain of the antenna array
* \param a the antenna array

2
src/aodv/helper/aodv-helper.cc
View File

@@ -34,7 +34,7 @@ AodvHelper::AodvHelper() :
}
AodvHelper*
AodvHelper::Copy (void) const
AodvHelper::Copy () const
{
return new AodvHelper (*this);
}

2
src/aodv/helper/aodv-helper.h
View File

@@ -43,7 +43,7 @@ public:
* This method is mainly for internal use by the other helpers;
* clients are expected to free the dynamic memory allocated by this method
*/
AodvHelper* Copy (void) const;
AodvHelper* Copy () const;
/**
* \param node the node on which the routing protocol will run

4
src/aodv/model/aodv-routing-protocol.cc
View File

@@ -180,7 +180,7 @@ RoutingProtocol::RoutingProtocol ()
}
TypeId
RoutingProtocol::GetTypeId (void)
RoutingProtocol::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::aodv::RoutingProtocol")
.SetParent<Ipv4RoutingProtocol> ()
@@ -2184,7 +2184,7 @@ RoutingProtocol::FindSubnetBroadcastSocketWithInterfaceAddress (Ipv4InterfaceAdd
}
void
RoutingProtocol::DoInitialize (void)
RoutingProtocol::DoInitialize ()
{
NS_LOG_FUNCTION (this);
uint32_t startTime;

4
src/aodv/model/aodv-routing-protocol.h
View File

@@ -59,7 +59,7 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
static const uint32_t AODV_PORT;
/// constructor
@@ -182,7 +182,7 @@ public:
int64_t AssignStreams (int64_t stream);
protected:
virtual void DoInitialize (void);
virtual void DoInitialize ();
private:
/**
* Notify that an MPDU was dropped.

2
src/applications/helper/udp-client-server-helper.cc
View File

@@ -60,7 +60,7 @@ UdpServerHelper::Install (NodeContainer c)
}
Ptr<UdpServer>
UdpServerHelper::GetServer (void)
UdpServerHelper::GetServer ()
{
return m_server;
}

2
src/applications/helper/udp-client-server-helper.h
View File

@@ -78,7 +78,7 @@ public:
*
* \returns a Ptr to the last created server application
*/
Ptr<UdpServer> GetServer (void);
Ptr<UdpServer> GetServer ();
private:
ObjectFactory m_factory; //!< Object factory.
Ptr<UdpServer> m_server; //!< The last created server application

10
src/applications/model/bulk-send-application.cc
View File

@@ -39,7 +39,7 @@ NS_LOG_COMPONENT_DEFINE ("BulkSendApplication");
NS_OBJECT_ENSURE_REGISTERED (BulkSendApplication);
TypeId
BulkSendApplication::GetTypeId (void)
BulkSendApplication::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::BulkSendApplication")
.SetParent<Application> ()
@@ -108,14 +108,14 @@ BulkSendApplication::SetMaxBytes (uint64_t maxBytes)
}
Ptr<Socket>
BulkSendApplication::GetSocket (void) const
BulkSendApplication::GetSocket () const
{
NS_LOG_FUNCTION (this);
return m_socket;
}
void
BulkSendApplication::DoDispose (void)
BulkSendApplication::DoDispose ()
{
NS_LOG_FUNCTION (this);
@@ -126,7 +126,7 @@ BulkSendApplication::DoDispose (void)
}
// Application Methods
void BulkSendApplication::StartApplication (void) // Called at time specified by Start
void BulkSendApplication::StartApplication () // Called at time specified by Start
{
NS_LOG_FUNCTION (this);
Address from;
@@ -185,7 +185,7 @@ void BulkSendApplication::StartApplication (void) // Called at time specified by
}
}
void BulkSendApplication::StopApplication (void) // Called at time specified by Stop
void BulkSendApplication::StopApplication () // Called at time specified by Stop
{
NS_LOG_FUNCTION (this);

10
src/applications/model/bulk-send-application.h
View File

@@ -79,7 +79,7 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
BulkSendApplication ();
@@ -104,14 +104,14 @@ public:
* \brief Get the socket this application is attached to.
* \return pointer to associated socket
*/
Ptr<Socket> GetSocket (void) const;
Ptr<Socket> GetSocket () const;
protected:
virtual void DoDispose (void);
virtual void DoDispose ();
private:
// inherited from Application base class.
virtual void StartApplication (void); // Called at time specified by Start
virtual void StopApplication (void); // Called at time specified by Stop
virtual void StartApplication (); // Called at time specified by Start
virtual void StopApplication (); // Called at time specified by Stop
/**
* \brief Send data until the L4 transmission buffer is full.

6
src/applications/model/onoff-application.cc
View File

@@ -50,7 +50,7 @@ NS_LOG_COMPONENT_DEFINE ("OnOffApplication");
NS_OBJECT_ENSURE_REGISTERED (OnOffApplication);
TypeId
OnOffApplication::GetTypeId (void)
OnOffApplication::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::OnOffApplication")
.SetParent<Application> ()
@@ -137,7 +137,7 @@ OnOffApplication::SetMaxBytes (uint64_t maxBytes)
}
Ptr<Socket>
OnOffApplication::GetSocket (void) const
OnOffApplication::GetSocket () const
{
NS_LOG_FUNCTION (this);
return m_socket;
@@ -153,7 +153,7 @@ OnOffApplication::AssignStreams (int64_t stream)
}
void
OnOffApplication::DoDispose (void)
OnOffApplication::DoDispose ()
{
NS_LOG_FUNCTION (this);

10
src/applications/model/onoff-application.h
View File

@@ -99,7 +99,7 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
OnOffApplication ();
@@ -119,7 +119,7 @@ public:
* \brief Return a pointer to associated socket.
* \return pointer to associated socket
*/
Ptr<Socket> GetSocket (void) const;
Ptr<Socket> GetSocket () const;
/**
* \brief Assign a fixed random variable stream number to the random variables
@@ -131,11 +131,11 @@ public:
int64_t AssignStreams (int64_t stream);
protected:
virtual void DoDispose (void);
virtual void DoDispose ();
private:
// inherited from Application base class.
virtual void StartApplication (void); // Called at time specified by Start
virtual void StopApplication (void); // Called at time specified by Stop
virtual void StartApplication (); // Called at time specified by Start
virtual void StopApplication (); // Called at time specified by Stop
//helpers
/**

4
src/applications/model/packet-loss-counter.h
View File

@@ -60,12 +60,12 @@ public:
* \brief Get the number of lost packets.
* \returns the number of lost packets.
*/
uint32_t GetLost (void) const;
uint32_t GetLost () const;
/**
* \brief Return the size of the window used to compute the packet loss.
* \return the window size.
*/
uint16_t GetBitMapSize (void) const;
uint16_t GetBitMapSize () const;
/**
* \brief Set the size of the window used to compute the packet loss.
*

8
src/applications/model/packet-sink.cc
View File

@@ -42,7 +42,7 @@ NS_LOG_COMPONENT_DEFINE ("PacketSink");
NS_OBJECT_ENSURE_REGISTERED (PacketSink);
TypeId
PacketSink::GetTypeId (void)
PacketSink::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::PacketSink")
.SetParent<Application> ()
@@ -97,20 +97,20 @@ uint64_t PacketSink::GetTotalRx () const
}
Ptr<Socket>
PacketSink::GetListeningSocket (void) const
PacketSink::GetListeningSocket () const
{
NS_LOG_FUNCTION (this);
return m_socket;
}
std::list<Ptr<Socket> >
PacketSink::GetAcceptedSockets (void) const
PacketSink::GetAcceptedSockets () const
{
NS_LOG_FUNCTION (this);
return m_socketList;
}
void PacketSink::DoDispose (void)
void PacketSink::DoDispose ()
{
NS_LOG_FUNCTION (this);
m_socket = 0;

12
src/applications/model/packet-sink.h
View File

@@ -76,7 +76,7 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
PacketSink ();
virtual ~PacketSink ();
@@ -89,12 +89,12 @@ public:
/**
* \return pointer to listening socket
*/
Ptr<Socket> GetListeningSocket (void) const;
Ptr<Socket> GetListeningSocket () const;
/**
* \return list of pointers to accepted sockets
*/
std::list<Ptr<Socket> > GetAcceptedSockets (void) const;
std::list<Ptr<Socket> > GetAcceptedSockets () const;
/**
* TracedCallback signature for a reception with addresses and SeqTsSizeHeader
@@ -108,11 +108,11 @@ public:
const SeqTsSizeHeader &header);
protected:
virtual void DoDispose (void);
virtual void DoDispose ();
private:
// inherited from Application base class.
virtual void StartApplication (void); // Called at time specified by Start
virtual void StopApplication (void); // Called at time specified by Stop
virtual void StartApplication (); // Called at time specified by Start
virtual void StopApplication (); // Called at time specified by Stop
/**
* \brief Handle a packet received by the application

12
src/applications/model/seq-ts-echo-header.cc
View File

@@ -47,7 +47,7 @@ SeqTsEchoHeader::SetSeq (uint32_t seq)
}
uint32_t
SeqTsEchoHeader::GetSeq (void) const
SeqTsEchoHeader::GetSeq () const
{
NS_LOG_FUNCTION (this);
return m_seq;
@@ -61,7 +61,7 @@ SeqTsEchoHeader::SetTsValue (Time ts)
}
Time
SeqTsEchoHeader::GetTsValue (void) const
SeqTsEchoHeader::GetTsValue () const
{
NS_LOG_FUNCTION (this);
return m_tsValue;
@@ -75,14 +75,14 @@ SeqTsEchoHeader::SetTsEchoReply (Time ts)
}
Time
SeqTsEchoHeader::GetTsEchoReply (void) const
SeqTsEchoHeader::GetTsEchoReply () const
{
NS_LOG_FUNCTION (this);
return m_tsEchoReply;
}
TypeId
SeqTsEchoHeader::GetTypeId (void)
SeqTsEchoHeader::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::SeqTsEchoHeader")
.SetParent<Header> ()
@@ -93,7 +93,7 @@ SeqTsEchoHeader::GetTypeId (void)
}
TypeId
SeqTsEchoHeader::GetInstanceTypeId (void) const
SeqTsEchoHeader::GetInstanceTypeId () const
{
return GetTypeId ();
}
@@ -106,7 +106,7 @@ SeqTsEchoHeader::Print (std::ostream &os) const
}
uint32_t
SeqTsEchoHeader::GetSerializedSize (void) const
SeqTsEchoHeader::GetSerializedSize () const
{
NS_LOG_FUNCTION (this);
return 4+8+8;

12
src/applications/model/seq-ts-echo-header.h
View File

@@ -41,7 +41,7 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
/**
* \brief constructor
@@ -56,17 +56,17 @@ public:
/**
* \return the sequence number
*/
uint32_t GetSeq (void) const;
uint32_t GetSeq () const;
/**
* \return A time value set by the sender
*/
Time GetTsValue (void) const;
Time GetTsValue () const;
/**
* \return A time value echoing the received timestamp
*/
Time GetTsEchoReply (void) const;
Time GetTsEchoReply () const;
/**
* \brief Set the sender's time value
@@ -82,9 +82,9 @@ public:
void SetTsEchoReply (Time ts);
// Inherited
virtual TypeId GetInstanceTypeId (void) const override;
virtual TypeId GetInstanceTypeId () const override;
virtual void Print (std::ostream &os) const override;
virtual uint32_t GetSerializedSize (void) const override;
virtual uint32_t GetSerializedSize () const override;
virtual void Serialize (Buffer::Iterator start) const override;
virtual uint32_t Deserialize (Buffer::Iterator start) override;

10
src/applications/model/seq-ts-header.cc
View File

@@ -44,21 +44,21 @@ SeqTsHeader::SetSeq (uint32_t seq)
m_seq = seq;
}
uint32_t
SeqTsHeader::GetSeq (void) const
SeqTsHeader::GetSeq () const
{
NS_LOG_FUNCTION (this);
return m_seq;
}
Time
SeqTsHeader::GetTs (void) const
SeqTsHeader::GetTs () const
{
NS_LOG_FUNCTION (this);
return TimeStep (m_ts);
}
TypeId
SeqTsHeader::GetTypeId (void)
SeqTsHeader::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::SeqTsHeader")
.SetParent<Header> ()
@@ -68,7 +68,7 @@ SeqTsHeader::GetTypeId (void)
return tid;
}
TypeId
SeqTsHeader::GetInstanceTypeId (void) const
SeqTsHeader::GetInstanceTypeId () const
{
return GetTypeId ();
}
@@ -79,7 +79,7 @@ SeqTsHeader::Print (std::ostream &os) const
os << "(seq=" << m_seq << " time=" << TimeStep (m_ts).As (Time::S) << ")";
}
uint32_t
SeqTsHeader::GetSerializedSize (void) const
SeqTsHeader::GetSerializedSize () const
{
NS_LOG_FUNCTION (this);
return 4+8;

10
src/applications/model/seq-ts-header.h
View File

@@ -53,21 +53,21 @@ public:
/**
* \return the sequence number
*/
uint32_t GetSeq (void) const;
uint32_t GetSeq () const;
/**
* \return the time stamp
*/
Time GetTs (void) const;
Time GetTs () const;
/**
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
virtual TypeId GetInstanceTypeId (void) const;
virtual TypeId GetInstanceTypeId () const;
virtual void Print (std::ostream &os) const;
virtual uint32_t GetSerializedSize (void) const;
virtual uint32_t GetSerializedSize () const;
virtual void Serialize (Buffer::Iterator start) const;
virtual uint32_t Deserialize (Buffer::Iterator start);

8
src/applications/model/seq-ts-size-header.cc
View File

@@ -35,7 +35,7 @@ SeqTsSizeHeader::SeqTsSizeHeader ()
}
TypeId
SeqTsSizeHeader::GetTypeId (void)
SeqTsSizeHeader::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::SeqTsSizeHeader")
.SetParent<SeqTsHeader> ()
@@ -46,7 +46,7 @@ SeqTsSizeHeader::GetTypeId (void)
}
TypeId
SeqTsSizeHeader::GetInstanceTypeId (void) const
SeqTsSizeHeader::GetInstanceTypeId () const
{
return GetTypeId ();
}
@@ -58,7 +58,7 @@ SeqTsSizeHeader::SetSize (uint64_t size)
}
uint64_t
SeqTsSizeHeader::GetSize (void) const
SeqTsSizeHeader::GetSize () const
{
return m_size;
}
@@ -72,7 +72,7 @@ SeqTsSizeHeader::Print (std::ostream &os) const
}
uint32_t
SeqTsSizeHeader::GetSerializedSize (void) const
SeqTsSizeHeader::GetSerializedSize () const
{
return SeqTsHeader::GetSerializedSize () + 8;
}

8
src/applications/model/seq-ts-size-header.h
View File

@@ -41,7 +41,7 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
/**
* \brief constructor
@@ -58,12 +58,12 @@ public:
* \brief Get the size information that the header is carrying
* \return the size
*/
uint64_t GetSize (void) const;
uint64_t GetSize () const;
// Inherited
virtual TypeId GetInstanceTypeId (void) const override;
virtual TypeId GetInstanceTypeId () const override;
virtual void Print (std::ostream &os) const override;
virtual uint32_t GetSerializedSize (void) const override;
virtual uint32_t GetSerializedSize () const override;
virtual void Serialize (Buffer::Iterator start) const override;
virtual uint32_t Deserialize (Buffer::Iterator start) override;

6
src/applications/model/three-gpp-http-variables.cc
View File

@@ -340,7 +340,7 @@ ThreeGppHttpVariables::AssignStreams (int64_t stream)
}
void
ThreeGppHttpVariables::DoInitialize (void)
ThreeGppHttpVariables::DoInitialize ()
{
NS_LOG_FUNCTION (this);
UpdateMainObjectMuAndSigma ();
@@ -368,7 +368,7 @@ ThreeGppHttpVariables::SetMainObjectGenerationDelay (Time constant)
}
void
ThreeGppHttpVariables::UpdateMainObjectMuAndSigma (void)
ThreeGppHttpVariables::UpdateMainObjectMuAndSigma ()
{
NS_LOG_FUNCTION (this);
const double a1 = std::pow (m_mainObjectSizeStdDev, 2.0);
@@ -382,7 +382,7 @@ ThreeGppHttpVariables::UpdateMainObjectMuAndSigma (void)
}
void
ThreeGppHttpVariables::UpdateEmbeddedObjectMuAndSigma (void)
ThreeGppHttpVariables::UpdateEmbeddedObjectMuAndSigma ()
{
NS_LOG_FUNCTION (this);
const double a1 = std::pow (m_embeddedObjectSizeStdDev, 2.0);

6
src/applications/model/three-gpp-http-variables.h
View File

@@ -271,14 +271,14 @@ private:
* \brief Upon and after object initialization, update random variable
* Mu and Sigma based on changes to attribute values.
*/
void UpdateMainObjectMuAndSigma (void);
void UpdateMainObjectMuAndSigma ();
/**
* \brief Upon and after object initialization, update random variable
* Mu and Sigma based on changes to attribute values.
*/
void UpdateEmbeddedObjectMuAndSigma (void);
void UpdateEmbeddedObjectMuAndSigma ();
void DoInitialize (void); // overridden from base class
void DoInitialize (); // overridden from base class
/**
* Random variable for determining MTU size (in bytes).

10
src/applications/model/udp-client.cc
View File

@@ -40,7 +40,7 @@ NS_LOG_COMPONENT_DEFINE ("UdpClient");
NS_OBJECT_ENSURE_REGISTERED (UdpClient);
TypeId
UdpClient::GetTypeId (void)
UdpClient::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::UdpClient")
.SetParent<Application> ()
@@ -103,14 +103,14 @@ UdpClient::SetRemote (Address addr)
}
void
UdpClient::DoDispose (void)
UdpClient::DoDispose ()
{
NS_LOG_FUNCTION (this);
Application::DoDispose ();
}
void
UdpClient::StartApplication (void)
UdpClient::StartApplication ()
{
NS_LOG_FUNCTION (this);
@@ -183,14 +183,14 @@ UdpClient::StartApplication (void)
}
void
UdpClient::StopApplication (void)
UdpClient::StopApplication ()
{
NS_LOG_FUNCTION (this);
Simulator::Cancel (m_sendEvent);
}
void
UdpClient::Send (void)
UdpClient::Send ()
{
NS_LOG_FUNCTION (this);
NS_ASSERT (m_sendEvent.IsExpired ());

10
src/applications/model/udp-client.h
View File

@@ -47,7 +47,7 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
UdpClient ();
@@ -71,17 +71,17 @@ public:
uint64_t GetTotalTx () const;
protected:
virtual void DoDispose (void);
virtual void DoDispose ();
private:
virtual void StartApplication (void);
virtual void StopApplication (void);
virtual void StartApplication ();
virtual void StopApplication ();
/**
* \brief Send a packet
*/
void Send (void);
void Send ();
uint32_t m_count; //!< Maximum number of packets the application will send
Time m_interval; //!< Packet inter-send time

10
src/applications/model/udp-echo-client.cc
View File

@@ -36,7 +36,7 @@ NS_LOG_COMPONENT_DEFINE ("UdpEchoClientApplication");
NS_OBJECT_ENSURE_REGISTERED (UdpEchoClient);
TypeId
UdpEchoClient::GetTypeId (void)
UdpEchoClient::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::UdpEchoClient")
.SetParent<Application> ()
@@ -119,14 +119,14 @@ UdpEchoClient::SetRemote (Address addr)
}
void
UdpEchoClient::DoDispose (void)
UdpEchoClient::DoDispose ()
{
NS_LOG_FUNCTION (this);
Application::DoDispose ();
}
void
UdpEchoClient::StartApplication (void)
UdpEchoClient::StartApplication ()
{
NS_LOG_FUNCTION (this);
@@ -209,7 +209,7 @@ UdpEchoClient::SetDataSize (uint32_t dataSize)
}
uint32_t
UdpEchoClient::GetDataSize (void) const
UdpEchoClient::GetDataSize () const
{
NS_LOG_FUNCTION (this);
return m_size;
@@ -303,7 +303,7 @@ UdpEchoClient::ScheduleTransmit (Time dt)
}
void
UdpEchoClient::Send (void)
UdpEchoClient::Send ()
{
NS_LOG_FUNCTION (this);

12
src/applications/model/udp-echo-client.h
View File

@@ -43,7 +43,7 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
UdpEchoClient ();
@@ -84,7 +84,7 @@ public:
*
* \returns The number of data bytes.
*/
uint32_t GetDataSize (void) const;
uint32_t GetDataSize () const;
/**
* Set the data fill of the packet (what is sent as data to the server) to
@@ -131,12 +131,12 @@ public:
void SetFill (uint8_t *fill, uint32_t fillSize, uint32_t dataSize);
protected:
virtual void DoDispose (void);
virtual void DoDispose ();
private:
virtual void StartApplication (void);
virtual void StopApplication (void);
virtual void StartApplication ();
virtual void StopApplication ();
/**
* \brief Schedule the next packet transmission
@@ -146,7 +146,7 @@ private:
/**
* \brief Send a packet
*/
void Send (void);
void Send ();
/**
* \brief Handle a packet reception.

6
src/applications/model/udp-echo-server.cc
View File

@@ -39,7 +39,7 @@ NS_LOG_COMPONENT_DEFINE ("UdpEchoServerApplication");
NS_OBJECT_ENSURE_REGISTERED (UdpEchoServer);
TypeId
UdpEchoServer::GetTypeId (void)
UdpEchoServer::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::UdpEchoServer")
.SetParent<Application> ()
@@ -72,14 +72,14 @@ UdpEchoServer::~UdpEchoServer()
}
void
UdpEchoServer::DoDispose (void)
UdpEchoServer::DoDispose ()
{
NS_LOG_FUNCTION (this);
Application::DoDispose ();
}
void
UdpEchoServer::StartApplication (void)
UdpEchoServer::StartApplication ()
{
NS_LOG_FUNCTION (this);

8
src/applications/model/udp-echo-server.h
View File

@@ -48,17 +48,17 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
UdpEchoServer ();
virtual ~UdpEchoServer ();
protected:
virtual void DoDispose (void);
virtual void DoDispose ();
private:
virtual void StartApplication (void);
virtual void StopApplication (void);
virtual void StartApplication ();
virtual void StopApplication ();
/**
* \brief Handle a packet reception.

10
src/applications/model/udp-server.cc
View File

@@ -42,7 +42,7 @@ NS_OBJECT_ENSURE_REGISTERED (UdpServer);
TypeId
UdpServer::GetTypeId (void)
UdpServer::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::UdpServer")
.SetParent<Application> ()
@@ -96,28 +96,28 @@ UdpServer::SetPacketWindowSize (uint16_t size)
}
uint32_t
UdpServer::GetLost (void) const
UdpServer::GetLost () const
{
NS_LOG_FUNCTION (this);
return m_lossCounter.GetLost ();
}
uint64_t
UdpServer::GetReceived (void) const
UdpServer::GetReceived () const
{
NS_LOG_FUNCTION (this);
return m_received;
}
void
UdpServer::DoDispose (void)
UdpServer::DoDispose ()
{
NS_LOG_FUNCTION (this);
Application::DoDispose ();
}
void
UdpServer::StartApplication (void)
UdpServer::StartApplication ()
{
NS_LOG_FUNCTION (this);

12
src/applications/model/udp-server.h
View File

@@ -52,20 +52,20 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
UdpServer ();
virtual ~UdpServer ();
/**
* \brief Returns the number of lost packets
* \return the number of lost packets
*/
uint32_t GetLost (void) const;
uint32_t GetLost () const;
/**
* \brief Returns the number of received packets
* \return the number of received packets
*/
uint64_t GetReceived (void) const;
uint64_t GetReceived () const;
/**
* \brief Returns the size of the window used for checking loss.
@@ -81,12 +81,12 @@ public:
*/
void SetPacketWindowSize (uint16_t size);
protected:
virtual void DoDispose (void);
virtual void DoDispose ();
private:
virtual void StartApplication (void);
virtual void StopApplication (void);
virtual void StartApplication ();
virtual void StopApplication ();
/**
* \brief Handle a packet reception.

12
src/applications/model/udp-trace-client.cc
View File

@@ -59,7 +59,7 @@ struct UdpTraceClient::TraceEntry UdpTraceClient::g_defaultEntries[] = {
};
TypeId
UdpTraceClient::GetTypeId (void)
UdpTraceClient::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::UdpTraceClient")
.SetParent<Application> ()
@@ -166,7 +166,7 @@ UdpTraceClient::SetMaxPacketSize (uint16_t maxPacketSize)
}
uint16_t UdpTraceClient::GetMaxPacketSize (void)
uint16_t UdpTraceClient::GetMaxPacketSize ()
{
NS_LOG_FUNCTION (this);
return m_maxPacketSize;
@@ -174,7 +174,7 @@ uint16_t UdpTraceClient::GetMaxPacketSize (void)
void
UdpTraceClient::DoDispose (void)
UdpTraceClient::DoDispose ()
{
NS_LOG_FUNCTION (this);
Application::DoDispose ();
@@ -225,7 +225,7 @@ UdpTraceClient::LoadTrace (std::string filename)
}
void
UdpTraceClient::LoadDefaultTrace (void)
UdpTraceClient::LoadDefaultTrace ()
{
NS_LOG_FUNCTION (this);
uint32_t prevTime = 0;
@@ -248,7 +248,7 @@ UdpTraceClient::LoadDefaultTrace (void)
}
void
UdpTraceClient::StartApplication (void)
UdpTraceClient::StartApplication ()
{
NS_LOG_FUNCTION (this);
@@ -352,7 +352,7 @@ UdpTraceClient::SendPacket (uint32_t size)
}
void
UdpTraceClient::Send (void)
UdpTraceClient::Send ()
{
NS_LOG_FUNCTION (this);

14
src/applications/model/udp-trace-client.h
View File

@@ -64,7 +64,7 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
UdpTraceClient ();
@@ -107,7 +107,7 @@ public:
* \brief Return the maximum packet size
* \return the maximum packet size
*/
uint16_t GetMaxPacketSize (void);
uint16_t GetMaxPacketSize ();
/**
* \brief Set the maximum packet size
@@ -122,7 +122,7 @@ public:
void SetTraceLoop (bool traceLoop);
protected:
virtual void DoDispose (void);
virtual void DoDispose ();
private:
/**
@@ -133,14 +133,14 @@ private:
/**
* \brief Load the default trace
*/
void LoadDefaultTrace (void);
virtual void StartApplication (void);
virtual void StopApplication (void);
void LoadDefaultTrace ();
virtual void StartApplication ();
virtual void StopApplication ();
/**
* \brief Send a packet
*/
void Send (void);
void Send ();
/**
* \brief Send a packet of a given size
* \param size the packet size

8
src/applications/test/bulk-send-application-test-suite.cc
View File

@@ -52,7 +52,7 @@ public:
virtual ~BulkSendBasicTestCase ();
private:
virtual void DoRun (void);
virtual void DoRun ();
/**
* Record a packet successfully sent
* \param p the packet
@@ -90,7 +90,7 @@ BulkSendBasicTestCase::ReceiveRx (Ptr<const Packet> p, const Address& addr)
}
void
BulkSendBasicTestCase::DoRun (void)
BulkSendBasicTestCase::DoRun ()
{
Ptr<Node> sender = CreateObject<Node> ();
Ptr<Node> receiver = CreateObject<Node> ();
@@ -148,7 +148,7 @@ public:
virtual ~BulkSendSeqTsSizeTestCase ();
private:
virtual void DoRun (void);
virtual void DoRun ();
/**
* Record a packet successfully sent
* \param p the packet
@@ -205,7 +205,7 @@ BulkSendSeqTsSizeTestCase::ReceiveRx (Ptr<const Packet> p, const Address &from,
}
void
BulkSendSeqTsSizeTestCase::DoRun (void)
BulkSendSeqTsSizeTestCase::DoRun ()
{
Ptr<Node> sender = CreateObject<Node> ();
Ptr<Node> receiver = CreateObject<Node> ();

16
src/applications/test/udp-client-server-test.cc
View File

@@ -56,7 +56,7 @@ public:
virtual ~UdpClientServerTestCase ();
private:
virtual void DoRun (void);
virtual void DoRun ();
};
@@ -69,7 +69,7 @@ UdpClientServerTestCase::~UdpClientServerTestCase ()
{
}
void UdpClientServerTestCase::DoRun (void)
void UdpClientServerTestCase::DoRun ()
{
NodeContainer n;
n.Create (2);
@@ -130,7 +130,7 @@ public:
virtual ~UdpTraceClientServerTestCase ();
private:
virtual void DoRun (void);
virtual void DoRun ();
};
@@ -143,7 +143,7 @@ UdpTraceClientServerTestCase::~UdpTraceClientServerTestCase ()
{
}
void UdpTraceClientServerTestCase::DoRun (void)
void UdpTraceClientServerTestCase::DoRun ()
{
NodeContainer n;
n.Create (2);
@@ -199,7 +199,7 @@ public:
virtual ~PacketLossCounterTestCase ();
private:
virtual void DoRun (void);
virtual void DoRun ();
};
@@ -212,7 +212,7 @@ PacketLossCounterTestCase::~PacketLossCounterTestCase ()
{
}
void PacketLossCounterTestCase::DoRun (void)
void PacketLossCounterTestCase::DoRun ()
{
PacketLossCounter lossCounter (32);
lossCounter.NotifyReceived (32); //out of order
@@ -274,7 +274,7 @@ public:
virtual ~UdpEchoClientSetFillTestCase ();
private:
virtual void DoRun (void);
virtual void DoRun ();
};
@@ -287,7 +287,7 @@ UdpEchoClientSetFillTestCase::~UdpEchoClientSetFillTestCase ()
{
}
void UdpEchoClientSetFillTestCase::DoRun (void)
void UdpEchoClientSetFillTestCase::DoRun ()
{
NodeContainer nodes;
nodes.Create (2);

4
src/bridge/model/bridge-channel.cc
View File

@@ -32,7 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("BridgeChannel");
NS_OBJECT_ENSURE_REGISTERED (BridgeChannel);
TypeId
BridgeChannel::GetTypeId (void)
BridgeChannel::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::BridgeChannel")
.SetParent<Channel> ()
@@ -68,7 +68,7 @@ BridgeChannel::AddChannel (Ptr<Channel> bridgedChannel)
}
std::size_t
BridgeChannel::GetNDevices (void) const
BridgeChannel::GetNDevices () const
{
uint32_t ndevices = 0;
for (std::vector< Ptr<Channel> >::const_iterator iter = m_bridgedChannels.begin ();

4
src/bridge/model/bridge-channel.h
View File

@@ -46,7 +46,7 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
BridgeChannel ();
virtual ~BridgeChannel ();
@@ -61,7 +61,7 @@ public:
void AddChannel (Ptr<Channel> bridgedChannel);
// virtual methods implementation, from Channel
virtual std::size_t GetNDevices (void) const;
virtual std::size_t GetNDevices () const;
virtual Ptr<NetDevice> GetDevice (std::size_t i) const;
private:

28
src/bridge/model/bridge-net-device.cc
View File

@@ -38,7 +38,7 @@ NS_OBJECT_ENSURE_REGISTERED (BridgeNetDevice);
TypeId
BridgeNetDevice::GetTypeId (void)
BridgeNetDevice::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::BridgeNetDevice")
.SetParent<NetDevice> ()
@@ -232,7 +232,7 @@ Ptr<NetDevice> BridgeNetDevice::GetLearnedState (Mac48Address source)
}
uint32_t
BridgeNetDevice::GetNBridgePorts (void) const
BridgeNetDevice::GetNBridgePorts () const
{
NS_LOG_FUNCTION_NOARGS ();
return m_ports.size ();
@@ -279,14 +279,14 @@ BridgeNetDevice::SetIfIndex (const uint32_t index)
}
uint32_t
BridgeNetDevice::GetIfIndex (void) const
BridgeNetDevice::GetIfIndex () const
{
NS_LOG_FUNCTION_NOARGS ();
return m_ifIndex;
}
Ptr<Channel>
BridgeNetDevice::GetChannel (void) const
BridgeNetDevice::GetChannel () const
{
NS_LOG_FUNCTION_NOARGS ();
return m_channel;
@@ -300,7 +300,7 @@ BridgeNetDevice::SetAddress (Address address)
}
Address
BridgeNetDevice::GetAddress (void) const
BridgeNetDevice::GetAddress () const
{
NS_LOG_FUNCTION_NOARGS ();
return m_address;
@@ -315,7 +315,7 @@ BridgeNetDevice::SetMtu (const uint16_t mtu)
}
uint16_t
BridgeNetDevice::GetMtu (void) const
BridgeNetDevice::GetMtu () const
{
NS_LOG_FUNCTION_NOARGS ();
return m_mtu;
@@ -323,7 +323,7 @@ BridgeNetDevice::GetMtu (void) const
bool
BridgeNetDevice::IsLinkUp (void) const
BridgeNetDevice::IsLinkUp () const
{
NS_LOG_FUNCTION_NOARGS ();
return true;
@@ -336,7 +336,7 @@ BridgeNetDevice::AddLinkChangeCallback (Callback<void> callback)
bool
BridgeNetDevice::IsBroadcast (void) const
BridgeNetDevice::IsBroadcast () const
{
NS_LOG_FUNCTION_NOARGS ();
return true;
@@ -344,14 +344,14 @@ BridgeNetDevice::IsBroadcast (void) const
Address
BridgeNetDevice::GetBroadcast (void) const
BridgeNetDevice::GetBroadcast () const
{
NS_LOG_FUNCTION_NOARGS ();
return Mac48Address ("ff:ff:ff:ff:ff:ff");
}
bool
BridgeNetDevice::IsMulticast (void) const
BridgeNetDevice::IsMulticast () const
{
NS_LOG_FUNCTION_NOARGS ();
return true;
@@ -367,14 +367,14 @@ BridgeNetDevice::GetMulticast (Ipv4Address multicastGroup) const
bool
BridgeNetDevice::IsPointToPoint (void) const
BridgeNetDevice::IsPointToPoint () const
{
NS_LOG_FUNCTION_NOARGS ();
return false;
}
bool
BridgeNetDevice::IsBridge (void) const
BridgeNetDevice::IsBridge () const
{
NS_LOG_FUNCTION_NOARGS ();
return true;
@@ -421,7 +421,7 @@ BridgeNetDevice::SendFrom (Ptr<Packet> packet, const Address& src, const Address
Ptr<Node>
BridgeNetDevice::GetNode (void) const
BridgeNetDevice::GetNode () const
{
NS_LOG_FUNCTION_NOARGS ();
return m_node;
@@ -437,7 +437,7 @@ BridgeNetDevice::SetNode (Ptr<Node> node)
bool
BridgeNetDevice::NeedsArp (void) const
BridgeNetDevice::NeedsArp () const
{
NS_LOG_FUNCTION_NOARGS ();
return true;

30
src/bridge/model/bridge-net-device.h
View File

@@ -75,7 +75,7 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
BridgeNetDevice ();
virtual ~BridgeNetDevice ();
@@ -103,7 +103,7 @@ public:
*
* \return the number of bridged ports.
*/
uint32_t GetNBridgePorts (void) const;
uint32_t GetNBridgePorts () const;
/**
* \brief Gets the n-th bridged port.
@@ -114,32 +114,32 @@ public:
// inherited from NetDevice base class.
virtual void SetIfIndex (const uint32_t index);
virtual uint32_t GetIfIndex (void) const;
virtual Ptr<Channel> GetChannel (void) const;
virtual uint32_t GetIfIndex () const;
virtual Ptr<Channel> GetChannel () const;
virtual void SetAddress (Address address);
virtual Address GetAddress (void) const;
virtual Address GetAddress () const;
virtual bool SetMtu (const uint16_t mtu);
virtual uint16_t GetMtu (void) const;
virtual bool IsLinkUp (void) const;
virtual uint16_t GetMtu () const;
virtual bool IsLinkUp () const;
virtual void AddLinkChangeCallback (Callback<void> callback);
virtual bool IsBroadcast (void) const;
virtual Address GetBroadcast (void) const;
virtual bool IsMulticast (void) const;
virtual bool IsBroadcast () const;
virtual Address GetBroadcast () const;
virtual bool IsMulticast () const;
virtual Address GetMulticast (Ipv4Address multicastGroup) const;
virtual bool IsPointToPoint (void) const;
virtual bool IsBridge (void) const;
virtual bool IsPointToPoint () const;
virtual bool IsBridge () const;
virtual bool Send (Ptr<Packet> packet, const Address& dest, uint16_t protocolNumber);
virtual bool SendFrom (Ptr<Packet> packet, const Address& source, const Address& dest, uint16_t protocolNumber);
virtual Ptr<Node> GetNode (void) const;
virtual Ptr<Node> GetNode () const;
virtual void SetNode (Ptr<Node> node);
virtual bool NeedsArp (void) const;
virtual bool NeedsArp () const;
virtual void SetReceiveCallback (NetDevice::ReceiveCallback cb);
virtual void SetPromiscReceiveCallback (NetDevice::PromiscReceiveCallback cb);
virtual bool SupportsSendFrom () const;
virtual Address GetMulticast (Ipv6Address addr) const;
protected:
virtual void DoDispose (void);
virtual void DoDispose ();
/**
* \brief Receives a packet from one bridged port.

2
src/buildings/helper/building-allocator.cc
View File

@@ -46,7 +46,7 @@ GridBuildingAllocator::~GridBuildingAllocator ()
}
TypeId
GridBuildingAllocator::GetTypeId (void)
GridBuildingAllocator::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::GridBuildingAllocator")
.SetParent<Object> ()

2
src/buildings/helper/building-allocator.h
View File

@@ -51,7 +51,7 @@ public:
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
/**
* Set an attribute to be used for each new building to be created

8
src/buildings/helper/building-container.cc
View File

@@ -40,18 +40,18 @@ BuildingContainer::BuildingContainer (std::string buildingName)
}
BuildingContainer::Iterator
BuildingContainer::Begin (void) const
BuildingContainer::Begin () const
{
return m_buildings.begin ();
}
BuildingContainer::Iterator
BuildingContainer::End (void) const
BuildingContainer::End () const
{
return m_buildings.end ();
}
uint32_t
BuildingContainer::GetN (void) const
BuildingContainer::GetN () const
{
return m_buildings.size ();
}
@@ -89,7 +89,7 @@ BuildingContainer::Add (std::string buildingName)
}
BuildingContainer
BuildingContainer::GetGlobal (void)
BuildingContainer::GetGlobal ()
{
BuildingContainer c;
for (BuildingList::Iterator i = BuildingList::Begin (); i != BuildingList::End (); ++i)

8
src/buildings/helper/building-container.h
View File

@@ -84,7 +84,7 @@ public:
*
* \returns an iterator which refers to the first Building in the container.
*/
Iterator Begin (void) const;
Iterator Begin () const;
/**
* \brief Get an iterator which indicates past-the-last Building in the
@@ -105,7 +105,7 @@ public:
*
* \returns an iterator which indicates an ending condition for a loop.
*/
Iterator End (void) const;
Iterator End () const;
/**
* \brief Get the number of Ptr<Building> stored in this container.
@@ -127,7 +127,7 @@ public:
*
* \returns the number of Ptr<Building> stored in this container.
*/
uint32_t GetN (void) const;
uint32_t GetN () const;
/**
* \brief Get the Ptr<Building> stored in this container at a given
@@ -198,7 +198,7 @@ public:
*
* \returns a BuildingContainer which contains a list of all Buildings.
*/
static BuildingContainer GetGlobal (void);
static BuildingContainer GetGlobal ();
private:
std::vector<Ptr<Building> > m_buildings; //!< Building container

10
src/buildings/helper/building-position-allocator.cc
View File

@@ -49,7 +49,7 @@ RandomBuildingPositionAllocator::RandomBuildingPositionAllocator ()
}
TypeId
RandomBuildingPositionAllocator::GetTypeId (void)
RandomBuildingPositionAllocator::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::RandomBuildingPositionAllocator")
.SetParent<PositionAllocator> ()
@@ -114,7 +114,7 @@ OutdoorPositionAllocator::OutdoorPositionAllocator ()
}
TypeId
OutdoorPositionAllocator::GetTypeId (void)
OutdoorPositionAllocator::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::OutdoorPositionAllocator")
.SetParent<PositionAllocator> ()
@@ -231,7 +231,7 @@ RandomRoomPositionAllocator::RandomRoomPositionAllocator ()
}
TypeId
RandomRoomPositionAllocator::GetTypeId (void)
RandomRoomPositionAllocator::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::RandomRoomPositionAllocator")
.SetParent<PositionAllocator> ()
@@ -335,7 +335,7 @@ SameRoomPositionAllocator::SameRoomPositionAllocator (NodeContainer c)
}
TypeId
SameRoomPositionAllocator::GetTypeId (void)
SameRoomPositionAllocator::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::SameRoomPositionAllocator")
.SetParent<PositionAllocator> ()
@@ -417,7 +417,7 @@ FixedRoomPositionAllocator::FixedRoomPositionAllocator (
}
TypeId
FixedRoomPositionAllocator::GetTypeId (void)
FixedRoomPositionAllocator::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::FixedRoomPositionAllocator")
.SetParent<PositionAllocator> ()

20
src/buildings/helper/building-position-allocator.h
View File

@@ -45,10 +45,10 @@ public:
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
// inherited from PositionAllocator
virtual Vector GetNext (void) const;
virtual Vector GetNext () const;
/**
* Assign a fixed random variable stream number to the random variables
@@ -92,10 +92,10 @@ public:
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
// inherited from PositionAllocator
virtual Vector GetNext (void) const;
virtual Vector GetNext () const;
/**
* \brief Set the random variable stream object that generates x-positions
@@ -146,10 +146,10 @@ public:
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
// inherited from PositionAllocator
virtual Vector GetNext (void) const;
virtual Vector GetNext () const;
/**
* Assign a fixed random variable stream number to the random variables
@@ -201,10 +201,10 @@ public:
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
// inherited from PositionAllocator
virtual Vector GetNext (void) const;
virtual Vector GetNext () const;
/**
* Assign a fixed random variable stream number to the random variables
@@ -250,9 +250,9 @@ public:
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
// inherited from PositionAllocator
virtual Vector GetNext (void) const;
virtual Vector GetNext () const;
/**
* Assign a fixed random variable stream number to the random variables

38
src/buildings/model/building-list.cc
View File

@@ -42,7 +42,7 @@ public:
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
BuildingListPriv ();
~BuildingListPriv ();
@@ -58,13 +58,13 @@ public:
*
* \returns iterator to the begin of the container.
*/
BuildingList::Iterator Begin (void) const;
BuildingList::Iterator Begin () const;
/**
* Returns an interator to the end of the list.
*
* \returns iterator to the end of the container.
*/
BuildingList::Iterator End (void) const;
BuildingList::Iterator End () const;
/**
* Gets the n-th Building in the container
* \param n Building position
@@ -75,35 +75,35 @@ public:
* Gets the number of Building in the container
* \returns the container size
*/
uint32_t GetNBuildings (void);
uint32_t GetNBuildings ();
/**
* Get the Singleton instance of BuildingListPriv (or create one)
* \return the BuildingListPriv instance
*/
static Ptr<BuildingListPriv> Get (void);
static Ptr<BuildingListPriv> Get ();
private:
virtual void DoDispose (void);
virtual void DoDispose ();
/**
* Get the Singleton instance of BuildingListPriv (or create one)
* \return the BuildingListPriv instance
*/
static Ptr<BuildingListPriv> *DoGet (void);
static Ptr<BuildingListPriv> *DoGet ();
/**
* Dispose the Singleton instance of BuildingListPriv.
*
* \note: this function is automatically called at the simulation end.
*
*/
static void Delete (void);
static void Delete ();
std::vector<Ptr<Building> > m_buildings; //!< Container of Building
};
NS_OBJECT_ENSURE_REGISTERED (BuildingListPriv);
TypeId
BuildingListPriv::GetTypeId (void)
BuildingListPriv::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::BuildingListPriv")
.SetParent<Object> ()
@@ -117,12 +117,12 @@ BuildingListPriv::GetTypeId (void)
}
Ptr<BuildingListPriv>
BuildingListPriv::Get (void)
BuildingListPriv::Get ()
{
return *DoGet ();
}
Ptr<BuildingListPriv> *
BuildingListPriv::DoGet (void)
BuildingListPriv::DoGet ()
{
static Ptr<BuildingListPriv> ptr = 0;
if (!ptr)
@@ -134,7 +134,7 @@ BuildingListPriv::DoGet (void)
return &ptr;
}
void
BuildingListPriv::Delete (void)
BuildingListPriv::Delete ()
{
NS_LOG_FUNCTION_NOARGS ();
Config::UnregisterRootNamespaceObject (Get ());
@@ -150,7 +150,7 @@ BuildingListPriv::~BuildingListPriv ()
{
}
void
BuildingListPriv::DoDispose (void)
BuildingListPriv::DoDispose ()
{
NS_LOG_FUNCTION_NOARGS ();
for (std::vector<Ptr<Building> >::iterator i = m_buildings.begin ();
@@ -175,17 +175,17 @@ BuildingListPriv::Add (Ptr<Building> building)
}
BuildingList::Iterator
BuildingListPriv::Begin (void) const
BuildingListPriv::Begin () const
{
return m_buildings.begin ();
}
BuildingList::Iterator
BuildingListPriv::End (void) const
BuildingListPriv::End () const
{
return m_buildings.end ();
}
uint32_t
BuildingListPriv::GetNBuildings (void)
BuildingListPriv::GetNBuildings ()
{
return m_buildings.size ();
}
@@ -213,12 +213,12 @@ BuildingList::Add (Ptr<Building> building)
return BuildingListPriv::Get ()->Add (building);
}
BuildingList::Iterator
BuildingList::Begin (void)
BuildingList::Begin ()
{
return BuildingListPriv::Get ()->Begin ();
}
BuildingList::Iterator
BuildingList::End (void)
BuildingList::End ()
{
return BuildingListPriv::Get ()->End ();
}
@@ -228,7 +228,7 @@ BuildingList::GetBuilding (uint32_t n)
return BuildingListPriv::Get ()->GetBuilding (n);
}
uint32_t
BuildingList::GetNBuildings (void)
BuildingList::GetNBuildings ()
{
return BuildingListPriv::Get ()->GetNBuildings ();
}

6
src/buildings/model/building-list.h
View File

@@ -51,12 +51,12 @@ public:
* \returns a C++ iterator located at the beginning of this
* list.
*/
static Iterator Begin (void);
static Iterator Begin ();
/**
* \returns a C++ iterator located at the end of this
* list.
*/
static Iterator End (void);
static Iterator End ();
/**
* \param n index of requested building.
* \returns the Building associated to index n.
@@ -65,7 +65,7 @@ public:
/**
* \returns the number of buildings currently in the list.
*/
static uint32_t GetNBuildings (void);
static uint32_t GetNBuildings ();
};
} // namespace ns3

4
src/buildings/model/building.cc
View File

@@ -36,7 +36,7 @@ NS_LOG_COMPONENT_DEFINE ("Building");
NS_OBJECT_ENSURE_REGISTERED (Building);
TypeId
Building::GetTypeId (void)
Building::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::Building")
.SetParent<Object> ()
@@ -129,7 +129,7 @@ Building::DoDispose ()
}
uint32_t
Building::GetId (void) const
Building::GetId () const
{
NS_LOG_FUNCTION (this);
return m_buildingId;

4
src/buildings/model/building.h
View File

@@ -42,7 +42,7 @@ public:
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
virtual void DoDispose ();
/**
@@ -94,7 +94,7 @@ public:
* \return the unique id of this Building. This unique id happens to
* be also the index of the Building into the BuildingList.
*/
uint32_t GetId (void) const;
uint32_t GetId () const;
/**
* Set the boundaries of the building

2
src/buildings/model/buildings-channel-condition-model.cc
View File

@@ -32,7 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("BuildingsChannelConditionModel");
NS_OBJECT_ENSURE_REGISTERED (BuildingsChannelConditionModel);
TypeId
BuildingsChannelConditionModel::GetTypeId (void)
BuildingsChannelConditionModel::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::BuildingsChannelConditionModel")
.SetParent<ChannelConditionModel> ()

2
src/buildings/model/buildings-channel-condition-model.h
View File

@@ -44,7 +44,7 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
/**

2
src/buildings/model/buildings-propagation-loss-model.cc
View File

@@ -60,7 +60,7 @@ BuildingsPropagationLossModel::ShadowingLoss::GetReceiver () const
}
TypeId
BuildingsPropagationLossModel::GetTypeId (void)
BuildingsPropagationLossModel::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::BuildingsPropagationLossModel")

4
src/buildings/model/buildings-propagation-loss-model.h
View File

@@ -62,7 +62,7 @@ public:
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
BuildingsPropagationLossModel ();
/**
@@ -128,7 +128,7 @@ protected:
/**
* \returns the receiver mobility model
*/
Ptr<MobilityModel> GetReceiver (void) const;
Ptr<MobilityModel> GetReceiver () const;
protected:
double m_shadowingValue; //!< Shadowing value
Ptr<MobilityModel> m_receiver; //!< The receiver mobility model

2
src/buildings/model/hybrid-buildings-propagation-loss-model.cc
View File

@@ -59,7 +59,7 @@ HybridBuildingsPropagationLossModel::~HybridBuildingsPropagationLossModel ()
}
TypeId
HybridBuildingsPropagationLossModel::GetTypeId (void)
HybridBuildingsPropagationLossModel::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::HybridBuildingsPropagationLossModel")

2
src/buildings/model/hybrid-buildings-propagation-loss-model.h
View File

@@ -61,7 +61,7 @@ public:
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
HybridBuildingsPropagationLossModel ();
~HybridBuildingsPropagationLossModel ();

2
src/buildings/model/itu-r-1238-propagation-loss-model.cc
View File

@@ -36,7 +36,7 @@ NS_OBJECT_ENSURE_REGISTERED (ItuR1238PropagationLossModel);
TypeId
ItuR1238PropagationLossModel::GetTypeId (void)
ItuR1238PropagationLossModel::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::ItuR1238PropagationLossModel")

2
src/buildings/model/itu-r-1238-propagation-loss-model.h
View File

@@ -41,7 +41,7 @@ public:
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
/**
*

12
src/buildings/model/mobility-building-info.cc
View File

@@ -34,7 +34,7 @@ NS_LOG_COMPONENT_DEFINE ("MobilityBuildingInfo");
NS_OBJECT_ENSURE_REGISTERED (MobilityBuildingInfo);
TypeId
MobilityBuildingInfo::GetTypeId (void)
MobilityBuildingInfo::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::MobilityBuildingInfo")
.SetParent<Object> ()
@@ -75,7 +75,7 @@ MobilityBuildingInfo::MobilityBuildingInfo (Ptr<Building> building)
}
bool
MobilityBuildingInfo::IsIndoor (void)
MobilityBuildingInfo::IsIndoor ()
{
NS_LOG_FUNCTION (this);
Ptr<MobilityModel> mm = this->GetObject<MobilityModel> ();
@@ -131,28 +131,28 @@ MobilityBuildingInfo::SetIndoor (uint8_t nfloor, uint8_t nroomx, uint8_t nroomy)
void
MobilityBuildingInfo::SetOutdoor (void)
MobilityBuildingInfo::SetOutdoor ()
{
NS_LOG_FUNCTION (this);
m_indoor = false;
}
uint8_t
MobilityBuildingInfo::GetFloorNumber (void)
MobilityBuildingInfo::GetFloorNumber ()
{
NS_LOG_FUNCTION (this);
return (m_nFloor);
}
uint8_t
MobilityBuildingInfo::GetRoomNumberX (void)
MobilityBuildingInfo::GetRoomNumberX ()
{
NS_LOG_FUNCTION (this);
return (m_roomX);
}
uint8_t
MobilityBuildingInfo::GetRoomNumberY (void)
MobilityBuildingInfo::GetRoomNumberY ()
{
NS_LOG_FUNCTION (this);
return (m_roomY);

10
src/buildings/model/mobility-building-info.h
View File

@@ -53,7 +53,7 @@ public:
*
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
MobilityBuildingInfo ();
/**
@@ -68,7 +68,7 @@ public:
*
* \return true if the MobilityBuildingInfo instance is indoor, false otherwise
*/
bool IsIndoor (void);
bool IsIndoor ();
/**
* \brief Mark this MobilityBuildingInfo instance as indoor
@@ -100,21 +100,21 @@ public:
*
* \return The floor number
*/
uint8_t GetFloorNumber (void);
uint8_t GetFloorNumber ();
/**
* \brief Get the room number along x-axis at which the MobilityBuildingInfo instance is located
*
* \return The room number
*/
uint8_t GetRoomNumberX (void);
uint8_t GetRoomNumberX ();
/**
* \brief Get the room number along y-axis at which the MobilityBuildingInfo instance is located
*
* \return The room number
*/
uint8_t GetRoomNumberY (void);
uint8_t GetRoomNumberY ();
/**
* \brief Get the building in which the MobilityBuildingInfo instance is located

2
src/buildings/model/oh-buildings-propagation-loss-model.cc
View File

@@ -49,7 +49,7 @@ OhBuildingsPropagationLossModel::~OhBuildingsPropagationLossModel ()
}
TypeId
OhBuildingsPropagationLossModel::GetTypeId (void)
OhBuildingsPropagationLossModel::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::OhBuildingsPropagationLossModel")

2
src/buildings/model/oh-buildings-propagation-loss-model.h
View File

@@ -44,7 +44,7 @@ public:
* \brief Get the type ID.
* \return The object TypeId.
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
OhBuildingsPropagationLossModel ();
~OhBuildingsPropagationLossModel ();

12
src/buildings/model/random-walk-2d-outdoor-mobility-model.cc
View File

@@ -38,7 +38,7 @@ NS_LOG_COMPONENT_DEFINE ("RandomWalk2dOutdoor");
NS_OBJECT_ENSURE_REGISTERED (RandomWalk2dOutdoorMobilityModel);
TypeId
RandomWalk2dOutdoorMobilityModel::GetTypeId (void)
RandomWalk2dOutdoorMobilityModel::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::RandomWalk2dOutdoorMobilityModel")
.SetParent<MobilityModel> ()
@@ -96,14 +96,14 @@ RandomWalk2dOutdoorMobilityModel::GetTypeId (void)
}
void
RandomWalk2dOutdoorMobilityModel::DoInitialize (void)
RandomWalk2dOutdoorMobilityModel::DoInitialize ()
{
DoInitializePrivate ();
MobilityModel::DoInitialize ();
}
void
RandomWalk2dOutdoorMobilityModel::DoInitializePrivate (void)
RandomWalk2dOutdoorMobilityModel::DoInitializePrivate ()
{
m_helper.Update ();
double speed = m_speed->GetValue ();
@@ -402,13 +402,13 @@ RandomWalk2dOutdoorMobilityModel::AvoidBuilding (Time delayLeft, Vector intersec
}
void
RandomWalk2dOutdoorMobilityModel::DoDispose (void)
RandomWalk2dOutdoorMobilityModel::DoDispose ()
{
// chain up
MobilityModel::DoDispose ();
}
Vector
RandomWalk2dOutdoorMobilityModel::DoGetPosition (void) const
RandomWalk2dOutdoorMobilityModel::DoGetPosition () const
{
m_helper.UpdateWithBounds (m_bounds);
return m_helper.GetCurrentPosition ();
@@ -422,7 +422,7 @@ RandomWalk2dOutdoorMobilityModel::DoSetPosition (const Vector &position)
m_event = Simulator::ScheduleNow (&RandomWalk2dOutdoorMobilityModel::DoInitializePrivate, this);
}
Vector
RandomWalk2dOutdoorMobilityModel::DoGetVelocity (void) const
RandomWalk2dOutdoorMobilityModel::DoGetVelocity () const
{
return m_helper.GetVelocity ();
}

12
src/buildings/model/random-walk-2d-outdoor-mobility-model.h
View File

@@ -61,7 +61,7 @@ public:
* Register this type with the TypeId system.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
/** An enum representing the different working modes of this module. */
enum Mode
{
@@ -90,7 +90,7 @@ private:
/**
* Perform initialization of the object before MobilityModel::DoInitialize ()
*/
void DoInitializePrivate (void);
void DoInitializePrivate ();
/**
* Check if there is a building between two positions (or if the nextPosition is inside a building).
* The code is taken from MmWave3gppBuildingsPropagationLossModel from the NYU/UNIPD ns-3 mmWave module
@@ -110,11 +110,11 @@ private:
*/
Vector CalculateIntersectionFromOutside (const Vector &current, const Vector &next, const Box boundaries) const;
virtual void DoDispose (void);
virtual void DoInitialize (void);
virtual Vector DoGetPosition (void) const;
virtual void DoDispose ();
virtual void DoInitialize ();
virtual Vector DoGetPosition () const;
virtual void DoSetPosition (const Vector &position);
virtual Vector DoGetVelocity (void) const;
virtual Vector DoGetVelocity () const;
virtual int64_t DoAssignStreams (int64_t);
ConstantVelocityHelper m_helper; //!< helper for this object

4
src/buildings/model/three-gpp-v2v-channel-condition-model.cc
View File

@@ -30,7 +30,7 @@ NS_LOG_COMPONENT_DEFINE ("ThreeGppV2vChannelConditionModel");
NS_OBJECT_ENSURE_REGISTERED (ThreeGppV2vUrbanChannelConditionModel);
TypeId
ThreeGppV2vUrbanChannelConditionModel::GetTypeId (void)
ThreeGppV2vUrbanChannelConditionModel::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::ThreeGppV2vUrbanChannelConditionModel")
.SetParent<ThreeGppChannelConditionModel> ()
@@ -96,7 +96,7 @@ ThreeGppV2vUrbanChannelConditionModel::ComputePnlos (Ptr<const MobilityModel> a,
NS_OBJECT_ENSURE_REGISTERED (ThreeGppV2vHighwayChannelConditionModel);
TypeId
ThreeGppV2vHighwayChannelConditionModel::GetTypeId (void)
ThreeGppV2vHighwayChannelConditionModel::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::ThreeGppV2vHighwayChannelConditionModel")
.SetParent<ThreeGppChannelConditionModel> ()

4
src/buildings/model/three-gpp-v2v-channel-condition-model.h
View File

@@ -54,7 +54,7 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
/**
* Constructor for the ThreeGppV2vUrbanChannelConditionModel class
@@ -116,7 +116,7 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void);
static TypeId GetTypeId ();
/**
* Constructor for the ThreeGppV2vHighwayChannelConditionModel class

4
src/buildings/test/building-position-allocator-test.cc
View File

@@ -89,7 +89,7 @@ public:
RandomRoomPositionAllocatorTestCase ();
private:
virtual void DoRun (void);
virtual void DoRun ();
};
@@ -173,7 +173,7 @@ public:
SameRoomPositionAllocatorTestCase ();
private:
virtual void DoRun (void);
virtual void DoRun ();
};

4
src/buildings/test/buildings-channel-condition-model-test.cc
View File

@@ -55,7 +55,7 @@ private:
/**
* Builds the simulation scenario and perform the tests
*/
virtual void DoRun (void);
virtual void DoRun ();
/**
* Struct containing the parameters for each test
@@ -80,7 +80,7 @@ BuildingsChannelConditionModelTestCase::~BuildingsChannelConditionModelTestCase
}
void
BuildingsChannelConditionModelTestCase::DoRun (void)
BuildingsChannelConditionModelTestCase::DoRun ()
{
TestVector testVector;

2
src/buildings/test/buildings-helper-test.cc
View File

@@ -122,7 +122,7 @@ public:
BuildingsHelperOneTestCase (PositionInBuilding pib, BuildingData bd);
private:
virtual void DoRun (void);
virtual void DoRun ();
PositionInBuilding m_pib; //!< Position in the building
BuildingData m_bd; //!< Building data

2
src/buildings/test/buildings-pathloss-test.cc
View File

@@ -147,7 +147,7 @@ BuildingsPathlossTestCase::~BuildingsPathlossTestCase ()
}
void
BuildingsPathlossTestCase::DoRun (void)
BuildingsPathlossTestCase::DoRun ()
{
NS_LOG_FUNCTION (this);

2
src/buildings/test/buildings-pathloss-test.h
View File

@@ -67,7 +67,7 @@ public:
virtual ~BuildingsPathlossTestCase ();
private:
virtual void DoRun (void);
virtual void DoRun ();
/**
* Create a mobility model based on its index
* \param index MobilityModel index

2
src/buildings/test/buildings-shadowing-test.cc
View File

@@ -86,7 +86,7 @@ BuildingsShadowingTestCase::~BuildingsShadowingTestCase ()
}
void
BuildingsShadowingTestCase::DoRun (void)
BuildingsShadowingTestCase::DoRun ()
{
NS_LOG_FUNCTION (this);

2
src/buildings/test/buildings-shadowing-test.h
View File

@@ -68,7 +68,7 @@ public:
virtual ~BuildingsShadowingTestCase ();
private:
virtual void DoRun (void);
virtual void DoRun ();
/**
* Create a mobility model based on its index
* \param index MobilityModel index

4
src/buildings/test/outdoor-random-walk-test.cc
View File

@@ -47,7 +47,7 @@ public:
virtual ~OutdoorRandomWalkTestCase ();
private:
virtual void DoRun (void);
virtual void DoRun ();
/**
* Check that the position is the expected one
@@ -76,7 +76,7 @@ OutdoorRandomWalkTestCase::CheckPositionOutdoor (Ptr<RandomWalk2dOutdoorMobility
}
void
OutdoorRandomWalkTestCase::DoRun (void)
OutdoorRandomWalkTestCase::DoRun ()
{
// create a grid of buildings
double buildingSizeX = 100; // m

12
src/buildings/test/three-gpp-v2v-channel-condition-model-test.cc
View File

@@ -64,7 +64,7 @@ private:
/**
* Builds the simulation scenario and perform the tests
*/
virtual void DoRun (void);
virtual void DoRun ();
/**
* Struct containing the parameters for each test
@@ -88,7 +88,7 @@ ThreeGppV2vBuildingsChCondModelTestCase::~ThreeGppV2vBuildingsChCondModelTestCas
{}
void
ThreeGppV2vBuildingsChCondModelTestCase::DoRun (void)
ThreeGppV2vBuildingsChCondModelTestCase::DoRun ()
{
RngSeedManager::SetSeed (1);
RngSeedManager::SetRun (1);
@@ -200,7 +200,7 @@ private:
/**
* Builds the simulation scenario and perform the tests
*/
virtual void DoRun (void);
virtual void DoRun ();
/**
* Evaluates the channel condition between two nodes by calling the method
@@ -248,7 +248,7 @@ ThreeGppV2vUrbanLosNlosvChCondModelTestCase::EvaluateChannelCondition (Ptr<Mobil
}
void
ThreeGppV2vUrbanLosNlosvChCondModelTestCase::DoRun (void)
ThreeGppV2vUrbanLosNlosvChCondModelTestCase::DoRun ()
{
RngSeedManager::SetSeed (1);
RngSeedManager::SetRun (1);
@@ -351,7 +351,7 @@ private:
/**
* Builds the simulation scenario and perform the tests
*/
virtual void DoRun (void);
virtual void DoRun ();
/**
* Evaluates the channel condition between two nodes by calling the method
@@ -399,7 +399,7 @@ ThreeGppV2vHighwayLosNlosvChCondModelTestCase::EvaluateChannelCondition (Ptr<Mob
}
void
ThreeGppV2vHighwayLosNlosvChCondModelTestCase::DoRun (void)
ThreeGppV2vHighwayLosNlosvChCondModelTestCase::DoRun ()
{
RngSeedManager::SetSeed (1);
RngSeedManager::SetRun (1);

2
src/config-store/examples/config-store-save.cc
View File

@@ -19,7 +19,7 @@ public:
* \brief Get the type ID.
* \return the object TypeId
*/
static TypeId GetTypeId (void) {
static TypeId GetTypeId () {
static TypeId tid = TypeId ("ns3::ConfigExample")
.SetParent<Object> ()
.AddAttribute ("TestInt16", "help text",

4
src/config-store/model/attribute-default-iterator.cc
View File

@@ -32,7 +32,7 @@ AttributeDefaultIterator::~AttributeDefaultIterator ()
{
}
void
AttributeDefaultIterator::Iterate (void)
AttributeDefaultIterator::Iterate ()
{
for (uint32_t i = 0; i < TypeId::GetRegisteredN (); i++)
{
@@ -109,7 +109,7 @@ AttributeDefaultIterator::StartVisitTypeId (std::string name)
{
}
void
AttributeDefaultIterator::EndVisitTypeId (void)
AttributeDefaultIterator::EndVisitTypeId ()
{
}

4
src/config-store/model/attribute-default-iterator.h
View File

@@ -40,7 +40,7 @@ public:
* and VisitAttribute on the attributes in one TypeId. At the end of each TypeId
* EndVisitTypeId is called.
*/
void Iterate (void);
void Iterate ();
private:
/**
* \brief Begin the analysis of a TypeId
@@ -50,7 +50,7 @@ private:
/**
* \brief End the analysis of a TypeId
*/
virtual void EndVisitTypeId (void);
virtual void EndVisitTypeId ();
/**
* \brief Visit an Attribute
* \param tid the TypeId the attribute belongs to

20
src/config-store/model/attribute-iterator.cc
View File

@@ -38,7 +38,7 @@ AttributeIterator::~AttributeIterator ()
}
void
AttributeIterator::Iterate (void)
AttributeIterator::Iterate ()
{
for (uint32_t i = 0; i < Config::GetRootNamespaceObjectN (); ++i)
{
@@ -81,7 +81,7 @@ AttributeIterator::GetCurrentPath (std::string attr) const
}
std::string
AttributeIterator::GetCurrentPath (void) const
AttributeIterator::GetCurrentPath () const
{
std::ostringstream oss;
for (uint32_t i = 0; i < m_currentPath.size (); ++i)
@@ -96,7 +96,7 @@ AttributeIterator::DoStartVisitObject (Ptr<Object> object)
{
}
void
AttributeIterator::DoEndVisitObject (void)
AttributeIterator::DoEndVisitObject ()
{
}
void
@@ -104,7 +104,7 @@ AttributeIterator::DoStartVisitPointerAttribute (Ptr<Object> object, std::string
{
}
void
AttributeIterator::DoEndVisitPointerAttribute (void)
AttributeIterator::DoEndVisitPointerAttribute ()
{
}
void
@@ -112,7 +112,7 @@ AttributeIterator::DoStartVisitArrayAttribute (Ptr<Object> object, std::string n
{
}
void
AttributeIterator::DoEndVisitArrayAttribute (void)
AttributeIterator::DoEndVisitArrayAttribute ()
{
}
void
@@ -120,7 +120,7 @@ AttributeIterator::DoStartVisitArrayItem (const ObjectPtrContainerValue &vector,
{
}
void
AttributeIterator::DoEndVisitArrayItem (void)
AttributeIterator::DoEndVisitArrayItem ()
{
}
@@ -139,7 +139,7 @@ AttributeIterator::StartVisitObject (Ptr<Object> object)
DoStartVisitObject (object);
}
void
AttributeIterator::EndVisitObject (void)
AttributeIterator::EndVisitObject ()
{
m_currentPath.pop_back ();
DoEndVisitObject ();
@@ -152,7 +152,7 @@ AttributeIterator::StartVisitPointerAttribute (Ptr<Object> object, std::string n
DoStartVisitPointerAttribute (object, name, value);
}
void
AttributeIterator::EndVisitPointerAttribute (void)
AttributeIterator::EndVisitPointerAttribute ()
{
m_currentPath.pop_back ();
m_currentPath.pop_back ();
@@ -165,7 +165,7 @@ AttributeIterator::StartVisitArrayAttribute (Ptr<Object> object, std::string nam
DoStartVisitArrayAttribute (object, name, vector);
}
void
AttributeIterator::EndVisitArrayAttribute (void)
AttributeIterator::EndVisitArrayAttribute ()
{
m_currentPath.pop_back ();
DoEndVisitArrayAttribute ();
@@ -181,7 +181,7 @@ AttributeIterator::StartVisitArrayItem (const ObjectPtrContainerValue &vector, u
DoStartVisitArrayItem (vector, index, item);
}
void
AttributeIterator::EndVisitArrayItem (void)
AttributeIterator::EndVisitArrayItem ()
{
m_currentPath.pop_back ();
m_currentPath.pop_back ();

20
src/config-store/model/attribute-iterator.h
View File

@@ -41,13 +41,13 @@ public:
/**
* Start the process of iterating all objects from the root namespace object
*/
void Iterate (void);
void Iterate ();
protected:
/**
* Get the current attribute path
* \returns the current path string
*/
std::string GetCurrentPath (void) const;
std::string GetCurrentPath () const;
private:
/**
* This method visits and performs a config-store action (such as saving
@@ -67,7 +67,7 @@ private:
* This method is called to end the process of visiting the currently
* visited object.
*/
virtual void DoEndVisitObject (void);
virtual void DoEndVisitObject ();
/**
* Visit the attribute of type ns3::PointerValue, with the provided name,
* found on the object pointed to by the first argument.
@@ -80,7 +80,7 @@ private:
/**
* End the visit to the attribute of type ns3::PointerValue.
*/
virtual void DoEndVisitPointerAttribute (void);
virtual void DoEndVisitPointerAttribute ();
/**
* Visit the attribute of type ns3::ObjectVectorValue, with the
* provided name, found on the object pointed to by the first argument.
@@ -95,7 +95,7 @@ private:
/**
* End the visit to the attribute of type ns3::ObjectVectorValue.
*/
virtual void DoEndVisitArrayAttribute (void);
virtual void DoEndVisitArrayAttribute ();
/**
* Start to visit the object found in the input array at the provided index
* \param vector the array
@@ -106,7 +106,7 @@ private:
/**
* End the visit to the array item
*/
virtual void DoEndVisitArrayItem (void);
virtual void DoEndVisitArrayItem ();
/**
* Perform the iteration
@@ -140,7 +140,7 @@ private:
/**
* End the visit to the object
*/
void EndVisitObject (void);
void EndVisitObject ();
/**
* Visit the attribute of type ns3::PointerValue, with the provided name,
* found on the object pointed to by the first argument.
@@ -153,7 +153,7 @@ private:
/**
* End the visit to the attribute of type ns3::PointerValue.
*/
void EndVisitPointerAttribute (void);
void EndVisitPointerAttribute ();
/**
* Visit the attribute of type ns3::ObjectVectorValue, with the
* provided name, found on the object pointed to by the first argument.
@@ -168,7 +168,7 @@ private:
/**
* End the visit to the attribute of type ns3::ObjectVectorValue.
*/
void EndVisitArrayAttribute (void);
void EndVisitArrayAttribute ();
/**
* Start to visit the object found in the input array at the provided index
* \param vector the array
@@ -179,7 +179,7 @@ private:
/**
* End the visit to the array item
*/
void EndVisitArrayItem (void);
void EndVisitArrayItem ();
std::vector<Ptr<Object> > m_examined; ///< list of attributes examined

8
src/config-store/model/config-store.cc
View File

@@ -46,7 +46,7 @@ NS_LOG_COMPONENT_DEFINE ("ConfigStore");
NS_OBJECT_ENSURE_REGISTERED (ConfigStore);
TypeId
ConfigStore::GetTypeId (void)
ConfigStore::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::ConfigStore")
.SetParent<ObjectBase> ()
@@ -78,7 +78,7 @@ ConfigStore::GetTypeId (void)
return tid;
}
TypeId
ConfigStore::GetInstanceTypeId (void) const
ConfigStore::GetInstanceTypeId () const
{
return GetTypeId ();
}
@@ -175,14 +175,14 @@ ConfigStore::SetSaveDeprecated (bool saveDeprecated)
}
void
ConfigStore::ConfigureAttributes (void)
ConfigStore::ConfigureAttributes ()
{
NS_LOG_FUNCTION (this);
m_file->Attributes ();
}
void
ConfigStore::ConfigureDefaults (void)
ConfigStore::ConfigureDefaults ()
{
NS_LOG_FUNCTION (this);
m_file->Default ();

Some files were not shown because too many files have changed in this diff Show More