ChangeLogTag: Mon Jan 3 15:08:47 2000 Balachandran Natarajan <bala@cs.wustl.edu>

6 files changed, 32 insertions, 19 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 1e484155617..428335f575d 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,16 @@
+Mon Jan  3 15:08:47 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* orbsvcs/Trading_Service/Trading_Service.cpp:
+	* orbsvcs/tests/Trading/Offer_Exporter.cpp:
+	* orbsvcs/tests/Trading/Offer_Importer.cpp:
+	* orbsvcs/tests/Trading/Service_Type_Exporter.cpp:
+	* orbsvcs/tests/Simple_Naming/client.cpp:
+	* orbsvcs//LifeCycle_Service/Factory_Trader.cpp:
+	* 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'. 
+
 Mon Jan  3 14:45:22 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* tao/ORB.h:
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index 74864806844..0effd25fa84 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -263,8 +263,8 @@ Trading_Service::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_DEBUG ((LM_DEBUG,
               "*** Linking self to all linked traders.\n"));
-  for (int i = link_name_seq->length () - 1;
-       i >= 0;
+  for (CORBA::ULong i = link_name_seq->length () - 1;
+       i > 0;
        i--)
     {
       // Avoid linking to ourselves.
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index 90ea0941cf0..492780ec426 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -290,10 +290,10 @@ Client::test_get_properties (CORBA::Environment &ACE_TRY_ENV)
   names = names_ptr;
 
   names->length (3);
-  names [0] = CORBA::string_dup ("float_property");
+  names [0u] = CORBA::string_dup ("float_property");
   //names [1] = CORBA::string_dup ("string_property");
-  names [1] = CORBA::string_dup ("long_property");
-  names [2] = CORBA::string_dup ("char_property");
+  names [1u] = CORBA::string_dup ("long_property");
+  names [2u] = CORBA::string_dup ("char_property");
   //names [2] = CORBA::string_dup ("no_property");
 
 
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 3e31835682d..5204e107035 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -174,24 +174,24 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
           if (this->verbose_)
             {
               ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
-                          ACE_static_cast (const char*, link_name_seq[i])));
+                          ACE_static_cast (const char*, link_name_seq[iu])));
             }
 
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i], ACE_TRY_ENV);
+            link_if->describe_link (link_name_seq[iu], ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
           for (int j = 0; j < NUM_OFFERS; j++)
             {
-              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];
+              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];
             }
 
           if (this->verbose_)
             {
               ACE_DEBUG ((LM_DEBUG, "Exporting offers to %s\n",
-                          ACE_static_cast (const char*, link_name_seq[i])));
+                          ACE_static_cast (const char*, link_name_seq[iu])));
             }
 
           this->export_to (link_info->target_reg.in (), ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 0f0f8127c2f..224cb170e29 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -79,11 +79,11 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV)
       if (this->verbose_)
         {
           ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
-                      ACE_static_cast (const char*, link_name_seq[0])));
+                      ACE_static_cast (const char*, link_name_seq[0u])));
         }
 
       CosTrading::Link::LinkInfo_var link_info =
-        link_if->describe_link (link_name_seq[0], ACE_TRY_ENV);
+        link_if->describe_link (link_name_seq[0u], ACE_TRY_ENV);
       ACE_CHECK;
 
       CosTrading::Lookup_ptr lookup_if = link_info->target.in ();
@@ -109,10 +109,10 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV)
                 CosTrading::TraderName::allocbuf (2);
 
               ACE_DEBUG ((LM_DEBUG, "*** Query through %s to destination %s.\n",
-                          ACE_static_cast (const char*, link_name_seq[0]),
+                          ACE_static_cast (const char*, link_name_seq[0u]),
                           ACE_static_cast (const char*, link_name_seq2[i])));
 
-              trader_name[0] = CORBA::string_dup (link_name_seq[0]);
+              trader_name[0] = CORBA::string_dup (link_name_seq[0u]);
               trader_name[1] = CORBA::string_dup (link_name_seq2[i]);
               policies.starting_trader (new CosTrading::TraderName
                                         (2, 2, trader_name, 1));
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 6e5a4744e94..97af0e35635 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -112,13 +112,13 @@ TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV
       ACE_TRY
         {
           ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
-                      ACE_static_cast (const char*, link_name_seq[i])));
+                      ACE_static_cast (const char*, link_name_seq[iu])));
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i], ACE_TRY_ENV);
+            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[i])));
+                      ACE_static_cast (const char*, link_name_seq[iu])));
 
           CosTrading::TypeRepository_var remote_repos = 
             link_info->target->type_repos (ACE_TRY_ENV);
@@ -222,7 +222,7 @@ TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& ACE_TRY_ENV)
           if (this->verbose_)
             {
               ACE_DEBUG ((LM_DEBUG, "type name: %s\n",
-                          ACE_static_cast (const char *, type_names[i])));
+                          ACE_static_cast (const char *, type_names[iu])));
             }
         }
     }