ChangeLogTag:Sat Apr 06 15:50:19 2002 Balachandran Natarajan <bala@cs.wustl.edu>

3 files changed, 22 insertions, 15 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index dee143f7f07..49828a739f3 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Sat Apr 06 15:50:19 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* examples/POA/POA_BiDir/POA_BiDir.cpp (main): Fixed a compiler
+	  error in Win32.
+
+	* examples/POA/POA_BiDir/POA_BiDir.dsp: Fixed the workspace files
+	  to compile and link properly on Win32. 
+	
 Sat Apr  6 15:27:35 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* examples/POA/Makefile: Added the new test to the list of tests. 
@@ -16,7 +24,6 @@ Sat Apr  6 12:27:36 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 	  multiple POA's with one of the POA's assigned BiDirGIOP
 	  policy. 
 
-
 Sat Apr  6 12:10:22 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/Policy_Validator.cpp: Added a check to make sure that we
diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
index 24dd7b73479..3a1e99dd1ad 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
@@ -158,9 +158,9 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Creation of childPOA is over. Destroy the Policy objects.
-      for (CORBA::ULong i = 0;
-           i < bidir_policy.length ();
-           ++i)
+      for (CORBA::ULong k = 0;
+           k < bidir_policy.length ();
+           ++k)
         {
           bidir_policy[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.dsp b/TAO/examples/POA/POA_BiDir/POA_BiDir.dsp
index cb39e6c5867..a762eef5b48 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.dsp
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="POA NewPOA" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="POA POA_BiDir" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=POA NewPOA - Win32 Debug

+CFG=POA POA_BiDir - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

-!MESSAGE NMAKE /f "NewPOA.mak".

+!MESSAGE NMAKE /f "POA_BiDir.mak".

 !MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "NewPOA.mak" CFG="POA NewPOA - Win32 Debug"

+!MESSAGE NMAKE /f "POA_BiDir.mak" CFG="POA POA_BiDir - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "POA NewPOA - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "POA NewPOA - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "POA POA_BiDir - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "POA POA_BiDir - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -28,7 +28,7 @@ CFG=POA NewPOA - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "POA NewPOA - Win32 Release"

+!IF  "$(CFG)" == "POA POA_BiDir - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -54,7 +54,7 @@ LINK32=link.exe
 # ADD LINK32 tao.lib ace.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 # SUBTRACT LINK32 /pdb:none

 

-!ELSEIF  "$(CFG)" == "POA NewPOA - Win32 Debug"

+!ELSEIF  "$(CFG)" == "POA POA_BiDir - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -84,14 +84,14 @@ LINK32=link.exe
 

 # Begin Target

 

-# Name "POA NewPOA - Win32 Release"

-# Name "POA NewPOA - Win32 Debug"

+# Name "POA POA_BiDir - Win32 Release"

+# Name "POA POA_BiDir - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\NewPOA.cpp

+SOURCE=.\POA_BiDir.cpp

 # End Source File

 # End Group

 # End Target