ChangeLogTag: Mon Jan 3 20:33:11 2000 Balachandran Natarajan <bala@cs.wustl.edu>

5 files changed, 27 insertions, 18 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 428335f575d..0df92e439fb 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Mon Jan  3 20:33:11 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* orbsvcs/Trading_Service/Trading_Service.cpp:
+	* orbsvcs/tests/Simple_Naming/client.cpp:
+	* 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. 
+	
 Mon Jan  3 15:08:47 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* orbsvcs/Trading_Service/Trading_Service.cpp:
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index 0effd25fa84..08aaa07b94a 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -331,8 +331,8 @@ Trading_Service::shutdown (void)
 
           ACE_DEBUG ((LM_DEBUG,
                       "*** Unlinking from federated traders.\n"));
-          for (int i = link_name_seq->length () - 1;
-               i >= 0;
+          for (CORBA::ULong i = link_name_seq->length () - 1;
+               i > 0;
                i--)
             {
               ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 6a188f3f174..ddeded4cb2d 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -987,13 +987,13 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       ACE_TRY_CHECK;
       if (CORBA::is_nil (iter.in ())
           || bindings_list->length () != 1
-          || bindings_list[0].binding_type != CosNaming::nobject)
+          || bindings_list[0u].binding_type != CosNaming::nobject)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "CosNaming::list does not function properly\n"),
                           -1);
       ACE_DEBUG ((LM_DEBUG,
                   "First binding: %s\n",
-                  bindings_list[0].binding_name[0].id.in ()));
+                  bindings_list[0].binding_name[0u].id.in ()));
 
       // Invoke operations on the iterator.
       CosNaming::Binding_var binding;
@@ -1011,16 +1011,16 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       iter->next_n (2, bindings_list.out (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
       if (bindings_list->length () != 2
-          || bindings_list[0].binding_type != CosNaming::nobject
-          || bindings_list[1].binding_type != CosNaming::nobject)
+          || bindings_list[0u].binding_type != CosNaming::nobject
+          || bindings_list[1u].binding_type != CosNaming::nobject)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "CosNaming::BindingIterator does not function properly\n"),
                           -1);
       ACE_DEBUG ((LM_DEBUG,
                   "Third binding: %s\n"
                   "Fourth binding: %s\n",
-                  bindings_list[0].binding_name[0].id.in (),
-                  bindings_list[1].binding_name[0].id.in ()));
+                  bindings_list[0u].binding_name[0].id.in (),
+                  bindings_list[1u].binding_name[0].id.in ()));
 
       // We already iterated over all the bindings, so the following
       // should return false.
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 5204e107035..c5f80071e19 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -167,31 +167,31 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
                     " traders.\n"));
       }
 
-  for (int i = link_name_seq->length () - 1; i >= 0; i--)
+  for (CORBA::ULong i = link_name_seq->length () - 1; i > 0; i--)
     {
       ACE_TRY
         {
           if (this->verbose_)
             {
               ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
-                          ACE_static_cast (const char*, link_name_seq[iu])));
+                          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;
 
           for (int j = 0; j < NUM_OFFERS; j++)
             {
-              this->props_plotters_[j][4].value <<= link_name_seq[iu];
-              this->props_printers_[j][4].value <<= link_name_seq[iu];
-              this->props_fs_[j][4].value <<= link_name_seq[iu];
+              this->props_plotters_[j][4].value <<= link_name_seq[i];
+              this->props_printers_[j][4].value <<= link_name_seq[i];
+              this->props_fs_[j][4].value <<= link_name_seq[i];
             }
 
           if (this->verbose_)
             {
               ACE_DEBUG ((LM_DEBUG, "Exporting offers to %s\n",
-                          ACE_static_cast (const char*, link_name_seq[iu])));
+                          ACE_static_cast (const char*, link_name_seq[i])));
             }
 
           this->export_to (link_info->target_reg.in (), ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 97af0e35635..284d81158ff 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -106,19 +106,19 @@ TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV
 
   ACE_DEBUG ((LM_DEBUG, "Exporting service types with each of the linked"
               " traders.\n"));
-  for (int i = link_name_seq->length () - 1; i >= 0; i--)
+  for (CORBA::ULong i = link_name_seq->length () - 1; i > 0; i--)
     {
       CosTradingRepos::ServiceTypeRepository_ptr str = 0;
       ACE_TRY
         {
           ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
-                      ACE_static_cast (const char*, link_name_seq[iu])));
+                      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);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n",
-                      ACE_static_cast (const char*, link_name_seq[iu])));
+                      ACE_static_cast (const char*, link_name_seq[i])));
 
           CosTrading::TypeRepository_var remote_repos = 
             link_info->target->type_repos (ACE_TRY_ENV);