ChangeLogTag: Fri Mar 28 12:16:01 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

14 files changed, 86 insertions, 42 deletions

diff --git a/TAO/examples/AMH/Sink_Server/client.dsp b/TAO/examples/AMH/Sink_Server/client.dsp
index 75e794c1f2a..5969a58d12d 100644
--- a/TAO/examples/AMH/Sink_Server/client.dsp
+++ b/TAO/examples/AMH/Sink_Server/client.dsp
@@ -98,6 +98,7 @@ SOURCE=.\Client_Task.cpp
 # Begin Source File

 

 SOURCE=.\TestC.cpp

+# ADD CPP /GR

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/TAO/examples/AMH/Sink_Server/mt_server.dsp b/TAO/examples/AMH/Sink_Server/mt_server.dsp
index 44ade302b88..4a244f9d101 100644
--- a/TAO/examples/AMH/Sink_Server/mt_server.dsp
+++ b/TAO/examples/AMH/Sink_Server/mt_server.dsp
@@ -106,6 +106,7 @@ SOURCE=.\mt_server.cpp
 # Begin Source File

 

 SOURCE=.\TestC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

diff --git a/TAO/examples/AMH/Sink_Server/st_server.dsp b/TAO/examples/AMH/Sink_Server/st_server.dsp
index a0d5135265c..b3c1ddc905c 100644
--- a/TAO/examples/AMH/Sink_Server/st_server.dsp
+++ b/TAO/examples/AMH/Sink_Server/st_server.dsp
@@ -102,6 +102,7 @@ SOURCE=.\st_server.cpp
 # Begin Source File

 

 SOURCE=.\TestC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

diff --git a/TAO/examples/Buffered_AMI/client.dsp b/TAO/examples/Buffered_AMI/client.dsp
index c0fcb88b559..ab78bece36d 100644
--- a/TAO/examples/Buffered_AMI/client.dsp
+++ b/TAO/examples/Buffered_AMI/client.dsp
@@ -94,6 +94,7 @@ SOURCE=.\client.cpp
 # Begin Source File

 

 SOURCE=.\testC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

diff --git a/TAO/examples/Buffered_AMI/server.dsp b/TAO/examples/Buffered_AMI/server.dsp
index 7bfe01ebfe5..25592bc772a 100644
--- a/TAO/examples/Buffered_AMI/server.dsp
+++ b/TAO/examples/Buffered_AMI/server.dsp
@@ -98,6 +98,7 @@ SOURCE=.\test_i.cpp
 # Begin Source File

 

 SOURCE=.\testC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

diff --git a/TAO/examples/Logging/Logging_Service.dsp b/TAO/examples/Logging/Logging_Service.dsp
index 6c2c29ce6b0..603cac14415 100644
--- a/TAO/examples/Logging/Logging_Service.dsp
+++ b/TAO/examples/Logging/Logging_Service.dsp
@@ -26,7 +26,6 @@ CFG=Examples Logging Logging_Service - Win32 Debug
 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

-MTL=midl.exe

 RSC=rc.exe

 

 !IF  "$(CFG)" == "Examples Logging Logging_Service - Win32 Release"

@@ -42,10 +41,11 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release\Logging_Service"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

-# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /D "NDEBUG" /O2 /MD /I "../../../" /I "../../" /I "../../orbsvcs/"

+MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD BASE CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /I "../../orbsvcs/" /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /machine:I386 ../../../ace/ACE.lib ../../tao/TAO.lib ../../tao/PortableServer/TAO_PortableServer.lib ../../tao/IORTable/TAO_IORTable.lib ../../orbsvcs/orbsvcs/TAO_CosNaming.lib /out:"Logging_Service.exe" 

+# ADD LINK32 ../../../ace/ACE.lib ../../tao/TAO.lib ../../tao/PortableServer/TAO_PortableServer.lib ../../tao/IORTable/TAO_IORTable.lib ../../orbsvcs/orbsvcs/TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /out:"Logging_Service.exe"

 

 !ELSEIF  "$(CFG)" == "Examples Logging Logging_Service - Win32 Debug"

 

@@ -68,20 +68,21 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug\Logging_Service"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /Gm /Zi

-# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /Gm /Zi /D "_DEBUG" /Od /MDd /I "../../../" /I "../../" /I "../../orbsvcs/"

+MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /I "../../orbsvcs/" /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /debug /pdbtype:sept

-# ADD LINK32 /nologo /subsystem:console /machine:I386 /debug /pdbtype:sept ../../../ace/ACEd.lib ../../tao/TAOd.lib ../../tao/PortableServer/TAO_PortableServerd.lib ../../tao/IORTable/TAO_IORTabled.lib ../../orbsvcs/orbsvcs/TAO_CosNamingd.lib /out:"Logging_Service.exe" 

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 ../../../ace/ACEd.lib ../../tao/TAOd.lib ../../tao/PortableServer/TAO_PortableServerd.lib ../../tao/IORTable/TAO_IORTabled.lib ../../orbsvcs/orbsvcs/TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -92,7 +93,12 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

+SOURCE=.\Logger_i.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\LoggerC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -105,10 +111,6 @@ SOURCE=.\LoggerS_T.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Logger_i.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Logging_Service.cpp

 # End Source File

 # Begin Source File

@@ -121,19 +123,19 @@ SOURCE=.\Logging_Service_i.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;fi;fd"

 # Begin Source File

 

-SOURCE=.\LoggerC.h

+SOURCE=.\Logger_i.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LoggerS.h

+SOURCE=.\LoggerC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LoggerS_T.h

+SOURCE=.\LoggerS.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Logger_i.h

+SOURCE=.\LoggerS_T.h

 # End Source File

 # Begin Source File

 

@@ -146,10 +148,10 @@ SOURCE=.\Logging_Service_i.h
 # Begin Source File

 

 SOURCE=.\Logger.idl

-!IF  "$(CFG)" == "Examples Logging Logging_Service - Win32 Release"

 

-USERDEP__IDL_="..\..\..\bin\Release\tao_idl.exe"	

+!IF  "$(CFG)" == "Examples Logging Logging_Service - Win32 Release"

 

+USERDEP__LOGGE="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

 InputPath=.\Logger.idl

 InputName=Logger

@@ -184,11 +186,10 @@ BuildCmds= \
 "$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

-                        

-!ELSEIF  "$(CFG)" == "Examples Logging Logging_Service - Win32 Debug"

 

-USERDEP__IDL_="..\..\..\bin\tao_idl.exe"	

+!ELSEIF  "$(CFG)" == "Examples Logging Logging_Service - Win32 Debug"

 

+USERDEP__LOGGE="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

 InputPath=.\Logger.idl

 InputName=Logger

@@ -223,8 +224,9 @@ BuildCmds= \
 "$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

-                        

-!ENDIF

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Inline Files"

diff --git a/TAO/examples/Logging/Logging_Test.dsp b/TAO/examples/Logging/Logging_Test.dsp
index 23ab3102d1a..75298cb7da0 100644
--- a/TAO/examples/Logging/Logging_Test.dsp
+++ b/TAO/examples/Logging/Logging_Test.dsp
@@ -26,7 +26,6 @@ CFG=Examples Logging Logging_Test - Win32 Debug
 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

-MTL=midl.exe

 RSC=rc.exe

 

 !IF  "$(CFG)" == "Examples Logging Logging_Test - Win32 Release"

@@ -42,10 +41,11 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release\Logging_Test"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

-# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /D "NDEBUG" /O2 /MD /I "../../../" /I "../../" /I "../../orbsvcs/"

+MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD BASE CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /I "../../orbsvcs/" /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /machine:I386 ../../../ace/ACE.lib ../../tao/TAO.lib ../../tao/PortableServer/TAO_PortableServer.lib ../../tao/IORTable/TAO_IORTable.lib ../../orbsvcs/orbsvcs/TAO_CosNaming.lib /out:"Logging_Test.exe" 

+# ADD LINK32 ../../../ace/ACE.lib ../../tao/TAO.lib ../../tao/PortableServer/TAO_PortableServer.lib ../../tao/IORTable/TAO_IORTable.lib ../../orbsvcs/orbsvcs/TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /out:"Logging_Test.exe"

 

 !ELSEIF  "$(CFG)" == "Examples Logging Logging_Test - Win32 Debug"

 

@@ -68,20 +68,21 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug\Logging_Test"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /Gm /Zi

-# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /Gm /Zi /D "_DEBUG" /Od /MDd /I "../../../" /I "../../" /I "../../orbsvcs/"

+MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /I "../../orbsvcs/" /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /debug /pdbtype:sept

-# ADD LINK32 /nologo /subsystem:console /machine:I386 /debug /pdbtype:sept ../../../ace/ACEd.lib ../../tao/TAOd.lib ../../tao/PortableServer/TAO_PortableServerd.lib ../../tao/IORTable/TAO_IORTabled.lib ../../orbsvcs/orbsvcs/TAO_CosNamingd.lib /out:"Logging_Test.exe" 

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 ../../../ace/ACEd.lib ../../tao/TAOd.lib ../../tao/PortableServer/TAO_PortableServerd.lib ../../tao/IORTable/TAO_IORTabled.lib ../../orbsvcs/orbsvcs/TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -93,6 +94,7 @@ LINK32=link.exe
 # Begin Source File

 

 SOURCE=.\LoggerC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -121,10 +123,10 @@ SOURCE=.\Logging_Test_i.h
 # Begin Source File

 

 SOURCE=.\Logger.idl

-!IF  "$(CFG)" == "Examples Logging Logging_Test - Win32 Release"

 

-USERDEP__IDL_="..\..\..\bin\Release\tao_idl.exe"	

+!IF  "$(CFG)" == "Examples Logging Logging_Test - Win32 Release"

 

+USERDEP__LOGGE="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

 InputPath=.\Logger.idl

 InputName=Logger

@@ -159,11 +161,10 @@ BuildCmds= \
 "$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

-                        

-!ELSEIF  "$(CFG)" == "Examples Logging Logging_Test - Win32 Debug"

 

-USERDEP__IDL_="..\..\..\bin\tao_idl.exe"	

+!ELSEIF  "$(CFG)" == "Examples Logging Logging_Test - Win32 Debug"

 

+USERDEP__LOGGE="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

 InputPath=.\Logger.idl

 InputName=Logger

@@ -198,8 +199,9 @@ BuildCmds= \
 "$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

-                        

-!ENDIF

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Inline Files"

diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.dsp b/TAO/examples/PluggableUDP/tests/Basic/client.dsp
index 3f7bcf84f22..b6bcdff599f 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/client.dsp
+++ b/TAO/examples/PluggableUDP/tests/Basic/client.dsp
@@ -286,16 +286,24 @@ SOURCE=.\UDPC.cpp
 

 !IF  "$(CFG)" == "UDP Basic Client - Win32 Release"

 

+# ADD CPP /GR

+

 !ELSEIF  "$(CFG)" == "UDP Basic Client - Win32 Debug"

 

+# ADD CPP /GR

+

 !ELSEIF  "$(CFG)" == "UDP Basic Client - Win32 Alpha Debug"

 

 !ELSEIF  "$(CFG)" == "UDP Basic Client - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "UDP Basic Client - Win32 Static Release"

 

+# ADD CPP /GR

+

 !ELSEIF  "$(CFG)" == "UDP Basic Client - Win32 Static Debug"

 

+# ADD CPP /GR

+

 !ENDIF 

 

 # End Source File

diff --git a/TAO/examples/PluggableUDP/tests/Basic/server.dsp b/TAO/examples/PluggableUDP/tests/Basic/server.dsp
index 6dd1222cdd0..8493933fdc6 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/server.dsp
+++ b/TAO/examples/PluggableUDP/tests/Basic/server.dsp
@@ -259,16 +259,24 @@ SOURCE=.\UDPC.cpp
 

 !IF  "$(CFG)" == "UDP Basic Server - Win32 Release"

 

+# ADD CPP /GR

+

 !ELSEIF  "$(CFG)" == "UDP Basic Server - Win32 Debug"

 

+# ADD CPP /GR

+

 !ELSEIF  "$(CFG)" == "UDP Basic Server - Win32 Alpha Debug"

 

 !ELSEIF  "$(CFG)" == "UDP Basic Server - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "UDP Basic Server - Win32 Static Release"

 

+# ADD CPP /GR

+

 !ELSEIF  "$(CFG)" == "UDP Basic Server - Win32 Static Debug"

 

+# ADD CPP /GR

+

 !ENDIF 

 

 # End Source File

diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.dsp b/TAO/examples/PluggableUDP/tests/Performance/client.dsp
index cb957a739d3..c4b3ba675d3 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/client.dsp
+++ b/TAO/examples/PluggableUDP/tests/Performance/client.dsp
@@ -516,16 +516,24 @@ SOURCE=.\UDPC.cpp
 

 !IF  "$(CFG)" == "UDP Performance Client - Win32 Release"

 

+# ADD CPP /GR

+

 !ELSEIF  "$(CFG)" == "UDP Performance Client - Win32 Debug"

 

+# ADD CPP /GR

+

 !ELSEIF  "$(CFG)" == "UDP Performance Client - Win32 Alpha Debug"

 

 !ELSEIF  "$(CFG)" == "UDP Performance Client - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "UDP Performance Client - Win32 Static Debug"

 

+# ADD CPP /GR

+

 !ELSEIF  "$(CFG)" == "UDP Performance Client - Win32 Static Release"

 

+# ADD CPP /GR

+

 !ENDIF 

 

 # End Source File

diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.dsp b/TAO/examples/PluggableUDP/tests/Performance/server.dsp
index 827969a1ed2..33d52fa40d4 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/server.dsp
+++ b/TAO/examples/PluggableUDP/tests/Performance/server.dsp
@@ -187,7 +187,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "server"

 CPP=cl.exe

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "ACE_AS_STATIC_LIBS" /D "TAO_AS_STATIC_LIBS" /FD /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -199,7 +199,7 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\PortableServer"

 # SUBTRACT BASE LINK32 /incremental:no

 # ADD LINK32 TAOs.lib aces.lib TAO_PortableServers.lib TAO_Strategiess.lib advapi32.lib user32.lib /nologo /subsystem:console /incremental:no /machine:IX86 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

-# SUBTRACT LINK32 /debug /pdbtype:<none>

+# SUBTRACT LINK32 /debug

 

 !ENDIF 

 

@@ -505,16 +505,24 @@ SOURCE=.\UDPC.cpp
 

 !IF  "$(CFG)" == "UDP Performance Server - Win32 Release"

 

+# ADD CPP /GR

+

 !ELSEIF  "$(CFG)" == "UDP Performance Server - Win32 Debug"

 

+# ADD CPP /GR

+

 !ELSEIF  "$(CFG)" == "UDP Performance Server - Win32 Alpha Debug"

 

 !ELSEIF  "$(CFG)" == "UDP Performance Server - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "UDP Performance Server - Win32 Static Debug"

 

+# ADD CPP /GR

+

 !ELSEIF  "$(CFG)" == "UDP Performance Server - Win32 Static Release"

 

+# ADD CPP /GR

+

 !ENDIF 

 

 # End Source File

diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.dsp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.dsp
index 581dcaf4d5d..9e1deaca043 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.dsp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.dsp
@@ -151,6 +151,7 @@ SOURCE=.\client.cpp
 # Begin Source File

 

 SOURCE=.\testC.cpp

+# ADD CPP /GR

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.dsp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.dsp
index 614a3a42f8a..47b1e5b434d 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.dsp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.dsp
@@ -155,6 +155,7 @@ SOURCE=.\test_i.cpp
 # Begin Source File

 

 SOURCE=.\testC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

diff --git a/TAO/examples/RTCORBA/Activity/activity.dsp b/TAO/examples/RTCORBA/Activity/activity.dsp
index 5aed7689fc4..6ccbe55126c 100644
--- a/TAO/examples/RTCORBA/Activity/activity.dsp
+++ b/TAO/examples/RTCORBA/Activity/activity.dsp
@@ -103,6 +103,7 @@ SOURCE=.\Job_i.cpp
 # Begin Source File

 

 SOURCE=.\JobC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File