ChangeLogTag:Tue Jan 4 00:34:57 2000 Nanbor Wang <nanbor@cs.wustl.edu>

4 files changed, 20 insertions, 12 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 0df92e439fb..1b0946a883a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Tue Jan  4 00:34:57 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* orbsvcs/tests/Trading/Service_Type_Exporter.cpp:
+	* orbsvcs/tests/Simple_Naming/client.cpp:
+	* orbsvcs/LifeCycle_Service/Factory_Trader.cpp: Fixes for KAI that
+	  missed the last round and fixes that were needed after the last
+	  round.
+
 Mon Jan  3 20:33:11 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* orbsvcs/Trading_Service/Trading_Service.cpp:
@@ -5,8 +13,8 @@ Mon Jan  3 20:33:11 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* orbsvcs/tests/Trading/Service_Type_Exporter.cpp:
 	* orbsvcs/tests/Trading/Offer_Exporter.cpp: Fixes for KAI that
 	  missed the last round and fixes that were needed after the last
-	  round. 
-	
+	  round.
+
 Mon Jan  3 15:08:47 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* orbsvcs/Trading_Service/Trading_Service.cpp:
@@ -18,7 +26,7 @@ Mon Jan  3 15:08:47 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* orbsvcs/tests/Property/client.cpp: KAI needed fixes in these
 	  files to compile clean. There was a need to explicitly use an
 	  unsigned integer to avoid overloading amibiguity. Essentially
-	  the same fix as 'Mon Jan 03 10:55:36 2000  David L. Levine'. 
+	  the same fix as 'Mon Jan 03 10:55:36 2000  David L. Levine'.
 
 Mon Jan  3 14:45:22 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
index f2a37dea733..29807ae9a21 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
@@ -207,7 +207,7 @@ Factory_Trader::query (const char* constraint)
           if (offerSeq_var->length() >= 1)
             {
               // now we are all set to read from the sequence the result
-              object_ptr = CORBA::Object::_duplicate (offerSeq_var[0].reference.in());
+              object_ptr = CORBA::Object::_duplicate (offerSeq_var[0u].reference.in());
 
               if (CORBA::is_nil (object_ptr))
                 ACE_ERROR_RETURN ((LM_ERROR,"Factory_Trader::query: Object reference is nil.\n"), 0);
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index ddeded4cb2d..8372c99d524 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -993,7 +993,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
                           -1);
       ACE_DEBUG ((LM_DEBUG,
                   "First binding: %s\n",
-                  bindings_list[0].binding_name[0u].id.in ()));
+                  bindings_list[0u].binding_name[0u].id.in ()));
 
       // Invoke operations on the iterator.
       CosNaming::Binding_var binding;
@@ -1074,7 +1074,7 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
 
       // Do the testing.
       not_empty_test (my_context,
-				      ACE_TRY_ENV);
+                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       my_context->unbind (object_name, ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 284d81158ff..284195b0088 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -114,13 +114,13 @@ TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV
           ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
                       ACE_static_cast (const char*, link_name_seq[i])));
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[iu], ACE_TRY_ENV);
+            link_if->describe_link (link_name_seq[i], ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n",
                       ACE_static_cast (const char*, link_name_seq[i])));
 
-          CosTrading::TypeRepository_var remote_repos = 
+          CosTrading::TypeRepository_var remote_repos =
             link_info->target->type_repos (ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
@@ -130,7 +130,7 @@ TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV
           ACE_TRY_CHECK;
 
         }
-      ACE_CATCHANY 
+      ACE_CATCHANY
         {
           // @@ Seth, Ignore all these exceptions?
         }
@@ -217,12 +217,12 @@ TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& ACE_TRY_ENV)
         this->repos_->list_types (sst, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      for (int i = type_names->length () - 1; i >= 0; i--)
+      for (CORBA::ULong i = type_names->length (); i > 0;)
         {
           if (this->verbose_)
             {
               ACE_DEBUG ((LM_DEBUG, "type name: %s\n",
-                          ACE_static_cast (const char *, type_names[iu])));
+                          ACE_static_cast (const char *, type_names[--i])));
             }
         }
     }
@@ -428,7 +428,7 @@ TAO_Service_Type_Exporter::create_types (void)
   TT_Info::Printer pr;
   this->type_structs_[TT_Info::PRINTER].props.length (7);
   this->type_structs_[TT_Info::PRINTER].super_types.length (1);
-  this->type_structs_[TT_Info::PRINTER].super_types[0] = 
+  this->type_structs_[TT_Info::PRINTER].super_types[0] =
     TT_Info::INTERFACE_NAMES[TT_Info::REMOTE_IO];
   this->type_structs_[TT_Info::PRINTER].props[0].name       =
     TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_COLOR];