Use ACE_OS::strcmp instead of ACE_OS_String::strcmp

    * ACE/tests/Message_Queue_Test.cpp:
    * TAO/docs/ec_options.html:
    * TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp:
    * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h:
    * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h:
    * TAO/orbsvcs/orbsvcs/HTIOP/README.txt:
    * TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp:
    * TAO/tao/Connection_Purging_Strategy.h:
    * TAO/tao/GIOP_Message_Base.cpp:
    * TAO/tao/Invocation_Retry_Params.cpp:
    * TAO/tao/Invocation_Retry_State.cpp:
    * TAO/tao/Invocation_Retry_State.h:
    * TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h:
    * TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h:
    * TAO/tao/Synch_Invocation.cpp:
    * TAO/tao/Transport_Cache_Manager_T.cpp:
    * TAO/tao/Transport_Cache_Manager_T.h:
    * TAO/tests/Bug_1495_Regression/server_interceptor.cpp:
    * TAO/tests/DII_AMI_Forward/server_interceptor.cpp:
    * TAO/tests/ForwardOnceUponException/README:
    * TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp:
    * TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp:
    * TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp:
    * TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp:

24 files changed, 43 insertions, 69 deletions

diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp
index d20802ebd51..391d73f284a 100644
--- a/ACE/tests/Message_Queue_Test.cpp
+++ b/ACE/tests/Message_Queue_Test.cpp
@@ -838,8 +838,8 @@ prio_test (void)
               mb1p->rd_ptr (),
               mb2p->rd_ptr ()));
 
-  if (ACE_OS_String::strcmp (mb1p->rd_ptr (), S1) == 0
-      && ACE_OS_String::strcmp (mb2p->rd_ptr (), S2) == 0)
+  if (ACE_OS::strcmp (mb1p->rd_ptr (), S1) == 0
+      && ACE_OS::strcmp (mb2p->rd_ptr (), S2) == 0)
     status = 0;
   else
     status = 1;
diff --git a/TAO/docs/ec_options.html b/TAO/docs/ec_options.html
index 3b9430614b7..124dda5196b 100644
--- a/TAO/docs/ec_options.html
+++ b/TAO/docs/ec_options.html
@@ -558,7 +558,7 @@ static EC_QueueFullSimpleActions "[wait | discard]"
             the Event Channel will create the connection to the consumer at
             the moment the first event is pushed to the consumer.
             When the network is heavily loaded during this connect and a new event
-            is pushed before the connection is establed, a new create connection
+            is pushed before the connection is established, a new create connection
             request is done. When having very high connection establishment
             time (for example running on a WAN) and an interval that is much
             smaller than the connection establishment time it is wise to
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index 2db58389364..dda812b88b0 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -194,17 +194,17 @@ namespace TAO
 
     // If it is COMPLETED_MAYBE, then we will throw a COMPLETED_NO,
     // which the ORB should understand
-    if (ACE_OS_String::strcmp (rep_id.in (),
+    if (ACE_OS::strcmp (rep_id.in (),
                                "IDL:omg.org/CORBA/TRANSIENT:1.0") == 0)
       throw CORBA::TRANSIENT (min, CORBA::COMPLETED_NO);
-    else if (ACE_OS_String::strcmp (rep_id.in (),
+    else if (ACE_OS::strcmp (rep_id.in (),
                                   "IDL:omg.org/CORBA/COMM_FAILURE:1.0") == 0)
       throw CORBA::COMM_FAILURE (min, CORBA::COMPLETED_NO);
-    else if (ACE_OS_String::strcmp (rep_id.in (),
+    else if (ACE_OS::strcmp (rep_id.in (),
                                     "IDL:omg.org/CORBA/NO_REPONSE:1.0") == 0)
       throw CORBA::NO_RESPONSE (min, CORBA::COMPLETED_NO);
 
-    else if (ACE_OS_String::strcmp (rep_id.in (),
+    else if (ACE_OS::strcmp (rep_id.in (),
                                     "IDL:omg.org/CORBA/OBJ_ADAPTER:1.0") == 0)
     throw CORBA::OBJ_ADAPTER (min, CORBA::COMPLETED_NO);
     cout << "Didnt throw exception " << endl;
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
index ce4dcfa6b34..057d7ebe609 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
@@ -45,7 +45,6 @@ namespace TAO
      * are known so the stream may be handed off to either an existing
      * session, or to a newly created one.
      */
-
     typedef TAO_Creation_Strategy<Connection_Handler> CREATION_STRATEGY2;
     typedef TAO_Concurrency_Strategy<Connection_Handler> CONCURRENCY_STRATEGY2;
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h
index 79525e3729e..f453b5cf8fa 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h
@@ -82,9 +82,9 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 
 // Note that these declarations are placed outside of the scope of the
 // namespace. The generated functions use a C style signature which does
-// not accomodate namespaces, so assuming namespace concatination is an
+// not accommodate namespaces, so assuming namespace concatenation is an
 // error. The service class name should be composed of a flattened class
-// name, with the namespaces preceeding the class name with '_'.
+// name, with the namespaces preceding the class name with '_'.
 ACE_STATIC_SVC_DECLARE_EXPORT (HTIOP, TAO_HTIOP_Protocol_Factory)
 ACE_FACTORY_DECLARE (HTIOP, TAO_HTIOP_Protocol_Factory)
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/README.txt b/TAO/orbsvcs/orbsvcs/HTIOP/README.txt
index d4d1e86052e..798ed1d3ba6 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/README.txt
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/README.txt
@@ -1,5 +1,3 @@
-
-
       HTTP Tunneling Inter-ORB Protocol
 
 Introduction
@@ -9,8 +7,6 @@ HTTP Tunneling Inter-ORB Protocol
 
 Introduction
 
-
-
 1.Terminology
 
 Inside - This refers to any peer that is inside a firewall protected
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
index e6d431f20fa..0dfb18dcc59 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
@@ -105,7 +105,7 @@ TAO::Security::AccessDecision::ReferenceKeyType::operator==
                             other.oid_->get_buffer(),olen) == 0 &&
             ACE_OS::memcmp (this->adapter_id_->get_buffer(),
                             other.adapter_id_->get_buffer(),alen) == 0 &&
-            ACE_OS_String::strcmp (this->orbid_.in(), other.orbid_.in()) == 0);
+            ACE_OS::strcmp (this->orbid_.in(), other.orbid_.in()) == 0);
   return false;
 }
 
diff --git a/TAO/tao/Connection_Purging_Strategy.h b/TAO/tao/Connection_Purging_Strategy.h
index 7cf597bf0f7..dc790a99e80 100644
--- a/TAO/tao/Connection_Purging_Strategy.h
+++ b/TAO/tao/Connection_Purging_Strategy.h
@@ -35,7 +35,6 @@ class TAO_Transport;
  * This class is used by the Transport_Cache_Manager to maintain
  * ordering information on each Transport that is created.
  */
-
 class TAO_Export TAO_Connection_Purging_Strategy
 {
 public:
@@ -52,7 +51,7 @@ public:
   virtual void update_item (TAO_Transport& transport) = 0;
 
 private:
-  /// The maximum number of cach entries
+  /// The maximum number of cache entries
   int cache_maximum_;
 };
 
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 75cc21133e9..355b3190fb8 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -1411,7 +1411,6 @@ TAO_GIOP_Message_Base::get_parser (
 // errors in the case of "clean shutdown", because it relies on
 // orderly disconnect as provided by TCP.  This quality of service is
 // required to write robust distributed systems.)
-
 void
 TAO_GIOP_Message_Base::
   send_close_connection (const TAO_GIOP_Message_Version &version,
@@ -1440,7 +1439,6 @@ TAO_GIOP_Message_Base::
   //
   // @@ should recv and discard queued data for portability; note
   // that this won't block (long) since we never set SO_LINGER
-
   if (TAO_debug_level > 9)
     {
       this->dump_msg ("send_close_connection",
@@ -1474,7 +1472,6 @@ TAO_GIOP_Message_Base::
       transport-> id ()));
 }
 
-
 int
 TAO_GIOP_Message_Base::send_reply_exception (
     TAO_Transport *transport,
@@ -1643,7 +1640,6 @@ TAO_GIOP_Message_Base::is_ready_for_bidirectional (TAO_OutputCDR &msg) const
   return generator_parser->is_ready_for_bidirectional ();
 }
 
-
 TAO_Queued_Data *
 TAO_GIOP_Message_Base::make_queued_data (size_t sz)
 {
@@ -1947,7 +1943,6 @@ TAO_GIOP_Message_Base::consolidate_fragmented_message (
   return 0;
 }
 
-
 int
 TAO_GIOP_Message_Base::discard_fragmented_message (const TAO_Queued_Data *cancel_request)
 {
diff --git a/TAO/tao/Invocation_Retry_Params.cpp b/TAO/tao/Invocation_Retry_Params.cpp
index 382c03cef33..48519b3ea0f 100644
--- a/TAO/tao/Invocation_Retry_Params.cpp
+++ b/TAO/tao/Invocation_Retry_Params.cpp
@@ -8,10 +8,10 @@ TAO::Invocation_Retry_Params::Invocation_Retry_Params (void)
   : forward_on_reply_closed_limit_ (0)
   , init_retry_delay_ (0, 100000) // Set default to 0.1 seconds
 {
-      this->forward_on_exception_limit_[FOE_OBJECT_NOT_EXIST] = 0;
-      this->forward_on_exception_limit_[FOE_COMM_FAILURE] = 0;
-      this->forward_on_exception_limit_[FOE_TRANSIENT] = 0;
-      this->forward_on_exception_limit_[FOE_INV_OBJREF] = 0;
+  this->forward_on_exception_limit_[FOE_OBJECT_NOT_EXIST] = 0;
+  this->forward_on_exception_limit_[FOE_COMM_FAILURE] = 0;
+  this->forward_on_exception_limit_[FOE_TRANSIENT] = 0;
+  this->forward_on_exception_limit_[FOE_INV_OBJREF] = 0;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Invocation_Retry_State.cpp b/TAO/tao/Invocation_Retry_State.cpp
index 6e3cd989696..4c62c4e9d80 100644
--- a/TAO/tao/Invocation_Retry_State.cpp
+++ b/TAO/tao/Invocation_Retry_State.cpp
@@ -51,7 +51,6 @@ namespace
       client_factory_params.forward_on_reply_closed_limit_;
 
   // Forward on exception limits
-
   retry_limit_calc (TAO::FOE_OBJECT_NOT_EXIST,
                     command_line_params,
                     client_factory_params,
@@ -174,5 +173,4 @@ TAO::Invocation_Retry_State::sleep () const
   ACE_OS::sleep (this->retry_params_.init_retry_delay_);
 }
 
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Invocation_Retry_State.h b/TAO/tao/Invocation_Retry_State.h
index 1e235d124ca..ffb26c0d0cc 100644
--- a/TAO/tao/Invocation_Retry_State.h
+++ b/TAO/tao/Invocation_Retry_State.h
@@ -23,7 +23,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   /**
    * @class Invocation_Retry_State
    *
diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
index facc7698ed5..89546535b21 100644
--- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
+++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
@@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * transport has a larger ordering number than the previous.  This will
  * cause the first transport to be purged first.
  */
-
 class TAO_Strategies_Export TAO_FIFO_Connection_Purging_Strategy:
                             public TAO_Connection_Purging_Strategy
 {
diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
index b99b6ae997b..93c55d33a94 100644
--- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
+++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
@@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * in.  This way, the least frequently used transport has the
  * smallest ordering number and will therefore be purged first.
  */
-
 class TAO_Strategies_Export TAO_LFU_Connection_Purging_Strategy:
                             public TAO_Connection_Purging_Strategy
 {
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index 4b7563ec7a6..6e1c38b22e9 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -35,32 +35,27 @@ namespace
   int
   excep_for_type (const char *tid)
   {
-    if (ACE_OS_String::strcmp (tid, "IDL:omg.org/CORBA/TRANSIENT:1.0") == 0)
+    if (ACE_OS::strcmp (tid, "IDL:omg.org/CORBA/TRANSIENT:1.0") == 0)
       {
         return TAO::FOE_TRANSIENT;
       }
-    else if (ACE_OS_String::strcmp (tid,
-                                    "IDL:omg.org/CORBA/COMM_FAILURE:1.0") == 0)
+    else if (ACE_OS::strcmp (tid, "IDL:omg.org/CORBA/COMM_FAILURE:1.0") == 0)
       {
         return TAO::FOE_COMM_FAILURE;
       }
-    else if (ACE_OS_String::strcmp (tid,
-                                    "IDL:omg.org/CORBA/OBJECT_NOT_EXIST:1.0") == 0)
+    else if (ACE_OS::strcmp (tid, "IDL:omg.org/CORBA/OBJECT_NOT_EXIST:1.0") == 0)
       {
         return TAO::FOE_OBJECT_NOT_EXIST;
       }
-    else if (ACE_OS_String::strcmp (tid,
-                                    "IDL:omg.org/CORBA/INV_OBJREF:1.0") == 0)
+    else if (ACE_OS::strcmp (tid, "IDL:omg.org/CORBA/INV_OBJREF:1.0") == 0)
       {
         return TAO::FOE_INV_OBJREF;
       }
-    else if (ACE_OS_String::strcmp (tid,
-                                    "IDL:omg.org/CORBA/OBJ_ADAPTER:1.0") == 0)
+    else if (ACE_OS::strcmp (tid, "IDL:omg.org/CORBA/OBJ_ADAPTER:1.0") == 0)
       {
         return TAO::FOE_OBJ_ADAPTER;
       }
-    else if (ACE_OS_String::strcmp (tid,
-                                    "IDL:omg.org/CORBA/NO_RESPONSE:1.0") == 0)
+    else if (ACE_OS::strcmp (tid, "IDL:omg.org/CORBA/NO_RESPONSE:1.0") == 0)
       {
         return TAO::FOE_NO_RESPONSE;
       }
@@ -640,8 +635,8 @@ namespace TAO
       }
     else
       {
-        int foe_kind = orb_params->forward_once_exception();
-        int ex_id = excep_for_type (type_id.in ());
+        int const foe_kind = orb_params->forward_once_exception();
+        int const ex_id = excep_for_type (type_id.in ());
 
         // this logic is a little confusing but prior to  Jul 24 2009, TRANSIENT,
         // OBJ_ADAPTER, NO_RESPONSE, and COMM_FAILURE were always retried if possible.
diff --git a/TAO/tao/Transport_Cache_Manager_T.cpp b/TAO/tao/Transport_Cache_Manager_T.cpp
index 0dab65921c7..868bd41cd97 100644
--- a/TAO/tao/Transport_Cache_Manager_T.cpp
+++ b/TAO/tao/Transport_Cache_Manager_T.cpp
@@ -18,7 +18,6 @@
 // TAO_debug_level > 6: detailed cache operations (LM_DEBUG)
 // TAO_debug_level > 8: for debugging the cache itself (LM_DEBUG)
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -306,7 +305,7 @@ namespace TAO
                   {
                     TAOLIB_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::find_i, ")
-                      ACE_TEXT ("Found available Transport[%d] @hash:index {%d:%d}\n"),
+                      ACE_TEXT ("found available Transport[%d] @hash:index {%d:%d}\n"),
                       entry->item ().transport ()->id (),
                       entry->ext_id_.hash (),
                       entry->ext_id_.index ()
@@ -319,7 +318,7 @@ namespace TAO
                   {
                     TAOLIB_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::find_i, ")
-                      ACE_TEXT ("Found connecting Transport[%d] @hash:index {%d:%d}\n"),
+                      ACE_TEXT ("found connecting Transport[%d] @hash:index {%d:%d}\n"),
                       entry->item ().transport ()->id (),
                       entry->ext_id_.hash (),
                       entry->ext_id_.index ()
@@ -345,7 +344,7 @@ namespace TAO
                   {
                     TAOLIB_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::find_i, ")
-                      ACE_TEXT ("Found busy Transport[%d] @hash:index {%d:%d}\n"),
+                      ACE_TEXT ("found busy Transport[%d] @hash:index {%d:%d}\n"),
                       entry->item ().transport ()->id (),
                       entry->ext_id_.hash (),
                       entry->ext_id_.index ()
@@ -453,7 +452,7 @@ namespace TAO
   Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::purge_entry_i (HASH_MAP_ENTRY *entry)
   {
     // Remove the entry from the Map
-    int retval = this->cache_map_.unbind (entry);
+    int const retval = this->cache_map_.unbind (entry);
 
 #if defined (TAO_HAS_MONITOR_POINTS) && (TAO_HAS_MONITOR_POINTS == 1)
     this->size_monitor_->receive (this->current_size ());
@@ -492,11 +491,11 @@ namespace TAO
   bool
   Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::is_entry_purgable_i (HASH_MAP_ENTRY &entry)
   {
-    Cache_Entries_State entry_state = entry.int_id_.recycle_state ();
+    Cache_Entries_State const entry_state = entry.int_id_.recycle_state ();
     transport_type* transport = entry.int_id_.transport ();
-    bool result = (entry_state == ENTRY_IDLE_AND_PURGABLE ||
-                   entry_state == ENTRY_PURGABLE_BUT_NOT_IDLE)
-                   && transport->can_be_purged ();
+    bool const result = (entry_state == ENTRY_IDLE_AND_PURGABLE ||
+                         entry_state == ENTRY_PURGABLE_BUT_NOT_IDLE)
+                         && transport->can_be_purged ();
 
     if (TAO_debug_level > 8)
       {
diff --git a/TAO/tao/Transport_Cache_Manager_T.h b/TAO/tao/Transport_Cache_Manager_T.h
index 3b6920ef04f..a61759c9398 100644
--- a/TAO/tao/Transport_Cache_Manager_T.h
+++ b/TAO/tao/Transport_Cache_Manager_T.h
@@ -54,7 +54,6 @@ namespace TAO
    * map is updated only by holding the lock. The more compeling reason
    * to have the lock in this class and not in the Hash_Map is that, we
    * do quite a bit of work in this class for which we need a lock.
-   *
    */
   template <typename TT, typename TRDT, typename PSTRAT>
   class Transport_Cache_Manager_T
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
index 72224e5d069..001a894e0b4 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
@@ -61,8 +61,8 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   // locally on the server side as a side effect of another call,
   // meaning that the client hasn't added the service context yet.
   // Same goes for the shutdown call
-  if (ACE_OS_String::strcmp ("_is_a", operation.in ()) == 0 ||
-      ACE_OS_String::strcmp ("shutdown", operation.in ()) == 0)
+  if (ACE_OS::strcmp ("_is_a", operation.in ()) == 0 ||
+      ACE_OS::strcmp ("shutdown", operation.in ()) == 0)
     return;
 
   forward_location_done_ = true;
diff --git a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp
index a0e4e272729..5a6df2d5af6 100644
--- a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp
+++ b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp
@@ -62,8 +62,8 @@ ForwardTest_Request_Interceptor::receive_request_service_contexts (
   // locally on the server side as a side effect of another call,
   // meaning that the client hasn't added the service context yet.
   // Same goes for the shutdown call
-  if (ACE_OS_String::strcmp ("_is_a", operation.in ()) == 0 ||
-      ACE_OS_String::strcmp ("shutdown", operation.in ()) == 0)
+  if (ACE_OS::strcmp ("_is_a", operation.in ()) == 0 ||
+      ACE_OS::strcmp ("shutdown", operation.in ()) == 0)
     return;
 
   if (!forward_location_done_)
diff --git a/TAO/tests/ForwardOnceUponException/README b/TAO/tests/ForwardOnceUponException/README
index 4cdcc019b01..7f6280c3d6a 100644
--- a/TAO/tests/ForwardOnceUponException/README
+++ b/TAO/tests/ForwardOnceUponException/README
@@ -1,7 +1,5 @@
 /**
 
-
-
 @page ForwardOnceOnException Test README File
 
 	This is test for feature of request forwarding ONCE when client
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
index a6259649f88..f61f73018a9 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
@@ -8,15 +8,15 @@ void get_interceptor_type (int argc, ACE_TCHAR *argv[],
   interceptor_type = IT_NONE;
   for (int i = 1; i < argc - 1; ++i)
     {
-      if (ACE_OS_String::strcmp (argv[i], ACE_TEXT ("-r")) == 0)
+      if (ACE_OS::strcmp (argv[i], ACE_TEXT ("-r")) == 0)
         {
-          if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("none")) == 0)
+          if (ACE_OS::strcmp (argv[i+1], ACE_TEXT ("none")) == 0)
             interceptor_type = IT_NONE;
-          if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("noop")) == 0)
+          if (ACE_OS::strcmp (argv[i+1], ACE_TEXT ("noop")) == 0)
             interceptor_type = IT_NOOP;
-          if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("context")) == 0)
+          if (ACE_OS::strcmp (argv[i+1], ACE_TEXT ("context")) == 0)
             interceptor_type = IT_CONTEXT;
-          if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("dynamic")) == 0)
+          if (ACE_OS::strcmp (argv[i+1], ACE_TEXT ("dynamic")) == 0)
             interceptor_type = IT_DYNAMIC;
         }
     }
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
index 51fdc7cb5ef..044a8d74dac 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
@@ -66,7 +66,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   // locally on the server side as a side effect of another call,
   // meaning that the client hasn't added the service context yet.
   // Same goes for the shutdown call
-  if (ACE_OS_String::strcmp ("shutdown", operation.in ()) == 0)
+  if (ACE_OS::strcmp ("shutdown", operation.in ()) == 0)
     return;
 
   IOP::ServiceId id = ::service_id;
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
index f364a40b997..b3ba85faa40 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
@@ -42,7 +42,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
               operation.in ()));
 
   // Ignore the shutdown operation.
-  if (ACE_OS_String::strcmp ("shutdown", operation.in ()) == 0)
+  if (ACE_OS::strcmp ("shutdown", operation.in ()) == 0)
     return;
 
   // retrieve the context
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
index b2b5e218e97..3847c69378d 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
@@ -89,8 +89,7 @@ Client_Request_Interceptor::receive_exception (
       tc = ex->type ();
       id = tc->id ();
 
-      if (ACE_OS_String::strcmp (id,
-                                 "IDL:omg.org/CORBA/TRANSIENT:1.0") == 0)
+      if (ACE_OS::strcmp (id, "IDL:omg.org/CORBA/TRANSIENT:1.0") == 0)
           throw ::CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
     }
 }