Merge branch 'DOCGroup:master' into master

2 files changed, 19 insertions, 30 deletions

diff --git a/ACE/ace/Compression/rle/RLECompressor.cpp b/ACE/ace/Compression/rle/RLECompressor.cpp
index 8e83df4dcfc..0c852ad9784 100644
--- a/ACE/ace/Compression/rle/RLECompressor.cpp
+++ b/ACE/ace/Compression/rle/RLECompressor.cpp
@@ -1,27 +1,19 @@
 #include "RLECompressor.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750)
-#  pragma option push -w-8072
-#endif
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_RLECompressor::ACE_RLECompressor(void)
+ACE_RLECompressor::ACE_RLECompressor()
     : ACE_Compressor(ACE_COMPRESSORID_RLE)
 {
 }
 
-ACE_RLECompressor::~ACE_RLECompressor(void)
-{
-}
-
 // Compress using Run Length Encoding (RLE)
 ACE_UINT64
-ACE_RLECompressor::compress( const void *in_ptr,
-                             ACE_UINT64 in_len,
-                             void *out_ptr,
-                             ACE_UINT64 max_out_len )
+ACE_RLECompressor::compress(const void *in_ptr,
+                            ACE_UINT64 in_len,
+                            void *out_ptr,
+                            ACE_UINT64 max_out_len)
 {
     const ACE_Byte *in_p    = static_cast<const ACE_Byte *>(in_ptr);
     ACE_Byte *out_p         = static_cast<ACE_Byte *>(out_ptr);
@@ -96,10 +88,10 @@ ACE_RLECompressor::compress( const void *in_ptr,
 
 // Decompress using Run Length Encoding (RLE)
 ACE_UINT64
-ACE_RLECompressor::decompress( const void *in_ptr,
-                               ACE_UINT64 in_len,
-                               void *out_ptr,
-                               ACE_UINT64 max_out_len )
+ACE_RLECompressor::decompress(const void *in_ptr,
+                              ACE_UINT64 in_len,
+                              void *out_ptr,
+                              ACE_UINT64 max_out_len)
 {
     ACE_UINT64  out_len     = 0;
 
@@ -140,6 +132,3 @@ ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_RLECompressor, ACE_SYNCH_M
 // Close versioned namespace, if enabled by the user.
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750)
-# pragma option pop
-#endif
diff --git a/ACE/ace/Compression/rle/RLECompressor.h b/ACE/ace/Compression/rle/RLECompressor.h
index 81640155395..bce7cf2280f 100644
--- a/ACE/ace/Compression/rle/RLECompressor.h
+++ b/ACE/ace/Compression/rle/RLECompressor.h
@@ -57,9 +57,9 @@ public:
   /**
   * Default constructor. Should use instance() to get global instance.
   */
-  ACE_RLECompressor(void);
+  ACE_RLECompressor();
 
-  virtual ~ACE_RLECompressor(void);
+  ~ACE_RLECompressor() override = default;
 
   /**
   * Compress the @a in_ptr buffer for @a in_len into the
@@ -75,10 +75,10 @@ public:
   * for the possibility that a reduced compressed length
   * is not possible.
   */
-  virtual ACE_UINT64 compress( const void *in_ptr,
-                                ACE_UINT64 in_len,
-                                void *out_ptr,
-                                ACE_UINT64 max_out_len );
+  ACE_UINT64 compress(const void *in_ptr,
+                      ACE_UINT64 in_len,
+                      void *out_ptr,
+                      ACE_UINT64 max_out_len) override;
 
   /**
   * DeCompress the @a in_ptr buffer for @a in_len into the
@@ -89,10 +89,10 @@ public:
   * otherwise the return value will indicate the resultant
   * @a out_ptr decompressed buffer length.
   */
-  virtual ACE_UINT64 decompress( const void *in_ptr,
-                                  ACE_UINT64 in_len,
-                                  void *out_ptr,
-                                  ACE_UINT64 max_out_len );
+  ACE_UINT64 decompress(const void *in_ptr,
+                        ACE_UINT64 in_len,
+                        void *out_ptr,
+                        ACE_UINT64 max_out_len) override;
 };
 
 ACE_RLECOMPRESSION_SINGLETON_DECLARE(ACE_Singleton, ACE_RLECompressor, ACE_SYNCH_MUTEX);