ChangeLogTag:Sun Oct 6 08:44:27 2002 Ossama Othman <ossama@uci.edu>

3 files changed, 41 insertions, 23 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 016ebbbe792..ea1b5d701e6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Sun Oct  6 08:44:27 2002  Ossama Othman  <ossama@uci.edu>
+
+	* tao/PortableServer/Object_Adapter.cpp (init):
+
+	  Fixed "unused argument" warnings.
+
+	* orbsvcs/orbsvcs/Log/Log_i.cpp (set_week_mask):
+
+	  Fixed "multiple variable definition" error exhibited by MSVC++
+	  6.0.  MSVC++ 6.0 doesn't correctly handle variables declared in
+	  a "for" scope.  They are visible outside the "for" scope.  This
+	  sometimes causes "multiple variable definition" errors when a
+	  variable of the same name is declared both in the "for" scope
+	  and outside it.
+
 Fri Oct  4 19:31:51 2002  Jaiganesh Balasubramanian  <jai@doc.ece.uci.edu>
 
 	* orbsvcs/tests/LoadBalancing/GenericFactory/Basic.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index 3831cebbeba..bc285fab029 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -528,29 +528,32 @@ Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks
   weekly_intervals_.length (100);
 
   // convert the weekmask into a sequence of time intervals.
-  for (CORBA::ULong i = 0; i < masks.length (); ++i)
-  {
-    for (CORBA::ULong j = 0; j < masks[i].intervals.length (); ++j)
+  for (CORBA::ULong k = 0; k < masks.length (); ++k)
     {
-      for (int d = 0; d < 7; ++d)
-       {  if ( (1 << d) & masks[i].days)
-          {
-            temp_interval.start = CORBA::ULongLong ((d * 3600* 24) +
-                      (masks[i].intervals[j].start.hour * 3600) +
-                      (masks[i].intervals[j].start.minute * 60)) * 10000000;                      ;
-
-            temp_interval.stop = CORBA::ULongLong ((d * 3600* 24) +
-                      (masks[i].intervals[j].stop.hour * 3600) +
-                      (masks[i].intervals[j].stop.minute * 60)) * 10000000;
-
-            weekly_intervals_[count] = temp_interval;
-            ++count;
-
-         }
-       }
-
+      for (CORBA::ULong j = 0; j < masks[k].intervals.length (); ++j)
+        {
+          for (int d = 0; d < 7; ++d)
+            {
+              if ( (1 << d) & masks[k].days)
+                {
+                  temp_interval.start =
+                    CORBA::ULongLong (
+                      (d * 3600* 24) +
+                      (masks[k].intervals[j].start.hour * 3600) +
+                      (masks[k].intervals[j].start.minute * 60)) * 10000000;
+
+                  temp_interval.stop =
+                    CORBA::ULongLong (
+                      (d * 3600* 24) +
+                      (masks[k].intervals[j].stop.hour * 3600) +
+                      (masks[k].intervals[j].stop.minute * 60)) * 10000000;
+
+                  weekly_intervals_[count] = temp_interval;
+                  ++count;
+                }
+            }
+        }
     }
-  }
   weekly_intervals_.length (count);
 
   //TODO: SORT AND CLEAN
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 8b06ee8db70..20c46bec8ae 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -879,8 +879,8 @@ TAO_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO_Object_Adapter_Factory::init (int argc,
-                                  ACE_TCHAR* argv[])
+TAO_Object_Adapter_Factory::init (int /* argc */,
+                                  ACE_TCHAR* /* argv */ [])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY