ChangeLogTag: Tue Aug 23 10:26:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

27 files changed, 88 insertions, 85 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
index 3744e47ba62..011ff659404 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
@@ -69,14 +69,14 @@ be_visitor_operation_exceptlist_ss::visit_operation (be_operation * node)
         }
 
       *os << be_uidt_nl << "};" << be_uidt_nl
-          << "static size_t const nexceptions = "
+          << "static ::CORBA::ULong const nexceptions = "
           << node->exceptions()->length () << ";";
     }
   else
     {
       *os << "static ::CORBA::TypeCode_ptr const * const exceptions = 0;"
           << be_nl
-          << "static size_t const nexceptions = 0;";
+          << "static ::CORBA::ULong const nexceptions = 0;";
     }
 
   *os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_nl << be_nl;
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index bb2339518ec..f8d7c95d18c 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -123,7 +123,7 @@ public:
   /// This is an auxiliary method for _this() and _narrow().
   virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL) = 0;
 
-    /// Find an operation in the operation table and return a
+  /// Find an operation in the operation table and return a
   /// TAO_Skeleton which can be used to make upcalls
   virtual int _find (const char *opname,
                      TAO_Skeleton &skelfunc,
diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp
index 870c61bf2ca..0511d23755a 100644
--- a/TAO/tao/CORBA_String.cpp
+++ b/TAO/tao/CORBA_String.cpp
@@ -74,7 +74,8 @@ CORBA::wstring_dup (const WChar *const str)
       return 0;
     }
 
-  CORBA::WChar* retval = CORBA::wstring_alloc (ACE_OS::strlen (str));
+  CORBA::WChar* retval = 
+    CORBA::wstring_alloc (static_cast <CORBA::ULong> (ACE_OS::strlen (str)));
 
   // The wscpy() below assumes that the destination is a valid buffer.
   if (retval == 0)
@@ -272,7 +273,8 @@ operator>> (istream &is, CORBA::String_out &so)
 ostream &
 operator<< (ostream &os, const CORBA::WString_var &wsv)
 {
-  const CORBA::ULong len = ACE_OS::strlen (wsv.in ());
+  const CORBA::ULong len = 
+    static_cast <CORBA::ULong> (ACE_OS::strlen (wsv.in ()));
 
   for (CORBA::ULong i = 0; i < len; ++i)
     {
@@ -311,9 +313,9 @@ ostream &
 operator<< (ostream &os, CORBA::WString_out &wso)
 {
   CORBA::WChar *tmp = wso.ptr ();
-  const CORBA::ULong len = ACE_OS::strlen (tmp);
+  const size_t len = ACE_OS::strlen (tmp);
 
-  for (CORBA::ULong i = 0; i < len; ++i)
+  for (size_t i = 0; i < len; ++i)
     {
       os << tmp[i];
     }
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index cf23376b5ce..569c74c70d2 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -485,7 +485,7 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< CORBA::Policy>::ret_val retval;
@@ -585,7 +585,7 @@ void POA_CORBA::DomainManager::_is_a_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
@@ -675,7 +675,7 @@ void POA_CORBA::DomainManager::_non_existent_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
@@ -811,7 +811,7 @@ void POA_CORBA::DomainManager::_component_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
@@ -1247,7 +1247,7 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< void>::ret_val retval;
@@ -1349,7 +1349,7 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
@@ -1439,7 +1439,7 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
@@ -1575,7 +1575,7 @@ void POA_CORBA::ConstructionPolicy::_component_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index 6383617dd9a..cadf68653ce 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -24,7 +24,7 @@ namespace TAO
                                                   Argument **args,
                                                   int arg_number,
                                                   const char *operation,
-                                                  int op_len,
+                                                  size_t op_len,
                                                   CORBA::ExceptionList *excp,
                                                   CORBA::Request *r,
                                                   Invocation_Mode m)
@@ -97,7 +97,7 @@ namespace TAO
       Argument **args,
       int arg_number,
       const char *operation,
-      int op_len,
+      size_t op_len,
       Collocation_Proxy_Broker *b,
       TAO_ORB_Core *oc,
       CORBA::Request *req,
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
index f1225e60691..749029a23e0 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
@@ -84,7 +84,7 @@ namespace TAO
                             Argument **args,
                             int arg_number,
                             const char *operation,
-                            int op_len,
+                            size_t op_len,
                             CORBA::ExceptionList *exception,
                             CORBA::Request *r,
                             Invocation_Mode m = TAO_DII_INVOCATION);
@@ -127,7 +127,7 @@ namespace TAO
         Argument **args,
         int arg_number,
         const char *operation,
-        int op_len,
+        size_t op_len,
         Collocation_Proxy_Broker *b,
         TAO_ORB_Core *oc,
         CORBA::Request *req,
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index 1165fa9ab6c..db5ba38e55b 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -164,7 +164,8 @@ TAO_IORInterceptor_Adapter_Impl::adapter_state_changed (
 
   PortableInterceptor::ObjectReferenceTemplateSeq seq_obj_ref_template;
 
-  seq_obj_ref_template.length (array_obj_ref_template.size());
+  seq_obj_ref_template.length (
+    static_cast <CORBA::ULong> (array_obj_ref_template.size()));
 
   for (size_t counter = 0; counter < array_obj_ref_template.size(); ++counter)
     {
diff --git a/TAO/tao/ImR_Client/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp
index 726bd6eb043..03796e3ca15 100644
--- a/TAO/tao/ImR_Client/ImplRepoS.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoS.cpp
@@ -633,7 +633,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
@@ -716,7 +716,7 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< void>::ret_val retval;
@@ -812,7 +812,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
@@ -902,7 +902,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
@@ -1038,7 +1038,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
@@ -1664,7 +1664,7 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
       ImplementationRepository::_tc_NotFound,
       ImplementationRepository::_tc_CannotActivate
     };
-  static size_t const nexceptions = 2;
+  static CORBA::ULong const nexceptions = 2;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< void>::ret_val retval;
@@ -1768,7 +1768,7 @@ void POA_ImplementationRepository::Administration::add_or_update_server_skel (
     {
       ImplementationRepository::_tc_NotFound
     };
-  static size_t const nexceptions = 1;
+  static CORBA::ULong const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< void>::ret_val retval;
@@ -1867,7 +1867,7 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
     {
       ImplementationRepository::_tc_NotFound
     };
-  static size_t const nexceptions = 1;
+  static CORBA::ULong const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< void>::ret_val retval;
@@ -1964,7 +1964,7 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
     {
       ImplementationRepository::_tc_NotFound
     };
-  static size_t const nexceptions = 1;
+  static CORBA::ULong const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< void>::ret_val retval;
@@ -2075,7 +2075,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
     {
       ImplementationRepository::_tc_NotFound
     };
-  static size_t const nexceptions = 1;
+  static CORBA::ULong const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< void>::ret_val retval;
@@ -2176,7 +2176,7 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
     {
       ImplementationRepository::_tc_NotFound
     };
-  static size_t const nexceptions = 1;
+  static CORBA::ULong const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< void>::ret_val retval;
@@ -2277,7 +2277,7 @@ void POA_ImplementationRepository::Administration::find_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< void>::ret_val retval;
@@ -2387,7 +2387,7 @@ void POA_ImplementationRepository::Administration::list_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< void>::ret_val retval;
@@ -2492,7 +2492,7 @@ void POA_ImplementationRepository::Administration::shutdown_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< void>::ret_val retval;
@@ -2594,7 +2594,7 @@ void POA_ImplementationRepository::Administration::_is_a_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
@@ -2684,7 +2684,7 @@ void POA_ImplementationRepository::Administration::_non_existent_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
@@ -2820,7 +2820,7 @@ void POA_ImplementationRepository::Administration::_component_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
diff --git a/TAO/tao/ImR_Client/ServerObjectS.cpp b/TAO/tao/ImR_Client/ServerObjectS.cpp
index 8bf53af58f2..ec7ca490865 100644
--- a/TAO/tao/ImR_Client/ServerObjectS.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectS.cpp
@@ -409,7 +409,7 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< void>::ret_val retval;
@@ -486,7 +486,7 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< void>::ret_val retval;
@@ -582,7 +582,7 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
@@ -672,7 +672,7 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
@@ -808,7 +808,7 @@ void POA_ImplementationRepository::ServerObject::_component_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h
index c464e06b644..66e3f223499 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -109,7 +109,7 @@ namespace TAO
                         Argument **args,
                         int arg_number,
                         const char *operation,
-                        int op_len,
+                        size_t op_len,
                         Collocation_Proxy_Broker *cpb,
                         TAO::Invocation_Type type = TAO_TWOWAY_INVOCATION,
                         TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION);
@@ -264,7 +264,7 @@ namespace TAO
     char const * operation_;
 
     /// String length of the operation name.
-    int const op_len_;
+    size_t const op_len_;
 
     /// Collocation proxy broker for this operation.
     Collocation_Proxy_Broker * const cpb_;
diff --git a/TAO/tao/Invocation_Adapter.inl b/TAO/tao/Invocation_Adapter.inl
index 9dff7a8f320..b27c3070466 100644
--- a/TAO/tao/Invocation_Adapter.inl
+++ b/TAO/tao/Invocation_Adapter.inl
@@ -8,7 +8,7 @@ namespace TAO
       Argument **args,
       int arg_number,
       const char *operation,
-      int op_len,
+      size_t op_len,
       Collocation_Proxy_Broker *p,
       Invocation_Type type,
       Invocation_Mode mode)
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
index 2272c612f3b..ddbd6c62b5a 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
@@ -26,7 +26,7 @@ namespace TAO
     Argument **args,
     int arg_number,
     const char *operation,
-    int op_len,
+    size_t op_len,
     Collocation_Proxy_Broker *p,
     Invocation_Mode m)
     : Invocation_Adapter (target,
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
index 5b86fb095c2..f48671c9360 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
@@ -64,7 +64,7 @@ namespace TAO
         Argument **args,
         int arg_number,
         const char *operation,
-        int op_len,
+        size_t op_len,
         Collocation_Proxy_Broker *b,
         TAO::Invocation_Mode mode = TAO_ASYNCHRONOUS_CALLBACK_INVOCATION);
 
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index 9cb832706f4..5888eb7d5ae 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -382,7 +382,7 @@ void POA_Messaging::ReplyHandler::_is_a_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
@@ -472,7 +472,7 @@ void POA_Messaging::ReplyHandler::_non_existent_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
@@ -608,7 +608,7 @@ void POA_Messaging::ReplyHandler::_component_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 3e644bc9674..1c135c9b817 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1164,7 +1164,7 @@ CORBA::ORB::resolve_initial_references (const char *name,
   // Look for an environment variable called "<name>IOR".
   //
   CORBA::String_var ior_env_var_name =
-    CORBA::string_alloc (ACE_OS::strlen (name) + 3);
+    CORBA::string_alloc (static_cast <CORBA::ULong> (ACE_OS::strlen (name) + 3));
 
   ACE_OS::strcpy (ior_env_var_name.inout (),
                   name);
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index 6355bda6942..a4d52db2b20 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -31,7 +31,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
   size_t nargs,
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
-  size_t nexceptions,
+  CORBA::ULong nexceptions,
   CORBA::OctetSeq_out oc
   ACE_ENV_ARG_DECL)
 {
@@ -91,7 +91,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
   size_t nargs,
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
-  size_t nexceptions
+  CORBA::ULong nexceptions
   ACE_ENV_ARG_DECL)
 {
   // This method implements one of the "intermediate" server side
@@ -144,7 +144,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
   size_t nargs,
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
-  size_t nexceptions
+  CORBA::ULong nexceptions
   ACE_ENV_ARG_DECL)
 {
 
@@ -207,7 +207,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
   size_t nargs,
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
-  size_t nexceptions
+  CORBA::ULong nexceptions
   ACE_ENV_ARG_DECL)
 {
   // This method implements an "intermediate" server side interception
@@ -276,7 +276,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply (
   size_t nargs,
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
-  size_t nexceptions
+  CORBA::ULong nexceptions
   ACE_ENV_ARG_DECL)
 {
   // This is an "ending" interception point so we only process the
@@ -322,7 +322,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
   size_t nargs,
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
-  size_t nexceptions
+  CORBA::ULong nexceptions
   ACE_ENV_ARG_DECL)
 {
   // This is an "ending" server side interception point so we only
@@ -415,7 +415,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
   size_t nargs,
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
-  size_t nexceptions
+  CORBA::ULong nexceptions
   ACE_ENV_ARG_DECL)
 {
   // This is an "ending" server side interception point so we only
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
index 9cb365164cf..6fa2e115b6c 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
@@ -82,7 +82,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        size_t nexceptions,
+        CORBA::ULong nexceptions,
         CORBA::OctetSeq_out oc
         ACE_ENV_ARG_DECL);
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
@@ -100,7 +100,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        size_t nexceptions
+        CORBA::ULong nexceptions
         ACE_ENV_ARG_DECL);
 
     /// This method an "intermediate" server side interception point.
@@ -110,7 +110,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        size_t nexceptions
+        CORBA::ULong nexceptions
         ACE_ENV_ARG_DECL);
 
     /// This method implements one of the "ending" server side
@@ -121,7 +121,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        size_t nexceptions
+        CORBA::ULong nexceptions
         ACE_ENV_ARG_DECL);
 
     /// This method implements one of the "ending" server side
@@ -132,7 +132,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        size_t nexceptions
+        CORBA::ULong nexceptions
         ACE_ENV_ARG_DECL);
 
     /// This method implements one of the "ending" server side
@@ -143,7 +143,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        size_t nexceptions
+        CORBA::ULong nexceptions
         ACE_ENV_ARG_DECL);
     //@}
 
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h
index bef3ea8d150..7b79d9eed83 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.h
+++ b/TAO/tao/PI_Server/ServerRequestInfo.h
@@ -77,7 +77,7 @@ namespace TAO
                        size_t nargs,
                        void * servant_upcall,
                        CORBA::TypeCode_ptr const * exceptions,
-                       size_t nexceptions);
+                       CORBA::ULong nexceptions);
 
     /// Return an ID unique to the current request.  This request ID may
     /// or may not be the same as the GIOP request ID.
@@ -293,7 +293,7 @@ namespace TAO
     CORBA::TypeCode_ptr const * const exceptions_;
 
     /// The number of elements in the @c exceptions_ array.
-    size_t const nexceptions_;
+    CORBA::ULong const nexceptions_;
   };
 
 }  // End namespace TAO
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.inl b/TAO/tao/PI_Server/ServerRequestInfo.inl
index cd637efd889..3ba06ed412b 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.inl
+++ b/TAO/tao/PI_Server/ServerRequestInfo.inl
@@ -12,7 +12,7 @@ TAO::ServerRequestInfo::ServerRequestInfo (
   size_t nargs,
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
-  size_t nexceptions)
+  CORBA::ULong nexceptions)
   : server_request_ (server_request)
   , args_ (args)
   , nargs_ (nargs)
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 8efbc5798a8..35ef1cd14b5 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -488,7 +488,7 @@ void POA_CORBA::Policy::_get_policy_type_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::CORBA::PolicyType>::ret_val retval;
@@ -580,7 +580,7 @@ void POA_CORBA::Policy::copy_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< CORBA::Policy>::ret_val retval;
@@ -659,7 +659,7 @@ void POA_CORBA::Policy::destroy_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< void>::ret_val retval;
@@ -755,7 +755,7 @@ void POA_CORBA::Policy::_is_a_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
@@ -845,7 +845,7 @@ void POA_CORBA::Policy::_non_existent_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
@@ -981,7 +981,7 @@ void POA_CORBA::Policy::_component_skel (
 
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
+  static CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
 
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
index 8443f73dd0e..dde1cedfad6 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
@@ -30,7 +30,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
 #if TAO_HAS_INTERCEPTORS == 1
                              , void * servant_upcall
                              , CORBA::TypeCode_ptr const * exceptions
-                             , size_t nexceptions
+                             , CORBA::ULong nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
                              ACE_ENV_ARG_DECL
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h
index a6c197b9383..c6d62419310 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.h
@@ -90,7 +90,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
                  , void * servant_upcall
                  , CORBA::TypeCode_ptr const * exceptions
-                 , size_t nexceptions
+                 , CORBA::ULong nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
                  ACE_ENV_ARG_DECL);
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h
index 02b5b9657d7..791ec6ca2f5 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.h
@@ -71,7 +71,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        size_t nexceptions,
+        CORBA::ULong nexceptions,
         CORBA::OctetSeq_out oc
         ACE_ENV_ARG_DECL) = 0;
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
@@ -89,7 +89,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        size_t nexceptions
+        CORBA::ULong nexceptions
         ACE_ENV_ARG_DECL) = 0;
 
     /// This method an "intermediate" server side interception point.
@@ -99,7 +99,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        size_t nexceptions
+        CORBA::ULong nexceptions
         ACE_ENV_ARG_DECL) = 0;
 
     /// This method implements one of the "ending" server side
@@ -110,7 +110,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        size_t nexceptions
+        CORBA::ULong nexceptions
         ACE_ENV_ARG_DECL) = 0;
 
     /// This method implements one of the "ending" server side
@@ -121,7 +121,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        size_t nexceptions
+        CORBA::ULong nexceptions
         ACE_ENV_ARG_DECL) = 0;
 
     /// This method implements one of the "ending" server side
@@ -132,7 +132,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        size_t nexceptions
+        CORBA::ULong nexceptions
         ACE_ENV_ARG_DECL) = 0;
     //@}
 
diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
index b3c8bdba2b8..fc1ea235c85 100644
--- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
+++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
@@ -13,7 +13,7 @@ namespace TAO
       Argument **args,
       int arg_number,
       const char *operation,
-      int op_len,
+      size_t op_len,
       Collocation_Proxy_Broker *p,
       Invocation_Type type,
       Invocation_Mode mode)
diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
index 82e27d51e29..cb510f0ded5 100644
--- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
+++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
@@ -48,7 +48,7 @@ namespace TAO
         Argument **args,
         int arg_number,
         const char *operation,
-        int op_len,
+        size_t op_len,
         Collocation_Proxy_Broker *cpb,
         TAO::Invocation_Type type = TAO_TWOWAY_INVOCATION,
         TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION);
diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h
index 0b1fee4c2a3..8748d0f6147 100644
--- a/TAO/tao/operation_details.h
+++ b/TAO/tao/operation_details.h
@@ -60,7 +60,7 @@ public:
                          TAO::Argument **args = 0,
                          CORBA::ULong num_args = 0,
                          TAO::Exception_Data *ex_data = 0,
-                         CORBA::Long ex_count = 0);
+                         CORBA::ULong ex_count = 0);
 
   /// Operation name
   const char* opname (void) const;
diff --git a/TAO/tao/operation_details.i b/TAO/tao/operation_details.i
index 666bb7cad51..599d37c767b 100644
--- a/TAO/tao/operation_details.i
+++ b/TAO/tao/operation_details.i
@@ -9,7 +9,7 @@ TAO_Operation_Details::TAO_Operation_Details (const char *name,
                                               TAO::Argument **args,
                                               CORBA::ULong num,
                                               TAO::Exception_Data *data,
-                                              CORBA::Long count)
+                                              CORBA::ULong count)
   : opname_ (name)
     , opname_len_ (len)
     , request_id_ (0)