ChangeLogTag:Wed Aug 28 22:42:41 2002 Steve Huston <shuston@riverace.com>

10 files changed, 46 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index acb88ca84d7..76bcf6875b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Wed Aug 28 22:42:41 2002  Steve Huston  <shuston@riverace.com>
+
+        * examples/Service_Configurator/Misc/main.cpp:
+        * netsvcs/clients/Naming/Client/main.cpp:
+        * tests/ARGV_Test.cpp:
+        * tests/Get_Opt_Test.cpp: Change size_t to int as a side-affect of:
+          Tue Aug 27 13:28:17 2002  Steve Huston  <shuston@riverace.com>
+          * ace/ARGV.{h i cpp}: Changed argc() value from size_t to int. It
+            needs to get passed to many places that expect int (argc, argv).
+
+        * tests/Semaphore_Test.cpp:
+        * tests/TP_Reactor_Test.{cpp h}:
+        * tests/Upgradable_RW_Test.cpp: Further int/size_t corrections.
+
 Wed Aug 28 19:56:16 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* docs/ACE-subsets.html: Updated the document to point to the
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index acb88ca84d7..76bcf6875b8 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,17 @@
+Wed Aug 28 22:42:41 2002  Steve Huston  <shuston@riverace.com>
+
+        * examples/Service_Configurator/Misc/main.cpp:
+        * netsvcs/clients/Naming/Client/main.cpp:
+        * tests/ARGV_Test.cpp:
+        * tests/Get_Opt_Test.cpp: Change size_t to int as a side-affect of:
+          Tue Aug 27 13:28:17 2002  Steve Huston  <shuston@riverace.com>
+          * ace/ARGV.{h i cpp}: Changed argc() value from size_t to int. It
+            needs to get passed to many places that expect int (argc, argv).
+
+        * tests/Semaphore_Test.cpp:
+        * tests/TP_Reactor_Test.{cpp h}:
+        * tests/Upgradable_RW_Test.cpp: Further int/size_t corrections.
+
 Wed Aug 28 19:56:16 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* docs/ACE-subsets.html: Updated the document to point to the
diff --git a/examples/Service_Configurator/Misc/main.cpp b/examples/Service_Configurator/Misc/main.cpp
index 56a9611aca9..3bb4abd62a6 100644
--- a/examples/Service_Configurator/Misc/main.cpp
+++ b/examples/Service_Configurator/Misc/main.cpp
@@ -55,7 +55,7 @@ ACE_TMAIN (int, ACE_TCHAR *argv[])
               ACE_TEXT (args.argc ())));
 
   // Print the contents of the combined <ACE_ARGV>.
-  for (size_t i = 0; i < args.argc (); i++)
+  for (int i = 0; i < args.argc (); i++)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%d) %s\n"),
                 i,
diff --git a/netsvcs/clients/Naming/Client/main.cpp b/netsvcs/clients/Naming/Client/main.cpp
index 407b74e78b7..75456ba8cad 100644
--- a/netsvcs/clients/Naming/Client/main.cpp
+++ b/netsvcs/clients/Naming/Client/main.cpp
@@ -29,7 +29,7 @@ main (int, char *argv[])
               ACE_TEXT (new_args.argc ())));
 
   // Print the contents of the combined <ACE_ARGV>.
-  for (size_t i = 0; i < new_args.argc (); i++)
+  for (int i = 0; i < new_args.argc (); i++)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%d) %s\n"),
                 i,
diff --git a/tests/ARGV_Test.cpp b/tests/ARGV_Test.cpp
index f391880867a..19fb01d6a0d 100644
--- a/tests/ARGV_Test.cpp
+++ b/tests/ARGV_Test.cpp
@@ -42,7 +42,7 @@ ACE_TMAIN (int, ACE_TCHAR *argv[])
               a.argc ()));
 
   // Print the contents of the combined <ACE_ARGV>.
-  for (size_t i = 0; i < a.argc (); i++)
+  for (int i = 0; i < a.argc (); i++)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%d) %s\n"),
                 i,
diff --git a/tests/Get_Opt_Test.cpp b/tests/Get_Opt_Test.cpp
index 8ffe1d8f0aa..0b170905a22 100644
--- a/tests/Get_Opt_Test.cpp
+++ b/tests/Get_Opt_Test.cpp
@@ -177,7 +177,7 @@ parse_args (int test_number,
     }
 
   // Print out the rest of the arguments left in the command line (if any).
-  size_t index = 0;
+  int index = 0;
   for (index = get_opt.opt_ind (); index < args.argc (); index++)
     ACE_DEBUG ((LM_INFO, "   Found non-option argument \"%s\"\n",
                 args.argv ()[index]));
diff --git a/tests/Semaphore_Test.cpp b/tests/Semaphore_Test.cpp
index cdc8b671572..33b6e5a1258 100644
--- a/tests/Semaphore_Test.cpp
+++ b/tests/Semaphore_Test.cpp
@@ -44,7 +44,7 @@ static int test_result = 0;
 static ACE_Thread_Semaphore s (0);
 
 // Default number of iterations.
-static size_t n_iterations = 10;
+static int n_iterations = 10;
 
 // Number of worker threads.
 static size_t n_workers = 10;
@@ -144,7 +144,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 static void *
 worker (void *)
 {
-  for (long iterations = 1;
+  for (int iterations = 1;
        iterations <= n_iterations;
        iterations++)
     {
@@ -209,7 +209,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   s.release (n_release_count);
 
   if (ACE_Thread_Manager::instance ()->spawn_n
-      (n_workers,
+      (ACE_static_cast (size_t, n_workers),
        ACE_THR_FUNC (worker),
        0,
        THR_NEW_LWP) == -1)
diff --git a/tests/TP_Reactor_Test.cpp b/tests/TP_Reactor_Test.cpp
index 06a536bba07..e167906b36e 100644
--- a/tests/TP_Reactor_Test.cpp
+++ b/tests/TP_Reactor_Test.cpp
@@ -295,7 +295,7 @@ Acceptor::on_new_receiver (Receiver &rcvr)
 {
   ACE_Guard<ACE_Recursive_Thread_Mutex> locker (this->mutex_);
   this->sessions_++;
-  this->list_receivers_[ rcvr.index_] = & rcvr;
+  this->list_receivers_[rcvr.index_] = & rcvr;
   ACE_DEBUG ((LM_DEBUG,
               "Receiver::CTOR sessions_=%d\n",
               this->sessions_));
@@ -358,7 +358,7 @@ Acceptor::make_svc_handler (Receiver *&sh)
   if (sessions_ >= MAX_RECEIVERS)
     return -1;
 
-  for (int i = 0; i < MAX_RECEIVERS; ++i)
+  for (size_t i = 0; i < MAX_RECEIVERS; ++i)
     if (this->list_receivers_ [i] == 0)
       {
         ACE_NEW_RETURN (sh,
@@ -371,7 +371,7 @@ Acceptor::make_svc_handler (Receiver *&sh)
 
 // *************************************************************
 
-Receiver::Receiver (Acceptor * acceptor, int index)
+Receiver::Receiver (Acceptor * acceptor, size_t index)
   : acceptor_ (acceptor),
     index_ (index),
     flg_mask_ (ACE_Event_Handler::NULL_MASK),
@@ -736,7 +736,7 @@ Connector::make_svc_handler (Sender * & sh)
   if (sessions_ >= MAX_SENDERS)
     return -1;
 
-  for (int i = 0; i < MAX_SENDERS; ++i)
+  for (size_t i = 0; i < MAX_SENDERS; ++i)
     if (this->list_senders_ [i] == 0)
       {
         ACE_NEW_RETURN (sh,
@@ -750,7 +750,7 @@ Connector::make_svc_handler (Sender * & sh)
 
 // *************************************************************
 
-Sender::Sender (Connector* connector, int index)
+Sender::Sender (Connector* connector, size_t index)
   : connector_ (connector),
     index_ (index),
     flg_mask_ (ACE_Event_Handler::NULL_MASK),
@@ -1097,7 +1097,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
           break;
         case 's':     // number of senders
           senders = ACE_OS::atoi (get_opt.optarg);
-          if (senders > MAX_SENDERS)
+          if (size_t (senders) > MAX_SENDERS)
             senders = MAX_SENDERS;
           break;
         case 'u':
diff --git a/tests/TP_Reactor_Test.h b/tests/TP_Reactor_Test.h
index d6341e5f0da..db6728c3763 100644
--- a/tests/TP_Reactor_Test.h
+++ b/tests/TP_Reactor_Test.h
@@ -45,7 +45,7 @@ class Receiver : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH>
   friend class Acceptor;
 public:
 
-  Receiver (Acceptor * acceptor=0, int index=-1);
+  Receiver (Acceptor * acceptor=0, size_t index=MAX_RECEIVERS+1);
 
   ~Receiver (void);
 
@@ -125,7 +125,7 @@ class Sender : public ACE_Svc_Handler<ACE_SOCK_STREAM,ACE_MT_SYNCH>
   friend class Connector;
 
 public:
-  Sender (Connector * connector=0, int index=-1);
+  Sender (Connector * connector=0, size_t index=MAX_SENDERS+1);
 
   ~Sender (void);
 
diff --git a/tests/Upgradable_RW_Test.cpp b/tests/Upgradable_RW_Test.cpp
index 0571ce1b4ce..82e088a0f3a 100644
--- a/tests/Upgradable_RW_Test.cpp
+++ b/tests/Upgradable_RW_Test.cpp
@@ -27,7 +27,7 @@ ACE_RCSID(tests, Upgradable_RW_Test, "$Id$")
 #if defined (ACE_HAS_THREADS)
 
 // Default number of iterations.
-static long n_iterations = 50;
+static int n_iterations = 50;
 
 // Maximum string length used
 static const size_t MAX_STRING_SIZE = 200;
@@ -161,7 +161,7 @@ Reader_Task::svc (void)
   // We start an ACE_Profile_Timer here...
   timer.start ();
 
-  for (size_t iterations = 1;
+  for (int iterations = 1;
        iterations <= n_iterations;
        iterations++)
     {
@@ -234,7 +234,7 @@ Writer_Task::svc (void)
   // We start an ACE_Profile_Timer here...
   timer.start ();
 
-  for (size_t iterations = 1;
+  for (int iterations = 1;
        iterations <= n_iterations;
        iterations++)
     {