summaryrefslogtreecommitdiff
path: root/ACE/ace
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2021-09-28 10:14:24 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2021-09-28 10:14:24 +0200
commitb5c94111662dfcc8dab19dc1c84e716e9cfc7f26 (patch)
tree11eee60c2e94bb28b50e6a96b2697fa70960fdf5 /ACE/ace
parent6a127777136e5210a5b2ddc9ac7fc3f74d47d6ce (diff)
downloadATCD-b5c94111662dfcc8dab19dc1c84e716e9cfc7f26.tar.gz
Make use of delete
* ACE/ace/Manual_Event.inl: Deleted. * ACE/ace/Event.cpp: * ACE/ace/Event.h: * ACE/ace/Event_Handler.cpp: * ACE/ace/Event_Handler.h: * ACE/ace/Manual_Event.cpp: * ACE/ace/Manual_Event.h: * ACE/ace/Method_Request.cpp: * ACE/ace/Method_Request.h: * ACE/ace/Name_Request_Reply.cpp: * ACE/ace/Naming_Context.h:
Diffstat (limited to 'ACE/ace')
-rw-r--r--ACE/ace/Event.cpp5
-rw-r--r--ACE/ace/Event.h2
-rw-r--r--ACE/ace/Event_Handler.cpp5
-rw-r--r--ACE/ace/Event_Handler.h2
-rw-r--r--ACE/ace/Manual_Event.cpp4
-rw-r--r--ACE/ace/Manual_Event.h6
-rw-r--r--ACE/ace/Manual_Event.inl10
-rw-r--r--ACE/ace/Method_Request.cpp4
-rw-r--r--ACE/ace/Method_Request.h3
-rw-r--r--ACE/ace/Name_Request_Reply.cpp2
-rw-r--r--ACE/ace/Naming_Context.h2
11 files changed, 5 insertions, 40 deletions
diff --git a/ACE/ace/Event.cpp b/ACE/ace/Event.cpp
index 01918ec80e1..4b4d62085f5 100644
--- a/ACE/ace/Event.cpp
+++ b/ACE/ace/Event.cpp
@@ -37,9 +37,4 @@ ACE_Event_T<TIME_POLICY>::ACE_Event_T (int manual_reset,
ACE_TEXT ("ACE_Event_T<TIME_POLICY>::ACE_Event_T")));
}
-template <class TIME_POLICY>
-ACE_Event_T<TIME_POLICY>::~ACE_Event_T ()
-{
-}
-
ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Event.h b/ACE/ace/Event.h
index bd1270deea3..78682631d9d 100644
--- a/ACE/ace/Event.h
+++ b/ACE/ace/Event.h
@@ -47,7 +47,7 @@ public:
LPSECURITY_ATTRIBUTES sa = 0);
/// Implicitly destroy the event variable.
- virtual ~ACE_Event_T ();
+ virtual ~ACE_Event_T () = default;
/// Get the current time of day according to the queue's TIME_POLICY.
/// Allows users to initialize timeout values using correct time policy.
diff --git a/ACE/ace/Event_Handler.cpp b/ACE/ace/Event_Handler.cpp
index 4b016b0b1bc..db98ca84d53 100644
--- a/ACE/ace/Event_Handler.cpp
+++ b/ACE/ace/Event_Handler.cpp
@@ -22,11 +22,6 @@ ACE_Event_Handler::ACE_Event_Handler (ACE_Reactor *r,
// ACE_TRACE ("ACE_Event_Handler::ACE_Event_Handler");
}
-ACE_Event_Handler::~ACE_Event_Handler ()
-{
- // ACE_TRACE ("ACE_Event_Handler::~ACE_Event_Handler");
-}
-
// Gets the file descriptor associated with this I/O device.
ACE_HANDLE
ACE_Event_Handler::get_handle () const
diff --git a/ACE/ace/Event_Handler.h b/ACE/ace/Event_Handler.h
index aef70d591ae..8a5300058d4 100644
--- a/ACE/ace/Event_Handler.h
+++ b/ACE/ace/Event_Handler.h
@@ -83,7 +83,7 @@ public:
};
/// Destructor is virtual to enable proper cleanup.
- virtual ~ACE_Event_Handler ();
+ virtual ~ACE_Event_Handler () = default;
/// Get the I/O handle.
virtual ACE_HANDLE get_handle () const;
diff --git a/ACE/ace/Manual_Event.cpp b/ACE/ace/Manual_Event.cpp
index 91235a610e0..0e05eef8d8f 100644
--- a/ACE/ace/Manual_Event.cpp
+++ b/ACE/ace/Manual_Event.cpp
@@ -1,9 +1,5 @@
#include "ace/Manual_Event.h"
-#if !defined (__ACE_INLINE__)
-#include "ace/Manual_Event.inl"
-#endif /* __ACE_INLINE__ */
-
#if defined (ACE_HAS_ALLOC_HOOKS)
# include "ace/Malloc_Base.h"
#endif /* ACE_HAS_ALLOC_HOOKS */
diff --git a/ACE/ace/Manual_Event.h b/ACE/ace/Manual_Event.h
index 757d8564e66..e3e8e14e38c 100644
--- a/ACE/ace/Manual_Event.h
+++ b/ACE/ace/Manual_Event.h
@@ -51,7 +51,7 @@ public:
#endif /* ACE_HAS_WCHAR */
/// Default dtor.
- ~ACE_Manual_Event_T ();
+ ~ACE_Manual_Event_T () = default;
/// Dump the state of an object.
void dump () const;
@@ -88,10 +88,6 @@ public:
ACE_END_VERSIONED_NAMESPACE_DECL
-#if defined (__ACE_INLINE__)
-#include "ace/Manual_Event.inl"
-#endif /* __ACE_INLINE__ */
-
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "ace/Manual_Event.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ACE/ace/Manual_Event.inl b/ACE/ace/Manual_Event.inl
deleted file mode 100644
index 7db9b7b0ebd..00000000000
--- a/ACE/ace/Manual_Event.inl
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- C++ -*-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-template <class TIME_POLICY>
-ACE_INLINE
-ACE_Manual_Event_T<TIME_POLICY>::~ACE_Manual_Event_T ()
-{
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Method_Request.cpp b/ACE/ace/Method_Request.cpp
index 161ff174d13..94e88709e8e 100644
--- a/ACE/ace/Method_Request.cpp
+++ b/ACE/ace/Method_Request.cpp
@@ -7,10 +7,6 @@ ACE_Method_Request::ACE_Method_Request (unsigned long prio)
{
}
-ACE_Method_Request::~ACE_Method_Request ()
-{
-}
-
unsigned long
ACE_Method_Request::priority () const
{
diff --git a/ACE/ace/Method_Request.h b/ACE/ace/Method_Request.h
index 66bd5449345..0833fe93dd6 100644
--- a/ACE/ace/Method_Request.h
+++ b/ACE/ace/Method_Request.h
@@ -47,7 +47,7 @@ public:
ACE_Method_Request (unsigned long priority = 0);
/// Destructor.
- virtual ~ACE_Method_Request (void);
+ virtual ~ACE_Method_Request () = default;
// = Accessors.
/// Get priority.
@@ -87,7 +87,6 @@ private:
protected:
/// The priority of the request.
unsigned long priority_;
-
};
ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Name_Request_Reply.cpp b/ACE/ace/Name_Request_Reply.cpp
index e76dbf257c1..bef296599a2 100644
--- a/ACE/ace/Name_Request_Reply.cpp
+++ b/ACE/ace/Name_Request_Reply.cpp
@@ -10,14 +10,12 @@
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Default "do nothing" constructor.
-
ACE_Name_Request::ACE_Name_Request ()
{
ACE_TRACE ("ACE_Name_Request::ACE_Name_Request");
}
// Create a ACE_Name_Request message.
-
ACE_Name_Request::ACE_Name_Request (
ACE_INT32 t, // Type of request.
const ACE_WCHAR_T name[], // Name
diff --git a/ACE/ace/Naming_Context.h b/ACE/ace/Naming_Context.h
index 453e1822f10..c7b7969678f 100644
--- a/ACE/ace/Naming_Context.h
+++ b/ACE/ace/Naming_Context.h
@@ -64,7 +64,7 @@ public:
};
/// "Do-nothing" constructor.
- ACE_Naming_Context (void);
+ ACE_Naming_Context ();
/**
* Specifies the scope of this namespace, opens and memory-maps the