ChangeLogTag:Thu Aug 12 16:22:08 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

10 files changed, 38 insertions, 25 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index cf422b790b0..ba9cf5ed6aa 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,16 @@
+Thu Aug 12 16:22:08 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp:
+	* orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp:
+	* orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
+	* orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp:
+	* orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp:
+	* orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
+	* orbsvcs/tests/Event/Basic/Schedule.cpp:
+	* orbsvcs/tests/Event/lib/Driver.cpp:
+	* utils/nslist/nslist.cpp:
+	  Removed more gcc-2.95 warnings.
+
 Thu Aug 12 16:06:16 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * TAO version 1.0.1 released.
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index dd75b26bcab..7ffb0a415aa 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -268,7 +268,7 @@ Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel,
   for (int i = 0; i < this->n_consumers_; ++i)
     {
       char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "consumer_%02.2d", i);
+      ACE_OS::sprintf (buf, "consumer_%02d", i);
 
       ACE_NEW (this->consumers_[i],
                Test_Consumer (this, this->consumers_ + i));
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index b824e35626d..e3c6feb2609 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -292,7 +292,7 @@ ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel,
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
       char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "supplier_%02.2d", i);
+      ACE_OS::sprintf (buf, "supplier_%02d", i);
 
       ACE_NEW (this->suppliers_[i], Test_Supplier (this));
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index acb9cf2f702..04271691c56 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -684,7 +684,7 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
         mc = 1;
 
       char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "hp_supplier_%02.2d@%s", i, this->lcl_name_);
+      ACE_OS::sprintf (buf, "hp_supplier_%02d@%s", i, this->lcl_name_);
 
       ACE_NEW (this->suppliers_[i],
                Test_Supplier (this, this->suppliers_ + i));
@@ -707,7 +707,7 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
         mc = 1;
 
       char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "lp_supplier_%02.2d@%s",
+      ACE_OS::sprintf (buf, "lp_supplier_%02d@%s",
                        i - this->hp_suppliers_, this->lcl_name_);
 
       ACE_NEW (this->suppliers_[i],
@@ -749,7 +749,7 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
             mc = 1;
 
           char buf[BUFSIZ];
-          ACE_OS::sprintf (buf, "hp_supplier_%02.2d@%s", i, this->lcl_name_);
+          ACE_OS::sprintf (buf, "hp_supplier_%02d@%s", i, this->lcl_name_);
 
           this->suppliers_[i]->activate (buf,
                                          this->hp_interval_ * 10,
@@ -766,7 +766,7 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
             mc = 1;
 
           char buf[BUFSIZ];
-          ACE_OS::sprintf (buf, "lp_supplier_%02.2d@%s",
+          ACE_OS::sprintf (buf, "lp_supplier_%02d@%s",
                            i - this->hp_suppliers_, this->lcl_name_);
 
           this->suppliers_[i]->activate (buf,
@@ -791,7 +791,7 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
   for (i = 0; i < this->hp_consumers_; ++i)
     {
       char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "hp_consumer_%02.2d@%s", i, this->lcl_name_);
+      ACE_OS::sprintf (buf, "hp_consumer_%02d@%s", i, this->lcl_name_);
 
       ACE_NEW (this->consumers_[i],
                Test_Consumer (this, this->consumers_ + i));
@@ -810,7 +810,7 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
   for (; i < this->hp_consumers_ + this->lp_consumers_; ++i)
     {
       char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "lp_consumer_%02.2d@%s",
+      ACE_OS::sprintf (buf, "lp_consumer_%02d@%s",
                        i - this->hp_consumers_, this->lcl_name_);
 
       ACE_NEW (this->consumers_[i],
@@ -1055,12 +1055,12 @@ Test_ECG::dump_results (void)
   int i;
   for (i = 0; i < this->hp_consumers_; ++i)
     {
-      ACE_OS::sprintf (buf, "HP%02.2d", i);
+      ACE_OS::sprintf (buf, "HP%02d", i);
       this->dump_results (buf, this->stats_[i]);
     }
   for (i = 0; i < this->lp_consumers_; ++i)
     {
-      ACE_OS::sprintf (buf, "LP%02.2d", i);
+      ACE_OS::sprintf (buf, "LP%02d", i);
       this->dump_results (buf, this->stats_[i + this->hp_consumers_]);
     }
   CORBA::ULong tmp = ACE_U64_TO_U32 (this->test_stop_ - this->test_start_);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 900032cc5a6..c4cae1533d3 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -219,7 +219,7 @@ ECT_Consumer_Driver::connect_consumers
   for (int i = 0; i < this->n_consumers_; ++i)
     {
       char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "consumer_%02.2d", i);
+      ACE_OS::sprintf (buf, "consumer_%02d", i);
 
       ACE_NEW (this->consumers_[i],
                Test_Consumer (this,
@@ -245,7 +245,7 @@ ECT_Consumer_Driver::dump_results (void)
   for (int i = 0; i < this->n_consumers_; ++i)
     {
       char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "consumer_%02.2d", i);
+      ACE_OS::sprintf (buf, "consumer_%02d", i);
 
       this->consumers_[i]->dump_results (buf, gsf);
       this->consumers_[i]->accumulate (throughput);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index ad03c743227..018f2a10421 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -218,7 +218,7 @@ ECT_Supplier_Driver::connect_suppliers
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
       char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "supplier_%02.2d", i);
+      ACE_OS::sprintf (buf, "supplier_%02d", i);
 
       ACE_NEW (this->suppliers_[i], Test_Supplier (this));
 
@@ -264,7 +264,7 @@ ECT_Supplier_Driver::dump_results (void)
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
       char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "supplier_%02.2d", i);
+      ACE_OS::sprintf (buf, "supplier_%02d", i);
 
       this->suppliers_[i]->dump_results (buf, gsf);
       this->suppliers_[i]->accumulate (throughput);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 60caa15d755..6d11879986d 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -381,7 +381,7 @@ ECT_Throughput::connect_consumers
   for (int i = 0; i < this->n_consumers_; ++i)
     {
       char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "consumer_%02.2d", i);
+      ACE_OS::sprintf (buf, "consumer_%02d", i);
 
       ACE_NEW (this->consumers_[i],
                Test_Consumer (this,
@@ -410,7 +410,7 @@ ECT_Throughput::connect_suppliers
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
       char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "supplier_%02.2d", i);
+      ACE_OS::sprintf (buf, "supplier_%02d", i);
 
       ACE_NEW (this->suppliers_[i], Test_Supplier (this));
 
@@ -477,7 +477,7 @@ ECT_Throughput::dump_results (void)
   for (int j = 0; j < this->n_consumers_; ++j)
     {
       char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "consumer_%02.2d", j);
+      ACE_OS::sprintf (buf, "consumer_%02d", j);
 
       this->consumers_[j]->dump_results (buf, gsf);
       this->consumers_[j]->accumulate (consumers);
@@ -488,7 +488,7 @@ ECT_Throughput::dump_results (void)
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
       char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "supplier_%02.2d", i);
+      ACE_OS::sprintf (buf, "supplier_%02d", i);
 
       this->suppliers_[i]->dump_results (buf, gsf);
       this->suppliers_[i]->accumulate (suppliers);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
index 6624eb52451..180703b0fa1 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -108,7 +108,7 @@ EC_Schedule::build_consumer_qos (
   CORBA::Environment &ACE_TRY_ENV)
 {
   char name[128];
-  ACE_OS::sprintf (name, "EC_Schedule::Consumer::%04.4x", i);
+  ACE_OS::sprintf (name, "EC_Schedule::Consumer::%04x", i);
 
   RtecScheduler::handle_t rt_info =
     this->scheduler_->create (name, ACE_TRY_ENV);
@@ -154,7 +154,7 @@ EC_Schedule::build_supplier_qos (
       CORBA::Environment &ACE_TRY_ENV)
 {
   char name[128];
-  ACE_OS::sprintf (name, "EC_Schedule::Supplier::%04.4x", i);
+  ACE_OS::sprintf (name, "EC_Schedule::Supplier::%04x", i);
 
   RtecScheduler::handle_t rt_info =
     this->scheduler_->create (name, ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index aec9d59d40a..5f108cf65dc 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -765,7 +765,7 @@ EC_Driver::dump_results (void)
   char buf[BUFSIZ];
   for (int j = 0; j < this->n_consumers_; ++j)
     {
-      ACE_OS::sprintf (buf, "Consumer [%02.2d]", j);
+      ACE_OS::sprintf (buf, "Consumer [%02d]", j);
 
       this->consumers_[j]->dump_results (buf, gsf);
       this->consumers_[j]->accumulate (throughput);
@@ -775,7 +775,7 @@ EC_Driver::dump_results (void)
   ACE_Throughput_Stats suppliers;
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      ACE_OS::sprintf (buf, "Supplier [%02.2d]", i);
+      ACE_OS::sprintf (buf, "Supplier [%02d]", i);
 
       this->suppliers_[i]->dump_results (buf, gsf);
       this->suppliers_[i]->accumulate (suppliers);
diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp
index caf75c54bbf..9a8d28e762e 100644
--- a/TAO/utils/nslist/nslist.cpp
+++ b/TAO/utils/nslist/nslist.cpp
@@ -59,7 +59,7 @@ show_chunk (CosNaming::NamingContext_ptr nc,
 
           CosNaming::NamingContext_var xc =
             CosNaming::NamingContext::_narrow (obj.in ());
-          list_context (xc, level + 1);
+          list_context (xc.in (), level + 1);
         }
       // Mark this node as a reference
       else
@@ -78,7 +78,7 @@ list_context (CosNaming::NamingContext_ptr nc,
   const CORBA::ULong CHUNK = 100;
 
   nc->list (CHUNK, bl, it);
-  show_chunk (nc, bl, level);
+  show_chunk (nc, bl.in (), level);
 
   if (!CORBA::is_nil (it.in ()))
     {
@@ -87,7 +87,7 @@ list_context (CosNaming::NamingContext_ptr nc,
       do
         {
           more = it->next_n (CHUNK, bl);
-          show_chunk (nc, bl, level);
+          show_chunk (nc, bl.in (), level);
         }
       while (more);