1 files changed, 40 insertions, 40 deletions

diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h
index 03fa8dba9bf..e85ff7f5dfa 100644
--- a/ACE/ace/Guard_T.h
+++ b/ACE/ace/Guard_T.h
@@ -80,33 +80,33 @@ public:
   ACE_Guard (ACE_LOCK &l, bool block, int become_owner);
 
   /// Implicitly release the lock.
-  ~ACE_Guard (void);
+  ~ACE_Guard ();
 
   // = Lock accessors.
 
   /// Explicitly acquire the lock.
-  int acquire (void);
+  int acquire ();
 
   /// Conditionally acquire the lock (i.e., won't block).
-  int tryacquire (void);
+  int tryacquire ();
 
   /// Explicitly release the lock, but only if it is held!
-  int release (void);
+  int release ();
 
   /// Relinquish ownership of the lock so that it is not released
   /// implicitly in the destructor.
-  void disown (void);
+  void disown ();
 
   // = Utility methods.
   /// true if locked, false if couldn't acquire the lock
   /// (errno will contain the reason for this).
-  bool locked (void) const;
+  bool locked () const;
 
   /// Explicitly remove the lock.
-  int remove (void);
+  int remove ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
@@ -124,8 +124,8 @@ protected:
 
 private:
   // = Prevent assignment and initialization.
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Guard<ACE_LOCK> &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Guard (const ACE_Guard<ACE_LOCK> &))
+  void operator= (const ACE_Guard<ACE_LOCK> &) = delete;
+  ACE_Guard (const ACE_Guard<ACE_LOCK> &) = delete;
 };
 
 /**
@@ -152,21 +152,21 @@ public:
   // = Lock accessors.
 
   /// Explicitly acquire the write lock.
-  int acquire_write (void);
+  int acquire_write ();
 
   /// Explicitly acquire the write lock.
-  int acquire (void);
+  int acquire ();
 
   /// Conditionally acquire the write lock (i.e., won't block).
-  int tryacquire_write (void);
+  int tryacquire_write ();
 
   /// Conditionally acquire the write lock (i.e., won't block).
-  int tryacquire (void);
+  int tryacquire ();
 
   // = Utility methods.
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
@@ -196,21 +196,21 @@ public:
   // = Lock accessors.
 
   /// Explicitly acquire the read lock.
-  int acquire_read (void);
+  int acquire_read ();
 
   /// Explicitly acquire the read lock.
-  int acquire (void);
+  int acquire ();
 
   /// Conditionally acquire the read lock (i.e., won't block).
-  int tryacquire_read (void);
+  int tryacquire_read ();
 
   /// Conditionally acquire the read lock (i.e., won't block).
-  int tryacquire (void);
+  int tryacquire ();
 
   // = Utility methods.
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
@@ -242,36 +242,36 @@ public:
   ACE_TSS_Guard (ACE_LOCK &lock, bool block = true);
 
   /// Implicitly release the thread-specific lock.
-  ~ACE_TSS_Guard (void);
+  ~ACE_TSS_Guard ();
 
   // = Lock accessors.
 
   /// Explicitly acquire the thread-specific lock.
-  int acquire (void);
+  int acquire ();
 
   /// Conditionally acquire the thread-specific lock (i.e., won't
   /// block).
-  int tryacquire (void);
+  int tryacquire ();
 
   /// Explicitly release the thread-specific lock.
-  int release (void);
+  int release ();
 
   // = Utility methods.
   /// Explicitly release the thread-specific lock.
-  int remove (void);
+  int remove ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
   /// Helper, meant for subclass only.
-  ACE_TSS_Guard (void);
+  ACE_TSS_Guard ();
 
   /// Initialize the key.
-  void init_key (void);
+  void init_key ();
 
   /// Called when thread exits to clean up the lock.
   static void cleanup (void *ptr);
@@ -284,8 +284,8 @@ private:
   typedef ACE_Guard<ACE_LOCK> Guard_Type;
   // FUZZ: enable check_for_ACE_Guard
 
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS_Guard<ACE_LOCK> &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_TSS_Guard (const ACE_TSS_Guard<ACE_LOCK> &))
+  void operator= (const ACE_TSS_Guard<ACE_LOCK> &) = delete;
+  ACE_TSS_Guard (const ACE_TSS_Guard<ACE_LOCK> &) = delete;
 };
 
 /**
@@ -306,21 +306,21 @@ public:
   // = Lock accessors.
 
   /// Explicitly acquire the thread-specific write lock.
-  int acquire_write (void);
+  int acquire_write ();
 
   /// Explicitly acquire the thread-specific write lock.
-  int acquire (void);
+  int acquire ();
 
   /// Conditionally acquire the thread-specific write lock (i.e., won't block).
-  int tryacquire_write (void);
+  int tryacquire_write ();
 
   /// Conditionally acquire the thread-specific write lock (i.e., won't block).
-  int tryacquire (void);
+  int tryacquire ();
 
   // = Utility methods.
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
@@ -348,22 +348,22 @@ public:
 
   // = Lock accessors.
   /// Explicitly acquire the thread-specific read lock.
-  int acquire_read (void);
+  int acquire_read ();
 
   /// Explicitly acquire the thread-specific read lock.
-  int acquire (void);
+  int acquire ();
 
   /// Conditionally acquire the thread-specific read lock (i.e., won't
   /// block).
-  int tryacquire_read (void);
+  int tryacquire_read ();
 
   /// Conditionally acquire the thread-specific read lock (i.e., won't
   /// block).
-  int tryacquire (void);
+  int tryacquire ();
 
   // = Utility methods.
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.