diff --git a/ACE/bin/copy-local-script.sh b/ACE/bin/copy-local-script.sh
index eefdfe89ae965..12a0e81affdd5 100755
--- a/ACE/bin/copy-local-script.sh
+++ b/ACE/bin/copy-local-script.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 for i in *.gz *.bz2 *.zip *.md5; do
-  d=`echo $i | sed 's/\.[tz][ai][rp]/-8.0.3&/'`
+  d=`echo $i | sed 's/\.[tz][ai][rp]/-8.0.4&/'`
   echo "Copying $i to $d"
   cp -ip $i $d
 done
diff --git a/ACE/examples/APG/Containers/KeyType.h b/ACE/examples/APG/Containers/KeyType.h
index e2e5040ac1a63..6e95778579164 100644
--- a/ACE/examples/APG/Containers/KeyType.h
+++ b/ACE/examples/APG/Containers/KeyType.h
@@ -8,13 +8,16 @@ class KeyType
 public:
   friend bool operator == (const KeyType&, const KeyType&);
 
-  KeyType () : val_(0) {}
+  KeyType () = default;
   KeyType (int i) : val_(i) {}
-  KeyType (const KeyType& kt) { this->val_ = kt.val_; };
+  KeyType (const KeyType&) = default;
+  KeyType (KeyType&&) = default;
+  KeyType& operator= (const KeyType&) = default;
+  KeyType& operator= (KeyType&&) = default;
   operator int() const { return val_; };
 
 private:
-  int val_;
+  int val_ {};
 };
 
 bool operator == (const KeyType& a, const KeyType& b)
diff --git a/ACE/examples/APG/Streams/Answerer.cpp b/ACE/examples/APG/Streams/Answerer.cpp
index 79cfb0101bcbd..d04a826b480c1 100644
--- a/ACE/examples/APG/Streams/Answerer.cpp
+++ b/ACE/examples/APG/Streams/Answerer.cpp
@@ -20,7 +20,7 @@
 class AnswerIncomingCall : public BasicTask
 {
 protected:
-  virtual int process (Message *message)
+  int process (Message *message) override
   {
     ACE_TRACE ("AnswerIncomingCall::process()");
 
@@ -29,7 +29,7 @@ class AnswerIncomingCall : public BasicTask
                          ACE_TEXT ("%p\n"),
                          ACE_TEXT ("AnswerIncomingCall")),
                         -1);
-      return 0;
+    return 0;
   }
 };
 // Listing 21
@@ -38,7 +38,7 @@ class AnswerIncomingCall : public BasicTask
 class GetCallerId : public BasicTask
 {
 protected:
-  virtual int process (Message *message)
+  int process (Message *message) override
   {
     ACE_TRACE ("GetCallerId::process()");
 
@@ -60,7 +60,7 @@ class GetCallerId : public BasicTask
 class PlayOutgoingMessage : public BasicTask
 {
 protected:
-  virtual int process (Message *message)
+  int process (Message *message) override
   {
     ACE_TRACE ("PlayOutgoingMessage::process()");
 
@@ -90,7 +90,7 @@ class PlayOutgoingMessage : public BasicTask
 class RecordIncomingMessage : public BasicTask
 {
 protected:
-  virtual int process (Message *message)
+  int process (Message *message) override
   {
     ACE_TRACE ("RecordIncomingMessage::process()");
 
@@ -121,7 +121,7 @@ class RecordIncomingMessage : public BasicTask
 class ReleaseDevice : public BasicTask
 {
 protected:
-  virtual int process (Message *message)
+  int process (Message *message) override
   {
     ACE_TRACE ("ReleaseDevice::process()");
     message->recorder ()->release ();
@@ -134,7 +134,7 @@ class ReleaseDevice : public BasicTask
 class EncodeMessage : public BasicTask
 {
 protected:
-  virtual int process (Message *message)
+  int process (Message *message) override
   {
     ACE_TRACE ("EncodeMessage::process()");
 
@@ -165,7 +165,7 @@ class EncodeMessage : public BasicTask
 class SaveMetaData : public BasicTask
 {
 protected:
-  virtual int process (Message *message)
+  int process (Message *message) override
   {
     ACE_TRACE ("SaveMetaData::process()");
 
@@ -203,7 +203,7 @@ class SaveMetaData : public BasicTask
 class NotifySomeone : public BasicTask
 {
 protected:
-  virtual int process (Message *message)
+  int process (Message *message) override
   {
     ACE_TRACE ("NotifySomeone::process()");
 
@@ -235,8 +235,8 @@ class RecordingStream : public ACE_Stream<ACE_MT_SYNCH>
 
   //FUZZ: disable check_for_lack_ACE_OS
   // Listing 1000 code/ch18
-  virtual int open (void *arg,
-                    Module *head = 0, Module *tail = 0)
+  int open (void *arg,
+            Module *head = 0, Module *tail = 0) override
   {
   //FUZZ: enable check_for_lack_ACE_OS
     if (tail == 0)
diff --git a/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp b/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp
index cb688852485f7..1843d2bccbaa1 100644
--- a/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp
+++ b/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp
@@ -16,9 +16,12 @@
  * handle_input(). It also checks wether the counter is greater than zero
  * indicating, that handle_input() has been called before.
  */
-#define INVOCATION_ENTER() do { if (mInvocationCounter > 0) \
-        ACE_ERROR((LM_ERROR, ACE_TEXT("Multiple invocations detected.\n"))); \
-        mInvocationCounter++; } while (0)
+#define INVOCATION_ENTER() \
+  do { \
+     if (mInvocationCounter > 0) \
+       ACE_ERROR((LM_ERROR, ACE_TEXT("Multiple invocations detected.\n"))); \
+     mInvocationCounter++; } \
+  while (0)
 
 /**
  * THis macro is the counter part to INVOCATION_ENTER(). It decreases the