Mon Jul 12 11:04:58 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/ACE.cpp:
        * ace/Activation_Queue.h:
        * ace/Active_Map_Manager.h:
        * ace/Dev_Poll_Reactor.h:
        * ace/Dev_Poll_Reactor.inl:
        * ace/Event_Handler.h:
        * ace/Filecache.h:
        * ace/Manual_Event.h:
        * ace/Map_Manager.h:
        * ace/Mem_Map.h:
        * ace/Message_Block.h:
        * ace/OS_Log_Msg_Attributes.h:
        * ace/OS_NS_unistd.h:
        * ace/Object_Manager.h:
        * ace/Recursive_Thread_Mutex.h:
          Layout, const, and doxygen fixes

1 files changed, 9 insertions, 12 deletions

diff --git a/ACE/ace/Mem_Map.h b/ACE/ace/Mem_Map.h
index 2329722c9cd..3cd7df94785 100644
--- a/ACE/ace/Mem_Map.h
+++ b/ACE/ace/Mem_Map.h
@@ -22,6 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Global_Macros.h"
+#include "ace/Copy_Disabled.h"
 #include "ace/os_include/sys/os_mman.h"
 #include "ace/os_include/os_limits.h"
 #include "ace/os_include/os_fcntl.h"
@@ -37,7 +38,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * This class works with both the mmap(2) UNIX system and the
  * Win32 family of memory mapping system calls.
  */
-class ACE_Export ACE_Mem_Map
+class ACE_Export ACE_Mem_Map : private ACE_Copy_Disabled
 {
 public:
   // = Initialization and termination methods.
@@ -128,38 +129,38 @@ public:
   /// file.
   size_t size (void) const;
 
-  /// Unmap the region starting at <base_addr_>.
+  /// Unmap the region starting at base_addr_.
   int unmap (ssize_t len = -1);
 
-  /// Unmap the region starting at <addr_>.
+  /// Unmap the region starting at addr_.
   int unmap (void *addr, ssize_t len);
 
   /**
    * Sync @a len bytes of the memory region to the backing store
-   * starting at <base_addr_>.  If @a len == -1 then sync the whole
+   * starting at base_addr_.  If @a len == -1 then sync the whole
    * region.
    */
   int sync (size_t len, int flags = MS_SYNC);
 
   /**
    * Sync the whole memory region to the backing store
-   * starting at <base_addr_>.
+   * starting at base_addr_.
    */
   int sync (int flags = MS_SYNC);
 
   /// Sync @a len bytes of the memory region to the backing store
-  /// starting at <addr_>.
+  /// starting at addr_.
   int sync (void *addr, size_t len, int flags = MS_SYNC);
 
   /**
    * Change the protection of the pages of the mapped region to @a prot
-   * starting at <base_addr_> up to @a len bytes.
+   * starting at base_addr_ up to @a len bytes.
    */
   int protect (size_t len, int prot = PROT_RDWR);
 
   /**
    * Change the protection of all the pages of the mapped region to @a prot
-   * starting at <base_addr_>.
+   * starting at base_addr_.
    */
   int protect (int prot = PROT_RDWR);
 
@@ -197,10 +198,6 @@ private:
               ACE_OFF_T offset = 0,
               LPSECURITY_ATTRIBUTES sa = 0);
 
-  // = Disallow copying and assignment.
-  ACE_Mem_Map (const ACE_Mem_Map &);
-  void operator = (const ACE_Mem_Map &);
-
 private:
 
   /// Base address of the memory-mapped file.