diff options
-rw-r--r-- | ACE-INSTALL.html | 2 | ||||
-rw-r--r-- | ace/Mem_Map.cpp | 2 | ||||
-rw-r--r-- | ace/Mem_Map.h | 6 | ||||
-rw-r--r-- | ace/WFMO_Reactor.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html index 1182c4592ca..ae28343d05b 100644 --- a/ACE-INSTALL.html +++ b/ACE-INSTALL.html @@ -1665,7 +1665,7 @@ For our build we require the following packages besides the packages the setup selects by default: <a name="cygwinpacks"> </a></p><blockquote> -<a name="cygwinpacks"><b><tt>gcc (version 3.3.3), cygipc, make, perl, binutils</tt></b>. +<a name="cygwinpacks"><b><tt>gcc (version 3.3.3), cygserver, make, perl, binutils</tt></b>. </a></blockquote> <ol> diff --git a/ace/Mem_Map.cpp b/ace/Mem_Map.cpp index b5c27adc303..3202d04bc06 100644 --- a/ace/Mem_Map.cpp +++ b/ace/Mem_Map.cpp @@ -125,7 +125,7 @@ ACE_Mem_Map::map_it (ACE_HANDLE handle, if (result == -1) return -1; #else - long result = ACE_OS::filesize (this->handle_); + off_t result = ACE_OS::filesize (this->handle_); #endif /* CHORUS */ // At this point we know <result> is not negative... diff --git a/ace/Mem_Map.h b/ace/Mem_Map.h index 80c7e88fb87..c72093faf40 100644 --- a/ace/Mem_Map.h +++ b/ace/Mem_Map.h @@ -45,7 +45,7 @@ public: /// Default constructor. ACE_Mem_Map (void); - /// Map a file from an open file descriptor <handle>. This function + /// Map a file from an open file descriptor @a handle. This function /// will lookup the length of the file if it is not given. ACE_Mem_Map (ACE_HANDLE handle, int length = -1, @@ -55,7 +55,7 @@ public: off_t offset = 0, LPSECURITY_ATTRIBUTES sa = 0); - /// Map a file specified by <file_name>. + /// Map a file specified by @a file_name. ACE_Mem_Map (const ACE_TCHAR *filename, int len = -1, int flags = O_RDWR | O_CREAT, @@ -66,7 +66,7 @@ public: off_t offset = 0, LPSECURITY_ATTRIBUTES sa = 0); - /// Map a file from an open file descriptor <handle>. This function + /// Map a file from an open file descriptor @a handle. This function /// will lookup the length of the file if it is not given. int map (ACE_HANDLE handle, int length = -1, diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp index fd1e387ecc6..7ccd0c254f2 100644 --- a/ace/WFMO_Reactor.cpp +++ b/ace/WFMO_Reactor.cpp @@ -2393,7 +2393,7 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum, else { ACE_Notification_Buffer *buffer = - (ACE_Notification_Buffer *) mb->base (); + reinterpret_cast <ACE_Notification_Buffer *> (mb->base ()); // If eh == 0 then we've got major problems! Otherwise, we // need to dispatch the appropriate handle_* method on the @@ -2557,7 +2557,7 @@ ACE_WFMO_Reactor_Notify::purge_pending_notifications (ACE_Event_Handler *eh, for (index = 0; index < queue_size; ++index) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; if (-1 == this->message_queue_.dequeue_head (mb)) return -1; // This shouldn't happen... |