Merge pull request #283 from jwillemsen/master

Fixed typos

11 files changed, 12 insertions, 50 deletions

diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl
index 28f3a9d9d10..cd2931a8e1c 100644
--- a/ACE/ace/OS_NS_sys_mman.inl
+++ b/ACE/ace/OS_NS_sys_mman.inl
@@ -8,7 +8,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_HAS_VOIDPTR_MMAP)
-// Needed for some odd OS's (e.g., SGI).
+// Needed for some odd OS's
 typedef void *ACE_MMAP_TYPE;
 #else
 typedef char *ACE_MMAP_TYPE;
diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp
index 0d7f3231b10..e3414396b3a 100644
--- a/ACE/ace/POSIX_Proactor.cpp
+++ b/ACE/ace/POSIX_Proactor.cpp
@@ -974,40 +974,6 @@ void ACE_POSIX_AIOCB_Proactor::check_max_aio_num ()
   ACELIB_DEBUG ((LM_DEBUG,
              "(%P | %t) ACE_POSIX_AIOCB_Proactor::Max Number of AIOs=%d\n",
               aiocb_list_max_size_));
-
-#if defined(__sgi)
-
-   ACELIB_DEBUG((LM_DEBUG,
-              ACE_TEXT( "SGI IRIX specific: aio_init!\n")));
-
-//typedef struct aioinit {
-//    int aio_threads;  /* The number of aio threads to start (5) */
-//    int aio_locks;    /* Initial number of preallocated locks (3) */
-//    int aio_num;      /* estimated total simultanious aiobc structs (1000) */
-//    int aio_usedba;   /* Try to use DBA for raw I/O in lio_listio (0) */
-//    int aio_debug;    /* turn on debugging (0) */
-//    int aio_numusers; /* max number of user sprocs making aio_* calls (5) */
-//    int aio_reserved[3];
-//} aioinit_t;
-
-    aioinit_t  aioinit;
-
-    aioinit.aio_threads = 10; /* The number of aio threads to start (5) */
-    aioinit.aio_locks = 20;   /* Initial number of preallocated locks (3) */
-                       /* estimated total simultaneous aiobc structs (1000) */
-    aioinit.aio_num = aiocb_list_max_size_;
-    aioinit.aio_usedba = 0;   /* Try to use DBA for raw IO in lio_listio (0) */
-    aioinit.aio_debug = 0;    /* turn on debugging (0) */
-    aioinit.aio_numusers = 100; /* max number of user sprocs making aio_* calls (5) */
-    aioinit.aio_reserved[0] = 0;
-    aioinit.aio_reserved[1] = 0;
-    aioinit.aio_reserved[2] = 0;
-
-    aio_sgi_init (&aioinit);
-
-#endif
-
-    return;
 }
 
 void
@@ -1026,7 +992,6 @@ ACE_POSIX_AIOCB_Proactor::delete_notify_manager (void)
 {
   // We are responsible for delete as all pointers set to 0 after
   // delete, it is save to delete twice
-
   delete aiocb_notify_pipe_manager_;
   aiocb_notify_pipe_manager_ = 0;
 }
diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp
index 4329b7a1638..71d0685af14 100644
--- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp
+++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp
@@ -66,7 +66,7 @@ QoS_Util::parse_args (void)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s"
                            " [-m host:port] QoS multicast session address"
-                           " Overides the receiver address specified in the -n option"
+                           " Overrides the receiver address specified in the -n option"
                            " [-n host:port] Use for a unicast sender. "
                            " Follow by receiver addr"
                            " [-p tcp|udp] specify protocol to be used"
diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp
index 4329b7a1638..71d0685af14 100644
--- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp
+++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp
@@ -66,7 +66,7 @@ QoS_Util::parse_args (void)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s"
                            " [-m host:port] QoS multicast session address"
-                           " Overides the receiver address specified in the -n option"
+                           " Overrides the receiver address specified in the -n option"
                            " [-n host:port] Use for a unicast sender. "
                            " Follow by receiver addr"
                            " [-p tcp|udp] specify protocol to be used"
diff --git a/ACE/examples/QOS/Simple/QoS_Util.cpp b/ACE/examples/QOS/Simple/QoS_Util.cpp
index 4329b7a1638..71d0685af14 100644
--- a/ACE/examples/QOS/Simple/QoS_Util.cpp
+++ b/ACE/examples/QOS/Simple/QoS_Util.cpp
@@ -66,7 +66,7 @@ QoS_Util::parse_args (void)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s"
                            " [-m host:port] QoS multicast session address"
-                           " Overides the receiver address specified in the -n option"
+                           " Overrides the receiver address specified in the -n option"
                            " [-n host:port] Use for a unicast sender. "
                            " Follow by receiver addr"
                            " [-p tcp|udp] specify protocol to be used"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
index b0f247456b4..c3bf761f86a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -589,7 +589,7 @@ TAO_Notify_Consumer::dispatch_from_queue (
 }
 
 /// @todo: rather than is_error, use pacing interval so it will be configurable
-/// @todo: find some way to use batch buffering stratgy for sequence consumers.
+/// @todo: find some way to use batch buffering strategy for sequence consumers.
 void
 TAO_Notify_Consumer::schedule_timer (bool is_error)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index f6a54aefa5c..483546e7e7e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -74,8 +74,7 @@ TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier)
 
   if (max_suppliers != 0 && supplier_count >= max_suppliers.value ())
   {
-    throw CORBA::IMP_LIMIT (
-      ); // we've reached the limit of suppliers connected.
+    throw CORBA::IMP_LIMIT (); // we've reached the limit of suppliers connected.
   }
 
   {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
index 1cb7f208491..98d4536a3ea 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
@@ -42,8 +42,6 @@ TAO_Notify_Supplier::dispatch_updates_i (
     this->subscribe_->subscription_change (added, removed);
 }
 
-
-
 bool
 TAO_Notify_Supplier::is_alive (bool allow_nil_supplier)
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
index 3330849a81a..6eca9f6a293 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
@@ -78,7 +78,7 @@ private:
  * @brief Defines a class for the distributer application callback
  * for receiving data.
  *
- * This class overides the methods of the TAO_AV_Callback so the
+ * This class overrides the methods of the TAO_AV_Callback so the
  * AVStreams can make upcalls to the application.
  */
 class Distributer_Sender_Callback : public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
index 3df685c8f03..c179a105c2b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
@@ -41,7 +41,7 @@ public:
  *
  * @brief Defines a class for the sender application callback.
  *
- * This class overides the methods of the TAO_AV_Callback so the
+ * This class overrides the methods of the TAO_AV_Callback so the
  * AVStreams can make upcalls to the application.
  */
 class Sender_Callback : public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
index 555f7b10d95..9e79d0ccaea 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
@@ -21,7 +21,7 @@
  *
  * @brief Defines a class for the server application callback.
  *
- * This class overides the methods of the TAO_AV_Callback so the
+ * This class overrides the methods of the TAO_AV_Callback so the
  * AVStreams can make upcalls to the application.
  */
 class FTP_Server_Callback : public TAO_AV_Callback
@@ -63,8 +63,8 @@ private:
  * @class Server
  *
  * @brief Defines the server application class.
- * = DESCRIPOTION
- * The actual server progarm that acts as the ftp server that receives data
+ *
+ * The actual server program that acts as the ftp server that receives data
  * sent by the ftp client.
  */
 class Server
@@ -73,7 +73,7 @@ public:
   /// Constructor
   Server (void);
 
-  /// Deestructor.
+  /// Destructor.
   ~Server (void);
 
   /// Initialize data components.