core: (fixes #705) prevents GCC 12 warnings

This commit is contained in:
Tommaso Pecorella
2022-08-03 23:50:24 -05:00
committed by Tommaso Pecorella
parent 04c9d95d0e
commit c04254fc75
10 changed files with 7 additions and 52 deletions

View File

@@ -443,8 +443,6 @@ public:
FunctorCallbackImpl (T const &functor)
: m_functor (functor)
{}
virtual ~FunctorCallbackImpl ()
{}
/**
* Functor with varying numbers of arguments
* @{
@@ -607,8 +605,6 @@ public:
MemPtrCallbackImpl (OBJ_PTR const&objPtr, MEM_PTR memPtr)
: m_objPtr (objPtr), m_memPtr (memPtr)
{}
virtual ~MemPtrCallbackImpl ()
{}
/**
* Functor with varying numbers of arguments
* @{
@@ -777,8 +773,6 @@ public:
BoundFunctorCallbackImpl (FUNCTOR functor, ARG a)
: m_functor (functor), m_a (a)
{}
virtual ~BoundFunctorCallbackImpl ()
{}
/**
* Functor with varying numbers of arguments
* @{
@@ -935,8 +929,6 @@ public:
TwoBoundFunctorCallbackImpl (FUNCTOR functor, ARG1 arg1, ARG2 arg2)
: m_functor (functor), m_a1 (arg1), m_a2 (arg2)
{}
virtual ~TwoBoundFunctorCallbackImpl ()
{}
/**
* Functor with varying numbers of arguments
* @{
@@ -1083,8 +1075,6 @@ public:
ThreeBoundFunctorCallbackImpl (FUNCTOR functor, ARG1 arg1, ARG2 arg2, ARG3 arg3)
: m_functor (functor), m_a1 (arg1), m_a2 (arg2), m_a3 (arg3)
{}
virtual ~ThreeBoundFunctorCallbackImpl ()
{}
/**
* Functor with varying numbers of arguments
* @{

View File

@@ -684,9 +684,14 @@ Ptr<T>::Ptr (T *ptr, bool ref)
template <typename T>
Ptr<T>::Ptr (Ptr const&o)
: m_ptr (PeekPointer (o))
: m_ptr (nullptr)
{
Acquire ();
T* ptr = PeekPointer (o);
if (ptr != 0)
{
m_ptr = ptr;
Acquire ();
}
}
template <typename T>
template <typename U>

View File

@@ -1575,11 +1575,6 @@ Ipv4L3Protocol::Fragments::Fragments ()
NS_LOG_FUNCTION (this);
}
Ipv4L3Protocol::Fragments::~Fragments ()
{
NS_LOG_FUNCTION (this);
}
void
Ipv4L3Protocol::Fragments::AddFragment (Ptr<Packet> fragment, uint16_t fragmentOffset, bool moreFragment)
{

View File

@@ -530,11 +530,6 @@ private:
*/
Fragments ();
/**
* \brief Destructor.
*/
~Fragments ();
/**
* \brief Add a fragment.
* \param fragment the fragment

View File

@@ -1728,11 +1728,6 @@ PbbMessageIpv4::PbbMessageIpv4 ()
NS_LOG_FUNCTION (this);
}
PbbMessageIpv4::~PbbMessageIpv4 ()
{
NS_LOG_FUNCTION (this);
}
PbbAddressLength
PbbMessageIpv4::GetAddressLength (void) const
{
@@ -1784,11 +1779,6 @@ PbbMessageIpv6::PbbMessageIpv6 ()
NS_LOG_FUNCTION (this);
}
PbbMessageIpv6::~PbbMessageIpv6 ()
{
NS_LOG_FUNCTION (this);
}
PbbAddressLength
PbbMessageIpv6::GetAddressLength (void) const
{

View File

@@ -1127,7 +1127,6 @@ private:
class PbbMessageIpv4 : public PbbMessage {
public:
PbbMessageIpv4 ();
virtual ~PbbMessageIpv4 ();
protected:
/**
@@ -1155,7 +1154,6 @@ protected:
class PbbMessageIpv6 : public PbbMessage {
public:
PbbMessageIpv6 ();
virtual ~PbbMessageIpv6 ();
protected:
/**

View File

@@ -49,7 +49,6 @@ public:
* \param ecnCapable ECN capable flag
*/
PieQueueDiscTestItem (Ptr<Packet> p, const Address & addr, bool ecnCapable);
virtual ~PieQueueDiscTestItem ();
// Delete default constructor, copy constructor and assignment operator to avoid misuse
PieQueueDiscTestItem () = delete;
@@ -86,10 +85,6 @@ PieQueueDiscTestItem::PieQueueDiscTestItem (Ptr<Packet> p, const Address & addr,
{
}
PieQueueDiscTestItem::~PieQueueDiscTestItem ()
{
}
void
PieQueueDiscTestItem::AddHeader (void)
{

View File

@@ -50,7 +50,6 @@ public:
* \param priority the packet priority
*/
PrioQueueDiscTestItem (Ptr<Packet> p, const Address & addr, uint8_t priority);
virtual ~PrioQueueDiscTestItem ();
virtual void AddHeader (void);
virtual bool Mark (void);
};
@@ -63,10 +62,6 @@ PrioQueueDiscTestItem::PrioQueueDiscTestItem (Ptr<Packet> p, const Address & add
p->ReplacePacketTag (priorityTag);
}
PrioQueueDiscTestItem::~PrioQueueDiscTestItem ()
{
}
void
PrioQueueDiscTestItem::AddHeader (void)
{

View File

@@ -47,7 +47,6 @@ public:
* \param ecnCapable ECN capable flag
*/
RedQueueDiscTestItem (Ptr<Packet> p, const Address & addr, bool ecnCapable);
virtual ~RedQueueDiscTestItem ();
// Delete default constructor, copy constructor and assignment operator to avoid misuse
RedQueueDiscTestItem () = delete;
@@ -67,10 +66,6 @@ RedQueueDiscTestItem::RedQueueDiscTestItem (Ptr<Packet> p, const Address & addr,
{
}
RedQueueDiscTestItem::~RedQueueDiscTestItem ()
{
}
void
RedQueueDiscTestItem::AddHeader (void)
{

View File

@@ -42,9 +42,6 @@ public:
: m_scheduler (scheduler)
{
}
virtual ~CoordinationListener ()
{
}
virtual void NotifyCchSlotStart (Time duration)
{
m_scheduler->NotifyCchSlotStart (duration);