diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-02-24 06:35:29 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-02-24 06:35:29 +0000 |
| commit | de0d5fd911765f113a354f3004c82ddec0332165 (patch) | |
| tree | 6753828d1fd2553e337a4b0503f54b17c5718b04 | |
| parent | f63c55ae28710f540cb58ec4f46f318d12b154ce (diff) | |
| download | ATCD-de0d5fd911765f113a354f3004c82ddec0332165.tar.gz | |
ChangeLogTag: Mon Feb 24 000:27:32 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
339 files changed, 1078 insertions, 664 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6ecbba4b0da..fc69990fd88 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,13 +1,18 @@ Mon Feb 24 000:27:32 2003 Jeff Parsons <j.parsons@vanderbilt.edu> - * tests/Param_Test/any.cpp: - * orbsvcs/ImplRepo_Service/Forwarder.cpp: - * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: * orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp: * orbsvcs/orbsvcs/IFRService/Container_i.cpp: * orbsvcs/orbsvcs/IFRService/Container_i.h: * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp: * orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp: + + Changed template functions in a non-template utility + class to non-template functions in a template class, + to avoid internal compiler errors with VC6. + + * tests/Param_Test/any.cpp: + * orbsvcs/ImplRepo_Service/Forwarder.cpp: + * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: * orbsvcs/orbsvcs/Notify/Service.h: * orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp: * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h: diff --git a/TAO/examples/AMI/FL_Callback/AMI_Peer.dsp b/TAO/examples/AMI/FL_Callback/AMI_Peer.dsp index bea4f4a1fdd..6260e72c958 100644 --- a/TAO/examples/AMI/FL_Callback/AMI_Peer.dsp +++ b/TAO/examples/AMI/FL_Callback/AMI_Peer.dsp @@ -98,6 +98,7 @@ SOURCE=.\Peer_i.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/AMI/FL_Callback/AMI_Progress.dsp b/TAO/examples/AMI/FL_Callback/AMI_Progress.dsp index 8b8c2f37a0a..96671be5563 100644 --- a/TAO/examples/AMI/FL_Callback/AMI_Progress.dsp +++ b/TAO/examples/AMI/FL_Callback/AMI_Progress.dsp @@ -98,6 +98,7 @@ SOURCE=.\Progress_i.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Buffered_Oneways/client.dsp b/TAO/examples/Buffered_Oneways/client.dsp index b88fba57d1d..6516ac300c8 100644 --- a/TAO/examples/Buffered_Oneways/client.dsp +++ b/TAO/examples/Buffered_Oneways/client.dsp @@ -94,6 +94,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/Buffered_Oneways/server.dsp b/TAO/examples/Buffered_Oneways/server.dsp index c0d8d8ea70f..35039e05b1d 100644 --- a/TAO/examples/Buffered_Oneways/server.dsp +++ b/TAO/examples/Buffered_Oneways/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/Callback_Quoter/Consumer.dsp b/TAO/examples/Callback_Quoter/Consumer.dsp index 735359a2b5b..2e58dde1c08 100644 --- a/TAO/examples/Callback_Quoter/Consumer.dsp +++ b/TAO/examples/Callback_Quoter/Consumer.dsp @@ -110,6 +110,7 @@ SOURCE=.\Consumer_Signal_Handler.cpp # Begin Source File
SOURCE=.\ConsumerC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -118,6 +119,7 @@ SOURCE=.\ConsumerS.cpp # Begin Source File
SOURCE=.\NotifierC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Callback_Quoter/Notifier.dsp b/TAO/examples/Callback_Quoter/Notifier.dsp index 51666221918..a344fee393b 100644 --- a/TAO/examples/Callback_Quoter/Notifier.dsp +++ b/TAO/examples/Callback_Quoter/Notifier.dsp @@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\ConsumerC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -110,6 +111,7 @@ SOURCE=.\Notifier_Input_Handler.cpp # Begin Source File
SOURCE=.\NotifierC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Callback_Quoter/Supplier.dsp b/TAO/examples/Callback_Quoter/Supplier.dsp index 5282ccabc7d..e29546fd9b5 100644 --- a/TAO/examples/Callback_Quoter/Supplier.dsp +++ b/TAO/examples/Callback_Quoter/Supplier.dsp @@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\ConsumerC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -98,6 +99,7 @@ SOURCE=.\ConsumerS.cpp # Begin Source File
SOURCE=.\NotifierC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.dsp b/TAO/examples/Content_Server/AMI_Iterator/client.dsp index a463876f7d0..1f8a79a116f 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/client.dsp +++ b/TAO/examples/Content_Server/AMI_Iterator/client.dsp @@ -98,6 +98,7 @@ SOURCE=.\Iterator_Handler.cpp # Begin Source File
SOURCE=.\Web_ServerC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.dsp b/TAO/examples/Content_Server/AMI_Iterator/server.dsp index d6d0d6ad6f3..6c9bb43a82d 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/server.dsp +++ b/TAO/examples/Content_Server/AMI_Iterator/server.dsp @@ -102,6 +102,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\Web_ServerC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Content_Server/AMI_Observer/client.dsp b/TAO/examples/Content_Server/AMI_Observer/client.dsp index 262615ce5d7..708cd5b466f 100644 --- a/TAO/examples/Content_Server/AMI_Observer/client.dsp +++ b/TAO/examples/Content_Server/AMI_Observer/client.dsp @@ -102,6 +102,7 @@ SOURCE=.\Push_Iterator_Handler.cpp # Begin Source File
SOURCE=.\Push_Web_ServerC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Content_Server/AMI_Observer/server.dsp b/TAO/examples/Content_Server/AMI_Observer/server.dsp index 5ac240660ea..15295ea67e8 100644 --- a/TAO/examples/Content_Server/AMI_Observer/server.dsp +++ b/TAO/examples/Content_Server/AMI_Observer/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\Push_Iterator_Factory_i.cpp # Begin Source File
SOURCE=.\Push_Web_ServerC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.dsp b/TAO/examples/Content_Server/SMI_Iterator/client.dsp index cf5cb173277..091988dca40 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/client.dsp +++ b/TAO/examples/Content_Server/SMI_Iterator/client.dsp @@ -94,6 +94,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\Web_ServerC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "IDL Files"
diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.dsp b/TAO/examples/Content_Server/SMI_Iterator/server.dsp index aed4dc8937c..cbb128ce4f7 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/server.dsp +++ b/TAO/examples/Content_Server/SMI_Iterator/server.dsp @@ -102,6 +102,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\Web_ServerC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Event_Comm/Consumer.dsp b/TAO/examples/Event_Comm/Consumer.dsp index 41523309d68..ee6279c4fe4 100644 --- a/TAO/examples/Event_Comm/Consumer.dsp +++ b/TAO/examples/Event_Comm/Consumer.dsp @@ -106,6 +106,7 @@ SOURCE=.\Event_Comm_i.cpp # Begin Source File
SOURCE=.\Event_CommC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Event_Comm/Notifier.dsp b/TAO/examples/Event_Comm/Notifier.dsp index 1094ff3b07c..a2f5abfe020 100644 --- a/TAO/examples/Event_Comm/Notifier.dsp +++ b/TAO/examples/Event_Comm/Notifier.dsp @@ -94,6 +94,7 @@ SOURCE=.\Event_Comm_i.cpp # Begin Source File
SOURCE=.\Event_CommC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Event_Comm/Supplier.dsp b/TAO/examples/Event_Comm/Supplier.dsp index c7441da0881..790075a1ab4 100644 --- a/TAO/examples/Event_Comm/Supplier.dsp +++ b/TAO/examples/Event_Comm/Supplier.dsp @@ -94,6 +94,7 @@ SOURCE=.\Event_Comm_i.cpp # Begin Source File
SOURCE=.\Event_CommC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Load_Balancing/client.dsp b/TAO/examples/Load_Balancing/client.dsp index 77a91590c20..5bce31c404c 100644 --- a/TAO/examples/Load_Balancing/client.dsp +++ b/TAO/examples/Load_Balancing/client.dsp @@ -94,10 +94,12 @@ SOURCE=.\Identity_Client.cpp # Begin Source File
SOURCE=.\IdentityC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
SOURCE=.\Load_BalancerC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/examples/Load_Balancing/server.dsp b/TAO/examples/Load_Balancing/server.dsp index 0351494d51c..980f940ac30 100644 --- a/TAO/examples/Load_Balancing/server.dsp +++ b/TAO/examples/Load_Balancing/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\Identity_Server.cpp # Begin Source File
SOURCE=.\IdentityC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -106,6 +107,7 @@ SOURCE=.\IdentityS.cpp # Begin Source File
SOURCE=.\Load_BalancerC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/examples/Load_Balancing/service.dsp b/TAO/examples/Load_Balancing/service.dsp index ffa34d25c49..e26a5370c8a 100644 --- a/TAO/examples/Load_Balancing/service.dsp +++ b/TAO/examples/Load_Balancing/service.dsp @@ -94,6 +94,7 @@ SOURCE=.\Load_Balancer_i.cpp # Begin Source File
SOURCE=.\Load_BalancerC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Load_Balancing_persistent/client.dsp b/TAO/examples/Load_Balancing_persistent/client.dsp index 1567265e284..b0c8064c68d 100644 --- a/TAO/examples/Load_Balancing_persistent/client.dsp +++ b/TAO/examples/Load_Balancing_persistent/client.dsp @@ -94,10 +94,12 @@ SOURCE=.\Identity_Client.cpp # Begin Source File
SOURCE=.\IdentityC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
SOURCE=.\Load_BalancerC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/examples/Load_Balancing_persistent/server.dsp b/TAO/examples/Load_Balancing_persistent/server.dsp index c485fe1a34c..ad7824efca5 100644 --- a/TAO/examples/Load_Balancing_persistent/server.dsp +++ b/TAO/examples/Load_Balancing_persistent/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\Identity_Server.cpp # Begin Source File
SOURCE=.\IdentityC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -106,6 +107,7 @@ SOURCE=.\IdentityS.cpp # Begin Source File
SOURCE=.\Load_BalancerC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/examples/Load_Balancing_persistent/service.dsp b/TAO/examples/Load_Balancing_persistent/service.dsp index 975e892c80a..054e48226b3 100644 --- a/TAO/examples/Load_Balancing_persistent/service.dsp +++ b/TAO/examples/Load_Balancing_persistent/service.dsp @@ -94,6 +94,7 @@ SOURCE=.\Load_Balancer_i.cpp # Begin Source File
SOURCE=.\Load_BalancerC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/OBV/Typed_Events/client.dsp b/TAO/examples/OBV/Typed_Events/client.dsp index a10378c517b..0752b7d1f60 100644 --- a/TAO/examples/OBV/Typed_Events/client.dsp +++ b/TAO/examples/OBV/Typed_Events/client.dsp @@ -102,6 +102,7 @@ SOURCE=.\Event_Types_impl.cpp # Begin Source File
SOURCE=.\Event_TypesC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/OBV/Typed_Events/server.dsp b/TAO/examples/OBV/Typed_Events/server.dsp index fa02c254081..38beeab3f0d 100644 --- a/TAO/examples/OBV/Typed_Events/server.dsp +++ b/TAO/examples/OBV/Typed_Events/server.dsp @@ -94,6 +94,7 @@ SOURCE=.\Event_Types_impl.cpp # Begin Source File
SOURCE=.\Event_TypesC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp index fb953ff8b78..2dccdf25fb5 100644 --- a/TAO/examples/POA/DSI/Database_i.cpp +++ b/TAO/examples/POA/DSI/Database_i.cpp @@ -73,7 +73,8 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request CORBA::NVList_ptr list; this->orb_->create_list (0, list); - CORBA::Any any_1 (CORBA::_tc_string); + CORBA::Any any_1 (CORBA::_tc_string, + 0); list->add_value ("value", any_1, diff --git a/TAO/examples/POA/DSI/client.dsp b/TAO/examples/POA/DSI/client.dsp index 32262f219be..8ed94f0c95b 100644 --- a/TAO/examples/POA/DSI/client.dsp +++ b/TAO/examples/POA/DSI/client.dsp @@ -96,6 +96,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\DatabaseC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/POA/DSI/server.dsp b/TAO/examples/POA/DSI/server.dsp index 019a5f7ace8..8ffccbb613b 100644 --- a/TAO/examples/POA/DSI/server.dsp +++ b/TAO/examples/POA/DSI/server.dsp @@ -96,6 +96,7 @@ SOURCE=.\Database_i.cpp # Begin Source File
SOURCE=.\DatabaseC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/POA/Default_Servant/client.dsp b/TAO/examples/POA/Default_Servant/client.dsp index d97916bdc84..47531457a87 100644 --- a/TAO/examples/POA/Default_Servant/client.dsp +++ b/TAO/examples/POA/Default_Servant/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -96,6 +96,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\FileC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/POA/Default_Servant/server.dsp b/TAO/examples/POA/Default_Servant/server.dsp index 002a2e1635d..162d2866b19 100644 --- a/TAO/examples/POA/Default_Servant/server.dsp +++ b/TAO/examples/POA/Default_Servant/server.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -96,6 +96,7 @@ SOURCE=.\File_i.cpp # Begin Source File
SOURCE=.\FileC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/POA/Forwarding/client.dsp b/TAO/examples/POA/Forwarding/client.dsp index 22ee1c5e6b7..5407d9641b1 100644 --- a/TAO/examples/POA/Forwarding/client.dsp +++ b/TAO/examples/POA/Forwarding/client.dsp @@ -96,6 +96,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -127,7 +128,7 @@ SOURCE=.\test.idl !IF "$(CFG)" == "POA Forwarding Client - Win32 Release"
-USERDEP__FOO_I="..\..\..\..\bin\Release\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
@@ -166,7 +167,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "POA Forwarding Client - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__FOO_I="..\..\..\..\bin\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
diff --git a/TAO/examples/POA/Forwarding/server.dsp b/TAO/examples/POA/Forwarding/server.dsp index e88fd303379..8b123876682 100644 --- a/TAO/examples/POA/Forwarding/server.dsp +++ b/TAO/examples/POA/Forwarding/server.dsp @@ -91,11 +91,11 @@ LINK32=link.exe # PROP Default_Filter ""
# Begin Source File
-SOURCE=.\testC.cpp
+SOURCE=.\Servant_Activator.cpp
# End Source File
# Begin Source File
-SOURCE=.\testS.cpp
+SOURCE=.\server.cpp
# End Source File
# Begin Source File
@@ -103,11 +103,12 @@ SOURCE=.\test_i.cpp # End Source File
# Begin Source File
-SOURCE=.\Servant_Activator.cpp
+SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
-SOURCE=.\server.cpp
+SOURCE=.\testS.cpp
# End Source File
# End Group
# Begin Group "Header Files"
@@ -115,23 +116,23 @@ SOURCE=.\server.cpp # PROP Default_Filter ""
# Begin Source File
-SOURCE=.\testC.h
+SOURCE=.\Servant_Activator.h
# End Source File
# Begin Source File
-SOURCE=.\testS.h
+SOURCE=.\test_i.h
# End Source File
# Begin Source File
-SOURCE=.\testS_T.h
+SOURCE=.\testC.h
# End Source File
# Begin Source File
-SOURCE=.\test_i.h
+SOURCE=.\testS.h
# End Source File
# Begin Source File
-SOURCE=.\Servant_Activator.h
+SOURCE=.\testS_T.h
# End Source File
# End Group
# Begin Group "IDL Files"
@@ -143,7 +144,7 @@ SOURCE=.\test.idl !IF "$(CFG)" == "POA Forwarding Server - Win32 Release"
-USERDEP__FOO_I="..\..\..\..\bin\Release\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
@@ -182,7 +183,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "POA Forwarding Server - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__FOO_I="..\..\..\..\bin\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
diff --git a/TAO/examples/POA/Generic_Servant/client.dsp b/TAO/examples/POA/Generic_Servant/client.dsp index 80f6d3cd8c9..529735736ca 100644 --- a/TAO/examples/POA/Generic_Servant/client.dsp +++ b/TAO/examples/POA/Generic_Servant/client.dsp @@ -96,6 +96,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -128,7 +129,7 @@ SOURCE=.\test.idl !IF "$(CFG)" == "POA Generic Servant Client - Win32 Release"
# PROP Ignore_Default_Tool 1
-USERDEP__FOO_I="..\..\..\..\bin\Release\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
@@ -158,7 +159,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "POA Generic Servant Client - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__FOO_I="..\..\..\..\bin\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
diff --git a/TAO/examples/POA/Generic_Servant/server.dsp b/TAO/examples/POA/Generic_Servant/server.dsp index 34883900aae..eb2454304ec 100644 --- a/TAO/examples/POA/Generic_Servant/server.dsp +++ b/TAO/examples/POA/Generic_Servant/server.dsp @@ -96,15 +96,16 @@ LINK32=link.exe # PROP Default_Filter ""
# Begin Source File
-SOURCE=.\testC.cpp
+SOURCE=.\test_i.cpp
# End Source File
# Begin Source File
-SOURCE=.\testS.cpp
+SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
-SOURCE=.\test_i.cpp
+SOURCE=.\testS.cpp
# End Source File
# End Group
# Begin Group "Header Files"
@@ -112,19 +113,19 @@ SOURCE=.\test_i.cpp # PROP Default_Filter ".h"
# Begin Source File
-SOURCE=.\testC.h
+SOURCE=.\test_i.h
# End Source File
# Begin Source File
-SOURCE=.\testS.h
+SOURCE=.\testC.h
# End Source File
# Begin Source File
-SOURCE=.\testS_T.h
+SOURCE=.\testS.h
# End Source File
# Begin Source File
-SOURCE=.\test_i.h
+SOURCE=.\testS_T.h
# End Source File
# End Group
# Begin Group "IDL Files"
@@ -137,7 +138,7 @@ SOURCE=.\test.idl !IF "$(CFG)" == "POA Generic Servant DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-USERDEP__FOO_I="..\..\..\..\bin\Release\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
@@ -167,7 +168,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "POA Generic Servant DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__FOO_I="..\..\..\..\bin\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
diff --git a/TAO/examples/POA/TIE/client.dsp b/TAO/examples/POA/TIE/client.dsp index 02f7cd6b018..369ff6032d7 100644 --- a/TAO/examples/POA/TIE/client.dsp +++ b/TAO/examples/POA/TIE/client.dsp @@ -96,6 +96,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
@@ -115,7 +116,7 @@ SOURCE=.\test.idl !IF "$(CFG)" == "POA TIE Client - Win32 Release"
-USERDEP__FOO_I="..\..\..\..\bin\Release\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
@@ -154,7 +155,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "POA TIE Client - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__FOO_I="..\..\..\..\bin\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
diff --git a/TAO/examples/POA/TIE/server.dsp b/TAO/examples/POA/TIE/server.dsp index 12c344d97cf..a56295de51b 100644 --- a/TAO/examples/POA/TIE/server.dsp +++ b/TAO/examples/POA/TIE/server.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -91,19 +91,20 @@ LINK32=link.exe # PROP Default_Filter ""
# Begin Source File
-SOURCE=.\test_i.cpp
+SOURCE=.\server.cpp
# End Source File
# Begin Source File
-SOURCE=.\testC.cpp
+SOURCE=.\test_i.cpp
# End Source File
# Begin Source File
-SOURCE=.\testS.cpp
+SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
-SOURCE=.\server.cpp
+SOURCE=.\testS.cpp
# End Source File
# End Group
# Begin Group "Header Files"
@@ -135,7 +136,7 @@ SOURCE=.\test.idl !IF "$(CFG)" == "POA TIE Server - Win32 Release"
-USERDEP__FOO_I="..\..\..\..\bin\Release\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
@@ -174,7 +175,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "POA TIE Server - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__FOO_I="..\..\..\..\bin\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp b/TAO/examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp index 20e3264b259..b406bf2b895 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp +++ b/TAO/examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp @@ -98,6 +98,7 @@ SOURCE=.\Grid_Client_i.cpp # Begin Source File
SOURCE=.\GridC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid_Second_Client_Files.dsp b/TAO/examples/Persistent_Grid/Persistent_Grid_Second_Client_Files.dsp index 042bdf7739f..ccfc63572d8 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Grid_Second_Client_Files.dsp +++ b/TAO/examples/Persistent_Grid/Persistent_Grid_Second_Client_Files.dsp @@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\GridC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp b/TAO/examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp index b88be173bf5..39b0eb8838b 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp +++ b/TAO/examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp @@ -94,6 +94,7 @@ SOURCE=.\Grid_i.cpp # Begin Source File
SOURCE=.\GridC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Quoter/Factory_Finder.dsp b/TAO/examples/Quoter/Factory_Finder.dsp index 90b00f090e0..3dd6a6bbaa1 100644 --- a/TAO/examples/Quoter/Factory_Finder.dsp +++ b/TAO/examples/Quoter/Factory_Finder.dsp @@ -98,6 +98,7 @@ SOURCE=.\Factory_Finder_i.cpp # Begin Source File
SOURCE=.\QuoterC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Quoter/Generic_Factory.dsp b/TAO/examples/Quoter/Generic_Factory.dsp index cad74842911..29d71a6f574 100644 --- a/TAO/examples/Quoter/Generic_Factory.dsp +++ b/TAO/examples/Quoter/Generic_Factory.dsp @@ -98,6 +98,7 @@ SOURCE=.\Generic_Factory_i.cpp # Begin Source File
SOURCE=.\QuoterC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Quoter/client.dsp b/TAO/examples/Quoter/client.dsp index 0b27f8cdedf..e1390c1bf93 100644 --- a/TAO/examples/Quoter/client.dsp +++ b/TAO/examples/Quoter/client.dsp @@ -94,6 +94,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\QuoterC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Quoter/server.dsp b/TAO/examples/Quoter/server.dsp index f1b3d72d9d0..17f93f044aa 100644 --- a/TAO/examples/Quoter/server.dsp +++ b/TAO/examples/Quoter/server.dsp @@ -95,6 +95,7 @@ SOURCE=.\Quoter_i.cpp # Begin Source File
SOURCE=.\QuoterC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Simple/bank/client.dsp b/TAO/examples/Simple/bank/client.dsp index 5c3af19e33f..e4182a73cd0 100644 --- a/TAO/examples/Simple/bank/client.dsp +++ b/TAO/examples/Simple/bank/client.dsp @@ -92,18 +92,22 @@ LINK32=link.exe # Begin Source File
SOURCE=.\Bank_Client_i.cpp
+# ADD CPP /GR-
# End Source File
# Begin Source File
SOURCE=.\BankC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
SOURCE=.\BankS.cpp
+# ADD CPP /GR-
# End Source File
# Begin Source File
SOURCE=.\client.cpp
+# ADD CPP /GR-
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/examples/Simple/bank/server.dsp b/TAO/examples/Simple/bank/server.dsp index d12a97bd8d2..69e35eaa777 100644 --- a/TAO/examples/Simple/bank/server.dsp +++ b/TAO/examples/Simple/bank/server.dsp @@ -100,6 +100,7 @@ SOURCE=.\AccountManager_i.cpp # Begin Source File
SOURCE=.\BankC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Simple/chat/client.dsp b/TAO/examples/Simple/chat/client.dsp index 888a6cfc445..027ddc61af0 100644 --- a/TAO/examples/Simple/chat/client.dsp +++ b/TAO/examples/Simple/chat/client.dsp @@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\BroadcasterC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -110,6 +111,7 @@ SOURCE=.\Receiver_i.cpp # Begin Source File
SOURCE=.\ReceiverC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Simple/chat/server.dsp b/TAO/examples/Simple/chat/server.dsp index 6ad44c5f028..7057a3de220 100644 --- a/TAO/examples/Simple/chat/server.dsp +++ b/TAO/examples/Simple/chat/server.dsp @@ -94,6 +94,7 @@ SOURCE=.\Broadcaster_i.cpp # Begin Source File
SOURCE=.\BroadcasterC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -102,6 +103,7 @@ SOURCE=.\BroadcasterS.cpp # Begin Source File
SOURCE=.\ReceiverC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Simple/echo/client.dsp b/TAO/examples/Simple/echo/client.dsp index b62f4e6b44d..3e97db89792 100644 --- a/TAO/examples/Simple/echo/client.dsp +++ b/TAO/examples/Simple/echo/client.dsp @@ -100,6 +100,7 @@ SOURCE=.\Echo_Client_i.cpp # Begin Source File
SOURCE=.\EchoC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Simple/echo/server.dsp b/TAO/examples/Simple/echo/server.dsp index 2c5ae911240..b9ba3b6d918 100644 --- a/TAO/examples/Simple/echo/server.dsp +++ b/TAO/examples/Simple/echo/server.dsp @@ -96,6 +96,7 @@ SOURCE=.\Echo_i.cpp # Begin Source File
SOURCE=.\EchoC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Simple/grid/client.dsp b/TAO/examples/Simple/grid/client.dsp index 95616113d37..3b31d3c79ab 100644 --- a/TAO/examples/Simple/grid/client.dsp +++ b/TAO/examples/Simple/grid/client.dsp @@ -98,6 +98,7 @@ SOURCE=.\Grid_Client_i.cpp # Begin Source File
SOURCE=.\GridC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Simple/grid/server.dsp b/TAO/examples/Simple/grid/server.dsp index ff966a38823..f741f8d2a11 100644 --- a/TAO/examples/Simple/grid/server.dsp +++ b/TAO/examples/Simple/grid/server.dsp @@ -94,6 +94,7 @@ SOURCE=.\Grid_i.cpp # Begin Source File
SOURCE=.\GridC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Simple/time-date/Time_Date.dsp b/TAO/examples/Simple/time-date/Time_Date.dsp index d64b3926e06..2bf1532c675 100644 --- a/TAO/examples/Simple/time-date/Time_Date.dsp +++ b/TAO/examples/Simple/time-date/Time_Date.dsp @@ -103,6 +103,7 @@ SOURCE=.\Time_Date_i.cpp # Begin Source File
SOURCE=.\Time_DateC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Simple/time-date/client.dsp b/TAO/examples/Simple/time-date/client.dsp index b85937d0fe3..120958e3cc4 100644 --- a/TAO/examples/Simple/time-date/client.dsp +++ b/TAO/examples/Simple/time-date/client.dsp @@ -98,6 +98,7 @@ SOURCE=.\Time_Date_Client_i.cpp # Begin Source File
SOURCE=.\Time_DateC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Simple/time/client.dsp b/TAO/examples/Simple/time/client.dsp index 5b347c7d836..12d69ad58ee 100644 --- a/TAO/examples/Simple/time/client.dsp +++ b/TAO/examples/Simple/time/client.dsp @@ -98,6 +98,7 @@ SOURCE=.\Time_Client_i.cpp # Begin Source File
SOURCE=.\TimeC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Simple/time/server.dsp b/TAO/examples/Simple/time/server.dsp index 11589a25cf7..9ab03282b06 100644 --- a/TAO/examples/Simple/time/server.dsp +++ b/TAO/examples/Simple/time/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\Time_i.cpp # Begin Source File
SOURCE=.\TimeC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp index 6d18a5cb598..4dc0d451bd6 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp @@ -98,6 +98,7 @@ SOURCE=.\DualEC_Sup.cpp # Begin Source File
SOURCE=.\NavWeapC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp index 532cef3c200..513baf6c0a6 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp @@ -98,6 +98,7 @@ SOURCE=.\Event_Sup.cpp # Begin Source File
SOURCE=.\NavWeapC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp index 83955391c82..f6e808c46bf 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp @@ -98,6 +98,7 @@ SOURCE=.\Logging_Sup.cpp # Begin Source File
SOURCE=.\NavWeapC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/examples/TypeCode_Creation/TypeCode_Creation.dsp b/TAO/examples/TypeCode_Creation/TypeCode_Creation.dsp index 8977b127e7a..9f6574e0895 100644 --- a/TAO/examples/TypeCode_Creation/TypeCode_Creation.dsp +++ b/TAO/examples/TypeCode_Creation/TypeCode_Creation.dsp @@ -94,6 +94,7 @@ SOURCE=.\main.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp index 268bbc5c230..ee39148455c 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp @@ -91,8 +91,8 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &, TAO_POA_Current *tao_current = ACE_dynamic_cast (TAO_POA_Current*, this->poa_current_var_.in ()); TAO_POA_Current_Impl *impl = tao_current->implementation (); - TAO_ObjectKey::encode_sequence_to_string (key_str, - impl->object_key ()); + TAO::ObjectKey::encode_sequence_to_string (key_str, + impl->object_key ()); // Append the key_string to the IOR that is received from the // activate_server_with_startup function call. diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index f3d15ab517c..46c85d2b342 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -728,7 +728,7 @@ ImR_Activator_i::server_is_running (const char *server, orb->orb_core ()->lane_resources ().acceptor_registry (); TAO_MProfile mp; - TAO_ObjectKey objkey; + TAO::ObjectKey objkey; // Use a default acceptor filter, all the profiles in the ImR are valid, no // matter what the server has. diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp index 89001fcc3d6..cd9081a7202 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp @@ -179,6 +179,7 @@ BuildCmds= \ # Begin Source File
SOURCE=.\CosEventChannelFactoryC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp index ea83b4b397d..09e686f1e77 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp @@ -114,6 +114,7 @@ SOURCE=.\CosEventChannelFactory_i.cpp # Begin Source File
SOURCE=.\CosEventChannelFactoryC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Send_File_Client.dsp b/TAO/orbsvcs/examples/Security/Send_File/Send_File_Client.dsp index a42e74a8a35..fe9673eaa69 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/Send_File_Client.dsp +++ b/TAO/orbsvcs/examples/Security/Send_File/Send_File_Client.dsp @@ -94,6 +94,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/orbsvcs/examples/Security/Send_File/Send_File_Server.dsp b/TAO/orbsvcs/examples/Security/Send_File/Send_File_Server.dsp index 1304ac9107b..04b9b36f45f 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/Send_File_Server.dsp +++ b/TAO/orbsvcs/examples/Security/Send_File/Send_File_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/orbsvcs/orbsvcs/AV.dsp b/TAO/orbsvcs/orbsvcs/AV.dsp index 0be8aff220f..71112a0788a 100644 --- a/TAO/orbsvcs/orbsvcs/AV.dsp +++ b/TAO/orbsvcs/orbsvcs/AV.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "AV_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -165,6 +165,7 @@ SOURCE=.\AV\AVStreams_i.cpp # Begin Source File
SOURCE=.\AVStreamsC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -205,6 +206,7 @@ SOURCE=.\AV\Nil.cpp # Begin Source File
SOURCE=.\Null_MediaCtrlC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -245,6 +247,7 @@ SOURCE=.\AV\sfp.cpp # Begin Source File
SOURCE=.\sfpC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.dsp b/TAO/orbsvcs/orbsvcs/CosConcurrency.dsp index 6c40efa9b48..96988fa7e92 100644 --- a/TAO/orbsvcs/orbsvcs/CosConcurrency.dsp +++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CosConcurrency_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_CONCURRENCY_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_CONCURRENCY_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -176,6 +176,7 @@ SOURCE=.\Concurrency\Concurrency_Utils.cpp # Begin Source File
SOURCE=.\CosConcurrencyControlC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.dsp b/TAO/orbsvcs/orbsvcs/CosLifeCycle.dsp index 0d82355f6f2..ccde0bc93a8 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.dsp +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_LIFECYCLE_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_LIFECYCLE_BUILD_DLL" /D "TAO_ORBSVCS_HAS_LIFECYCLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_LIFECYCLE_BUILD_DLL" /D "TAO_ORBSVCS_HAS_LIFECYCLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -157,6 +157,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\CosLifeCycleC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -165,6 +166,7 @@ SOURCE=.\CosLifeCycleS.cpp # Begin Source File
SOURCE=.\LifeCycleServiceC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.dsp b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.dsp index 425ef954db6..313c6637dc2 100644 --- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.dsp +++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CosLoadBalancing_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_LOADBALANCING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_LOADBALANCING" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_LOADBALANCING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_LOADBALANCING" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -158,6 +158,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\CosLoadBalancingC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -242,6 +243,7 @@ SOURCE=.\LoadBalancing\LB_ORBInitializer.cpp # Begin Source File
SOURCE=.\LB_ORTC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.dsp b/TAO/orbsvcs/orbsvcs/CosNaming.dsp index d9f9c1c5575..8d7e2c4431e 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.dsp +++ b/TAO/orbsvcs/orbsvcs/CosNaming.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CosNaming_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_NAMING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_NAMING" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_NAMING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_NAMING" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -160,6 +160,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\CosNamingC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.dsp b/TAO/orbsvcs/orbsvcs/CosProperty.dsp index 5542c6bdae3..9c3a7a3875c 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty.dsp +++ b/TAO/orbsvcs/orbsvcs/CosProperty.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CosProperty_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -164,6 +164,7 @@ SOURCE=.\Property\CosPropertyService_i.cpp # Begin Source File
SOURCE=.\CosPropertyServiceC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.dsp b/TAO/orbsvcs/orbsvcs/CosTime.dsp index 9137678b3bd..6ef95e177bd 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime.dsp +++ b/TAO/orbsvcs/orbsvcs/CosTime.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CosTime_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_TIME_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_TIME_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -180,6 +180,7 @@ SOURCE=.\Time\Timer_Helper.cpp # Begin Source File
SOURCE=.\TimeServiceC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp index 28913182c39..c7f9e137096 100644 --- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp +++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DSEVENTLOGADMIN_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_EVENTLOG_BUILD_DLL" /FR /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_EVENTLOG_BUILD_DLL" /FR /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -95,6 +95,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\DsEventLogAdminC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp b/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp index 26424b21e1f..abd0b86e6d8 100644 --- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp +++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp @@ -73,7 +73,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DsLogAdmin_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_LOG_BUILD_DLL" /FR /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_LOG_BUILD_DLL" /FR /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -168,6 +168,7 @@ SOURCE=.\Log\BasicLogFactory_i.cpp # Begin Source File
SOURCE=.\DsLogAdminC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -176,6 +177,7 @@ SOURCE=.\DsLogAdminS.cpp # Begin Source File
SOURCE=.\DsLogNotificationC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp index 1a3c417804a..4fc941eabb6 100644 --- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp +++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DSNOTIFYLOGADMIN_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_NOTIFYLOG_BUILD_DLL" /FR /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_NOTIFYLOG_BUILD_DLL" /FR /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -95,6 +95,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\DsNotifyLogAdminC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/orbsvcs/FT_ORB.dsp b/TAO/orbsvcs/orbsvcs/FT_ORB.dsp index 0fdd3009981..30a242f609e 100644 --- a/TAO/orbsvcs/orbsvcs/FT_ORB.dsp +++ b/TAO/orbsvcs/orbsvcs/FT_ORB.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_FT_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_FT_BUILD_DLL" /D "TAO_ORBSVCS_HAS_FT" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_FT_BUILD_DLL" /D "TAO_ORBSVCS_HAS_FT" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -158,6 +158,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\FT_CORBA_ORBC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/orbsvcs/Fault_Tolerance.dsp b/TAO/orbsvcs/orbsvcs/Fault_Tolerance.dsp index 3804c21dfcf..979b440de8c 100644 --- a/TAO/orbsvcs/orbsvcs/Fault_Tolerance.dsp +++ b/TAO/orbsvcs/orbsvcs/Fault_Tolerance.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_FT_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_FT_BUILD_DLL" /D "TAO_ORBSVCS_HAS_FT" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_FT_BUILD_DLL" /D "TAO_ORBSVCS_HAS_FT" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -158,6 +158,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\FT_CORBAC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp index bc6e821b7f8..c0ecf51d412 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp @@ -59,7 +59,7 @@ TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER) // Destroy our special subsections first, then call destroy_i // on our base class. - TAO_IFR_Generic_Utils::destroy_special<TAO_ProvidesDef_i> ( + TAO_IFR_Generic_Utils<TAO_ProvidesDef_i>::destroy_special ( "provides", this->repo_, this->section_key_ @@ -67,7 +67,7 @@ TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER) ); ACE_CHECK; - TAO_IFR_Generic_Utils::destroy_special<TAO_UsesDef_i> ( + TAO_IFR_Generic_Utils<TAO_UsesDef_i>::destroy_special ( "uses", this->repo_, this->section_key_ @@ -75,7 +75,7 @@ TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER) ); ACE_CHECK; - TAO_IFR_Generic_Utils::destroy_special<TAO_EmitsDef_i> ( + TAO_IFR_Generic_Utils<TAO_EmitsDef_i>::destroy_special ( "emits", this->repo_, this->section_key_ @@ -83,7 +83,7 @@ TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER) ); ACE_CHECK; - TAO_IFR_Generic_Utils::destroy_special<TAO_PublishesDef_i> ( + TAO_IFR_Generic_Utils<TAO_PublishesDef_i>::destroy_special ( "publishes", this->repo_, this->section_key_ @@ -91,7 +91,7 @@ TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER) ); ACE_CHECK; - TAO_IFR_Generic_Utils::destroy_special<TAO_ConsumesDef_i> ( + TAO_IFR_Generic_Utils<TAO_ConsumesDef_i>::destroy_special ( "consumes", this->repo_, this->section_key_ @@ -175,37 +175,37 @@ TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_PARAMETER) desc_ptr->supported_interfaces[i] = holder.c_str (); } - TAO_Port_Utils::port_descriptions< + TAO_Port_Desc_Seq_Utils< CORBA::ComponentIR::ProvidesDescriptionSeq - > (desc_ptr->provided_interfaces, + >::port_descriptions (desc_ptr->provided_interfaces, this->repo_->config (), this->section_key_, "provides"); - TAO_Port_Utils::port_descriptions< + TAO_Port_Desc_Seq_Utils< CORBA::ComponentIR::UsesDescriptionSeq - > (desc_ptr->used_interfaces, + >::port_descriptions (desc_ptr->used_interfaces, this->repo_->config (), this->section_key_, "uses"); - TAO_Port_Utils::port_descriptions< + TAO_Port_Desc_Seq_Utils< CORBA::ComponentIR::EventPortDescriptionSeq - > (desc_ptr->emits_events, + >::port_descriptions (desc_ptr->emits_events, this->repo_->config (), this->section_key_, "emits"); - TAO_Port_Utils::port_descriptions< + TAO_Port_Desc_Seq_Utils< CORBA::ComponentIR::EventPortDescriptionSeq - > (desc_ptr->publishes_events, + >::port_descriptions (desc_ptr->publishes_events, this->repo_->config (), this->section_key_, "publishes"); - TAO_Port_Utils::port_descriptions< + TAO_Port_Desc_Seq_Utils< CORBA::ComponentIR::EventPortDescriptionSeq - > (desc_ptr->consumes_events, + >::port_descriptions (desc_ptr->consumes_events, this->repo_->config (), this->section_key_, "consumes"); @@ -545,18 +545,18 @@ TAO_ComponentDef_i::create_provides_i ( ACE_THROW_SPEC ((CORBA::SystemException)) { return - TAO_Port_Utils::create_entry< + TAO_Port_Utils< CORBA::ComponentIR::ProvidesDef - > (id, - name, - version, - "provides", - interface_type, - 0, - this->repo_, - CORBA::dk_Provides, - this->section_key_ - ACE_ENV_ARG_PARAMETER); + >::create_entry (id, + name, + version, + "provides", + interface_type, + 0, + this->repo_, + CORBA::dk_Provides, + this->section_key_ + ACE_ENV_ARG_PARAMETER); } CORBA::ComponentIR::UsesDef_ptr @@ -591,18 +591,18 @@ TAO_ComponentDef_i::create_uses_i (const char *id, ACE_THROW_SPEC ((CORBA::SystemException)) { return - TAO_Port_Utils::create_entry< + TAO_Port_Utils< CORBA::ComponentIR::UsesDef - > (id, - name, - version, - "uses", - interface_type, - is_multiple, - this->repo_, - CORBA::dk_Uses, - this->section_key_ - ACE_ENV_ARG_PARAMETER); + >::create_entry (id, + name, + version, + "uses", + interface_type, + is_multiple, + this->repo_, + CORBA::dk_Uses, + this->section_key_ + ACE_ENV_ARG_PARAMETER); } CORBA::ComponentIR::EmitsDef_ptr @@ -634,18 +634,18 @@ TAO_ComponentDef_i::create_emits_i (const char *id, ACE_THROW_SPEC ((CORBA::SystemException)) { return - TAO_Port_Utils::create_entry< + TAO_Port_Utils< CORBA::ComponentIR::EmitsDef - > (id, - name, - version, - "emits", - value, - 0, - this->repo_, - CORBA::dk_Emits, - this->section_key_ - ACE_ENV_ARG_PARAMETER); + >::create_entry (id, + name, + version, + "emits", + value, + 0, + this->repo_, + CORBA::dk_Emits, + this->section_key_ + ACE_ENV_ARG_PARAMETER); } CORBA::ComponentIR::PublishesDef_ptr @@ -677,18 +677,18 @@ TAO_ComponentDef_i::create_publishes_i (const char *id, ACE_THROW_SPEC ((CORBA::SystemException)) { return - TAO_Port_Utils::create_entry< + TAO_Port_Utils< CORBA::ComponentIR::PublishesDef - > (id, - name, - version, - "publishes", - value, - 0, - this->repo_, - CORBA::dk_Publishes, - this->section_key_ - ACE_ENV_ARG_PARAMETER); + >::create_entry (id, + name, + version, + "publishes", + value, + 0, + this->repo_, + CORBA::dk_Publishes, + this->section_key_ + ACE_ENV_ARG_PARAMETER); } CORBA::ComponentIR::ConsumesDef_ptr @@ -720,18 +720,18 @@ TAO_ComponentDef_i::create_consumes_i (const char *id, ACE_THROW_SPEC ((CORBA::SystemException)) { return - TAO_Port_Utils::create_entry< + TAO_Port_Utils< CORBA::ComponentIR::ConsumesDef - > (id, - name, - version, - "comsumes", - value, - 0, - this->repo_, - CORBA::dk_Consumes, - this->section_key_ - ACE_ENV_ARG_PARAMETER); + >::create_entry (id, + name, + version, + "comsumes", + value, + 0, + this->repo_, + CORBA::dk_Consumes, + this->section_key_ + ACE_ENV_ARG_PARAMETER); } int @@ -759,7 +759,7 @@ TAO_ComponentDef_i::name_clash (const char *name) // Specialization. template<> void -TAO_Port_Utils::get_is_multiple<CORBA::ComponentIR::UsesDescriptionSeq> ( +TAO_Port_Desc_Seq_Utils<CORBA::ComponentIR::UsesDescriptionSeq>::get_is_multiple ( CORBA::ComponentIR::UsesDescriptionSeq &desc_seq, ACE_Configuration *config, ACE_Configuration_Section_Key &key, @@ -778,7 +778,7 @@ TAO_Port_Utils::get_is_multiple<CORBA::ComponentIR::UsesDescriptionSeq> ( // Specialization. template<> void -TAO_Port_Utils::port_base_type<CORBA::ComponentIR::EventPortDescriptionSeq> ( +TAO_Port_Desc_Seq_Utils<CORBA::ComponentIR::EventPortDescriptionSeq>::port_base_type ( CORBA::ComponentIR::EventPortDescriptionSeq &desc_seq, ACE_TString &holder, CORBA::ULong index @@ -790,7 +790,7 @@ TAO_Port_Utils::port_base_type<CORBA::ComponentIR::EventPortDescriptionSeq> ( /// Specialization. template<> void -TAO_Port_Utils::set_is_multiple<CORBA::ComponentIR::UsesDef> ( +TAO_Port_Utils<CORBA::ComponentIR::UsesDef>::set_is_multiple ( CORBA::Boolean is_multiple, ACE_Configuration *config, ACE_Configuration_Section_Key &key diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp index 450bc7e1819..1eaa9170e02 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp @@ -1993,6 +1993,12 @@ TAO_Container_i::same_as_tmp_name (const char *name) } void +TAO_Container_i::tmp_name_holder (const char *name) +{ + TAO_Container_i::tmp_name_holder_ = name; +} + +void TAO_Container_i::lookup_name_recursive ( ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue, ACE_Unbounded_Queue<ACE_TString> &path_queue, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h index 914cb446896..4ee629c8043 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h @@ -47,7 +47,8 @@ class TAO_IFRService_Export TAO_Container_i : public virtual TAO_IRObject_i // derived from the Contained interface. // public: - friend class TAO_Port_Utils; +// template<typename T> +// friend class TAO_Port_Utils; TAO_Container_i (TAO_Repository_i *repo); // Constructor. @@ -405,6 +406,9 @@ public: static int same_as_tmp_name (const char *name); // Called from TAO_IFR_Service_Utils::name_exisits. + static void tmp_name_holder (const char *name); + // Accesses the statis member. + protected: void store_label ( ACE_Configuration_Section_Key key, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp index a2e43300776..a2f5ce38b8a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp @@ -57,7 +57,7 @@ TAO_InterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) // call to remove_section (recursive = 1) will not get, and also // destroy the attribute's anonymous type, if any. - TAO_IFR_Generic_Utils::destroy_special<TAO_AttributeDef_i> ( + TAO_IFR_Generic_Utils<TAO_AttributeDef_i>::destroy_special ( "attrs", this->repo_, this->section_key_ @@ -65,7 +65,7 @@ TAO_InterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ); ACE_CHECK; - TAO_IFR_Generic_Utils::destroy_special<TAO_OperationDef_i> ( + TAO_IFR_Generic_Utils<TAO_OperationDef_i>::destroy_special ( "ops", this->repo_, this->section_key_ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp index b685138c2a5..a0c46d6cda1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp @@ -54,7 +54,7 @@ TAO_ValueDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) // call to remove_section (recursive = 1) will not get, and also // destroy the attribute's anonymous type, if any. - TAO_IFR_Generic_Utils::destroy_special<TAO_AttributeDef_i> ( + TAO_IFR_Generic_Utils<TAO_AttributeDef_i>::destroy_special ( "attrs", this->repo_, this->section_key_ @@ -62,7 +62,7 @@ TAO_ValueDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ); ACE_CHECK; - TAO_IFR_Generic_Utils::destroy_special<TAO_OperationDef_i> ( + TAO_IFR_Generic_Utils<TAO_OperationDef_i>::destroy_special ( "ops", this->repo_, this->section_key_ @@ -118,14 +118,14 @@ TAO_ValueDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) vd->version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - TAO_IFR_Generic_Utils::fill_string_seq<CORBA::RepositoryIdSeq> ( + TAO_IFR_Strseq_Utils<CORBA::RepositoryIdSeq>::fill_string_seq ( "supported", this->repo_->config (), this->section_key_, vd->supported_interfaces ); - TAO_IFR_Generic_Utils::fill_string_seq<CORBA::RepositoryIdSeq> ( + TAO_IFR_Strseq_Utils<CORBA::RepositoryIdSeq>::fill_string_seq ( "abstract_bases", this->repo_->config (), this->section_key_, @@ -1114,7 +1114,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL) 0); } - TAO_IFR_Generic_Utils::fill_string_seq<CORBA::ContextIdSeq> ( + TAO_IFR_Strseq_Utils<CORBA::ContextIdSeq>::fill_string_seq ( "contexts", this->repo_->config (), op_key, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h index af8a28a2fd2..cc4d8cd3675 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h @@ -20,6 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" +#include "ace/Service_Object.h" #include "orbsvcs/CosNotifyChannelAdminS.h" #include "tao/PortableServer/PortableServer.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.dsp b/TAO/orbsvcs/orbsvcs/PortableGroup.dsp index 0d6d9afcdab..bc70f3804ec 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup.dsp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PortableGroup_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "../.." /I "../../.." /D "_DEBUG" /D "TAO_PORTABLEGROUP_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I ".." /I "../.." /I "../../.." /D "_DEBUG" /D "TAO_PORTABLEGROUP_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -160,14 +160,20 @@ SOURCE=.\miopC.cpp !IF "$(CFG)" == "PortableGroup - Win32 Release"
+# ADD CPP /GR
+
!ELSEIF "$(CFG)" == "PortableGroup - Win32 Debug"
-# ADD CPP /I "../../tao"
+# ADD CPP /GR /I "../../tao"
!ELSEIF "$(CFG)" == "PortableGroup - Win32 MFC Debug"
+# ADD CPP /GR
+
!ELSEIF "$(CFG)" == "PortableGroup - Win32 MFC Release"
+# ADD CPP /GR
+
!ENDIF
# End Source File
@@ -322,14 +328,20 @@ SOURCE=.\PortableGroupC.cpp !IF "$(CFG)" == "PortableGroup - Win32 Release"
+# ADD CPP /GR
+
!ELSEIF "$(CFG)" == "PortableGroup - Win32 Debug"
-# ADD CPP /I "../../tao"
+# ADD CPP /GR /I "../../tao"
!ELSEIF "$(CFG)" == "PortableGroup - Win32 MFC Debug"
+# ADD CPP /GR
+
!ELSEIF "$(CFG)" == "PortableGroup - Win32 MFC Release"
+# ADD CPP /GR
+
!ENDIF
# End Source File
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp index 65f3e2c9903..57193ed453e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp @@ -202,7 +202,7 @@ TAO_POA_Hooks::associate_group_with_ref ( // Add a mapping from GroupId to Object key in the PortableGroup - const TAO_ObjectKey &key = obj_ref->_object_key (); + const TAO::ObjectKey &key = obj_ref->_object_key (); this->request_dispatcher_.group_map_.add_groupid_objectkey_pair ( group_id._retn (), key diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h index a1fed2a2c82..b0d3c438a1e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h @@ -17,8 +17,9 @@ #include "ace/pre.h" #include "portablegroup_export.h" -#include "ace/Service_Config.h" #include "tao/corbafwd.h" +#include "ace/Service_Config.h" +#include "ace/Service_Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,7 +33,8 @@ * This class acts as a facade for the PortableGroup library to the * ORB. */ -class TAO_PortableGroup_Export TAO_PortableGroup_Loader : public ACE_Service_Object +class TAO_PortableGroup_Export TAO_PortableGroup_Loader + : public ACE_Service_Object { friend class TAO_POA_Hooks; @@ -56,7 +58,8 @@ ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PortableGroup_Loader) typedef int (*TAO_Module_Initializer) (void); static TAO_Module_Initializer -TAO_Requires_PortableGroup_Initializer = &TAO_PortableGroup_Loader::Initializer; +TAO_Requires_PortableGroup_Initializer = + &TAO_PortableGroup_Loader::Initializer; #else diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp index eaa66f2a201..d97b1361b8f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp @@ -42,9 +42,11 @@ TAO_Portable_Group_Map::~TAO_Portable_Group_Map (void) void -TAO_Portable_Group_Map::add_groupid_objectkey_pair (PortableGroup::TagGroupTaggedComponent *group_id, - const TAO_ObjectKey &key - ACE_ENV_ARG_DECL) +TAO_Portable_Group_Map::add_groupid_objectkey_pair ( + PortableGroup::TagGroupTaggedComponent *group_id, + const TAO::ObjectKey &key + ACE_ENV_ARG_DECL + ) { Map_Entry *new_entry; @@ -95,7 +97,7 @@ TAO_Portable_Group_Map::add_groupid_objectkey_pair (PortableGroup::TagGroupTagge void TAO_Portable_Group_Map::remove_groupid_objectkey_pair (const PortableGroup::TagGroupTaggedComponent* /*group_id*/, - const TAO_ObjectKey &/*key*/ + const TAO::ObjectKey &/*key*/ ACE_ENV_ARG_DECL_NOT_USED) { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h index 07b842eaa10..3e3f7c5e9f3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h @@ -72,7 +72,7 @@ public: struct Map_Entry { /// The key. - TAO_ObjectKey key; + TAO::ObjectKey key; /// next ObjectKey in the group. struct Map_Entry *next; @@ -87,13 +87,13 @@ public: /// Add a GroupId->ObjectKey mapping to the map. /// This function takes ownership of the memory pointed to be group_id void add_groupid_objectkey_pair (PortableGroup::TagGroupTaggedComponent *group_id, - const TAO_ObjectKey &key + const TAO::ObjectKey &key ACE_ENV_ARG_DECL); /// Remove a GroupId->ObjectKey mapping from the map. void remove_groupid_objectkey_pair (const PortableGroup::TagGroupTaggedComponent* group_id, - const TAO_ObjectKey &key + const TAO::ObjectKey &key ACE_ENV_ARG_DECL); /// Dispatch a request to all of the ObjectIds that belong to diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp index d34b8a46c18..34024bf2e2c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp @@ -45,7 +45,7 @@ TAO_UIPMC_Acceptor::~TAO_UIPMC_Acceptor (void) } int -TAO_UIPMC_Acceptor::create_profile (const TAO_ObjectKey &, +TAO_UIPMC_Acceptor::create_profile (const TAO::ObjectKey &, TAO_MProfile &, CORBA::Short) { @@ -268,7 +268,7 @@ TAO_UIPMC_Acceptor::endpoint_count (void) int TAO_UIPMC_Acceptor::object_key (IOP::TaggedProfile &, - TAO_ObjectKey &) + TAO::ObjectKey &) { // No object key to extract. Just return success. return 1; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h index 57ab7eeaffd..b885f58753a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h @@ -71,14 +71,14 @@ public: int version_minor, const char *options = 0); virtual int close (void); - virtual int create_profile (const TAO_ObjectKey &object_key, + virtual int create_profile (const TAO::ObjectKey &object_key, TAO_MProfile &mprofile, CORBA::Short priority); virtual int is_collocated (const TAO_Endpoint *endpoint); virtual CORBA::ULong endpoint_count (void); virtual int object_key (IOP::TaggedProfile &profile, - TAO_ObjectKey &key); + TAO::ObjectKey &key); /** * Set the host name for the given addr. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h index b5dd69c96ee..0c80d9474f0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h @@ -113,11 +113,11 @@ public: virtual int encode_endpoints (void); /// @@ deprecated. return a reference to the Object Key. - virtual const TAO_ObjectKey &object_key (void) const; + virtual const TAO::ObjectKey &object_key (void) const; /// Return a pointer to the Object Key. The caller owns the memory /// allocated for the returned key. - virtual TAO_ObjectKey *_key (void) const; + virtual TAO::ObjectKey *_key (void) const; /// Return pointer to the head of this profile's endpoints list. virtual TAO_Endpoint *endpoint (void); @@ -201,7 +201,7 @@ private: /// object_key associated with this profile. This is wasted data for /// UIPMC since there is no object key here, but is needed to satisfy /// some of the API calls. - TAO_ObjectKey object_key_; + TAO::ObjectKey object_key_; /// Cached version of our tagged profile. IOP::TaggedProfile tagged_profile_; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.i index ee4090d1509..97a08bbc4f5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.i +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.i @@ -1,13 +1,13 @@ // -*- C++ -*- // $Id$ -ACE_INLINE const TAO_ObjectKey & +ACE_INLINE const TAO::ObjectKey & TAO_UIPMC_Profile::object_key (void) const { return this->object_key_; } -ACE_INLINE TAO_ObjectKey * +ACE_INLINE TAO::ObjectKey * TAO_UIPMC_Profile::_key (void) const { // No object key for a UIPMC profile. diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 41256ad7ba6..8a48c6f6fb7 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -873,7 +873,8 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper // Make an any value with tk_void type. nproperties [i].property_value = - CORBA::Any (CORBA::_tc_void); + CORBA::Any (CORBA::_tc_void, + 0); } } diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.dsp b/TAO/orbsvcs/orbsvcs/RTEvent.dsp index 95a9fdf133e..37af62ca41d 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.dsp +++ b/TAO/orbsvcs/orbsvcs/RTEvent.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RTEvent_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTEVENT_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTEVENT_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -341,6 +341,7 @@ SOURCE=.\Event_Utilities.cpp # Begin Source File
SOURCE=.\RtecDefaultEventDataC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -349,6 +350,7 @@ SOURCE=.\RtecDefaultEventDataS.cpp # Begin Source File
SOURCE=.\RtecEventChannelAdminC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -357,6 +359,7 @@ SOURCE=.\RtecEventChannelAdminS.cpp # Begin Source File
SOURCE=.\RtecEventCommC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -365,10 +368,12 @@ SOURCE=.\RtecEventCommS.cpp # Begin Source File
SOURCE=.\RtecUDPAdminC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
SOURCE=.\RtecUDPAdminS.cpp
+# ADD CPP /GR-
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/orbsvcs/orbsvcs/RTEventLog.dsp b/TAO/orbsvcs/orbsvcs/RTEventLog.dsp index 5dc89f17046..ca83e97aa8c 100644 --- a/TAO/orbsvcs/orbsvcs/RTEventLog.dsp +++ b/TAO/orbsvcs/orbsvcs/RTEventLog.dsp @@ -98,6 +98,7 @@ SOURCE=.\Log\RTEventLog_i.cpp # Begin Source File
SOURCE=.\RTEventLogAdminC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.dsp b/TAO/orbsvcs/orbsvcs/RTSched.dsp index 1a2ddad58cb..646708c6bb9 100644 --- a/TAO/orbsvcs/orbsvcs/RTSched.dsp +++ b/TAO/orbsvcs/orbsvcs/RTSched.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RTSched_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_RTSCHED_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_RTSCHED_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -176,6 +176,7 @@ SOURCE=.\Sched\Reconfig_Scheduler.cpp # Begin Source File
SOURCE=.\RtecSchedulerC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.dsp b/TAO/orbsvcs/orbsvcs/SSLIOP.dsp index a3cab816ad6..b7feacc92fe 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP.dsp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP.dsp @@ -192,6 +192,7 @@ SOURCE=.\SSLIOP\SSLIOP_X509.cpp # Begin Source File
SOURCE=.\SSLIOPC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/orbsvcs/orbsvcs/Security.dsp b/TAO/orbsvcs/orbsvcs/Security.dsp index eeb848f1fda..c607ef53947 100644 --- a/TAO/orbsvcs/orbsvcs/Security.dsp +++ b/TAO/orbsvcs/orbsvcs/Security.dsp @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Security_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SECURITY_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SECURITY" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SECURITY_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SECURITY" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -128,14 +128,17 @@ SOURCE=.\Security\Security_PolicyFactory.cpp # Begin Source File
SOURCE=.\SecurityC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
SOURCE=.\SecurityLevel1C.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
SOURCE=.\SecurityLevel2C.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -148,6 +151,7 @@ SOURCE=.\Security\SecurityManager.cpp # Begin Source File
SOURCE=.\SecurityReplaceableC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp b/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp index c47e7078a16..5151146820b 100644 --- a/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp +++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp @@ -45,7 +45,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -101,7 +101,7 @@ LINK32=link.exe # PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /D ACE_HAS_MFC=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /D ACE_HAS_MFC=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -130,7 +130,7 @@ LINK32=link.exe # PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /D ACE_HAS_MFC=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /D ACE_HAS_MFC=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -161,6 +161,7 @@ SOURCE=.\IOR_Multicast.cpp # Begin Source File
SOURCE=.\RtecBaseC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -173,6 +174,7 @@ SOURCE=.\Time_Utilities.cpp # Begin Source File
SOURCE=.\TimeBaseC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.dsp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.dsp index 5dc2b483865..5f58d0df17e 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.dsp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.dsp @@ -98,6 +98,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.dsp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.dsp index b4ba443a8da..d72d7bc4106 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.dsp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.dsp @@ -102,6 +102,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/TAO_RTEC_Perf.dsp b/TAO/orbsvcs/performance-tests/RTEvent/lib/TAO_RTEC_Perf.dsp index 6760b599e2d..0a151a76dfd 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/TAO_RTEC_Perf.dsp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/TAO_RTEC_Perf.dsp @@ -119,6 +119,7 @@ SOURCE=.\EC_Destroyer.cpp # Begin Source File
SOURCE=.\Federated_TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp index 9db095948d9..bbad5a001ba 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp @@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\dataC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp index 61fefe6eed5..3c7d3a267be 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp @@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\dataC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.dsp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.dsp index 5185e19da07..f981b61b642 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.dsp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.dsp @@ -26,7 +26,6 @@ CFG=FaultTolerance IOGR Manager - Win32 Debug # PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
-MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "FaultTolerance IOGR Manager - Win32 Release"
@@ -42,10 +41,11 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\Manager"
# 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 "../../../"
+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 "../../../" /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/IORManipulation/TAO_IORManip.lib ../../../orbsvcs/TAO_FT_ORB.lib /out:"Manager.exe"
+# ADD LINK32 ../../../../../ace/ACE.lib ../../../../tao/TAO.lib ../../../../tao/PortableServer/TAO_PortableServer.lib ../../../../tao/IORManipulation/TAO_IORManip.lib ../../../orbsvcs/TAO_FT_ORB.lib /nologo /subsystem:console /machine:I386 /out:"Manager.exe"
!ELSEIF "$(CFG)" == "FaultTolerance IOGR Manager - Win32 Debug"
@@ -68,20 +68,21 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\Manager"
# 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 "../../../"
+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 "../../../" /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/IORManipulation/TAO_IORManipd.lib ../../../orbsvcs/TAO_FT_ORBd.lib /out:"Manager.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/IORManipulation/TAO_IORManipd.lib ../../../orbsvcs/TAO_FT_ORBd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-!ENDIF
+!ENDIF
# Begin Target
@@ -97,6 +98,7 @@ SOURCE=.\Manager.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
@@ -113,13 +115,13 @@ SOURCE=.\testC.h # Begin Source File
SOURCE=.\test.idl
-!IF "$(CFG)" == "FaultTolerance IOGR Manager - Win32 Release"
-USERDEP__IDL_="..\..\..\..\..\bin\Release\tao_idl.exe"
+!IF "$(CFG)" == "FaultTolerance IOGR Manager - Win32 Release"
+USERDEP__TEST_="..\..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)
InputPath=.\test.idl
-InputName=test
+InputName=Test
BuildCmds= \
..\..\..\..\..\bin\Release\tao_idl.exe -Ge 1 $(InputName).idl
@@ -151,14 +153,13 @@ BuildCmds= \ "$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
-
-!ELSEIF "$(CFG)" == "FaultTolerance IOGR Manager - Win32 Debug"
-USERDEP__IDL_="..\..\..\..\..\bin\tao_idl.exe"
+!ELSEIF "$(CFG)" == "FaultTolerance IOGR Manager - Win32 Debug"
+USERDEP__TEST_="..\..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)
InputPath=.\test.idl
-InputName=test
+InputName=Test
BuildCmds= \
..\..\..\..\..\bin\tao_idl.exe -Ge 1 $(InputName).idl
@@ -190,8 +191,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/orbsvcs/tests/FaultTolerance/IOGR/server.dsp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.dsp index 38a78125dfc..07ea32f7420 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.dsp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.dsp @@ -26,7 +26,6 @@ CFG=FaultTolerance IOGR server - Win32 Debug # PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
-MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "FaultTolerance IOGR server - Win32 Release"
@@ -42,10 +41,11 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\server"
# 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 "../../../"
+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 "../../../" /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/IORManipulation/TAO_IORManip.lib ../../../orbsvcs/TAO_FT_ORB.lib /out:"server.exe"
+# ADD LINK32 ../../../../../ace/ACE.lib ../../../../tao/TAO.lib ../../../../tao/PortableServer/TAO_PortableServer.lib ../../../../tao/IORManipulation/TAO_IORManip.lib ../../../orbsvcs/TAO_FT_ORB.lib /nologo /subsystem:console /machine:I386 /out:"server.exe"
!ELSEIF "$(CFG)" == "FaultTolerance IOGR server - Win32 Debug"
@@ -68,20 +68,21 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\server"
# 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 "../../../"
+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 "../../../" /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/IORManipulation/TAO_IORManipd.lib ../../../orbsvcs/TAO_FT_ORBd.lib /out:"server.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/IORManipulation/TAO_IORManipd.lib ../../../orbsvcs/TAO_FT_ORBd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-!ENDIF
+!ENDIF
# Begin Target
@@ -92,24 +93,25 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
-SOURCE=.\TestC.cpp
+SOURCE=.\server.cpp
# End Source File
# Begin Source File
-SOURCE=.\TestS.cpp
+SOURCE=.\test_i.cpp
# End Source File
# Begin Source File
-SOURCE=.\TestS_T.cpp
-# PROP Exclude_From_Build 1
+SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
-SOURCE=.\server.cpp
+SOURCE=.\TestS.cpp
# End Source File
# Begin Source File
-SOURCE=.\test_i.cpp
+SOURCE=.\TestS_T.cpp
+# PROP Exclude_From_Build 1
# End Source File
# End Group
# Begin Group "Header Files"
@@ -117,19 +119,19 @@ SOURCE=.\test_i.cpp # PROP Default_Filter "h;hpp;hxx;hm;fi;fd"
# Begin Source File
-SOURCE=.\TestC.h
+SOURCE=.\test_i.h
# End Source File
# Begin Source File
-SOURCE=.\TestS.h
+SOURCE=.\TestC.h
# End Source File
# Begin Source File
-SOURCE=.\TestS_T.h
+SOURCE=.\TestS.h
# End Source File
# Begin Source File
-SOURCE=.\test_i.h
+SOURCE=.\TestS_T.h
# End Source File
# End Group
# Begin Group "IDL Files"
@@ -138,10 +140,10 @@ SOURCE=.\test_i.h # Begin Source File
SOURCE=.\Test.idl
-!IF "$(CFG)" == "FaultTolerance IOGR server - Win32 Release"
-USERDEP__IDL_="..\..\..\..\..\bin\Release\tao_idl.exe"
+!IF "$(CFG)" == "FaultTolerance IOGR server - Win32 Release"
+USERDEP__TEST_="..\..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)
InputPath=.\Test.idl
InputName=Test
@@ -176,11 +178,10 @@ BuildCmds= \ "$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
-
-!ELSEIF "$(CFG)" == "FaultTolerance IOGR server - Win32 Debug"
-USERDEP__IDL_="..\..\..\..\..\bin\tao_idl.exe"
+!ELSEIF "$(CFG)" == "FaultTolerance IOGR server - Win32 Debug"
+USERDEP__TEST_="..\..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)
InputPath=.\Test.idl
InputName=Test
@@ -215,8 +216,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/orbsvcs/tests/ImplRepo/airplane_client.dsp b/TAO/orbsvcs/tests/ImplRepo/airplane_client.dsp index 7760e6aeacb..a0468356d78 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client.dsp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client.dsp @@ -102,6 +102,7 @@ SOURCE=.\airplane_client_i.cpp # Begin Source File
SOURCE=.\AirplaneC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.dsp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.dsp index 78183e0cb7a..53f817a91b0 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.dsp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.dsp @@ -106,6 +106,7 @@ SOURCE=.\airplane_server_i.cpp # Begin Source File
SOURCE=.\AirplaneC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp b/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp index daed853edeb..6764e0cf68c 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp @@ -102,6 +102,7 @@ SOURCE=.\nestea_client_i.cpp # Begin Source File
SOURCE=.\NesteaC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp index 9f53dc51f73..f094229eb07 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp @@ -106,6 +106,7 @@ SOURCE=.\nestea_server_i.cpp # Begin Source File
SOURCE=.\NesteaC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp index 728b64f2a41..3e16a9906cf 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp @@ -267,7 +267,8 @@ IFR_DII_Client::create_dii_request (ACE_ENV_SINGLE_ARG_DECL) if (params[i].type->kind () == CORBA::tk_float && ACE_OS::strcmp (params[i].name.in (), "price") == 0) { - CORBA::Any any (CORBA::_tc_float); + CORBA::Any any (CORBA::_tc_float, + 0); // The servant will return 0.0 if the title is not found. this->req_->arguments ()->add_value (params[i].name.in (), diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp index e3ced1ffa55..d18c108f12d 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp @@ -1153,7 +1153,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL) // Can't use ACE_ASSERT here because we don't know the order // of the results of the search. } - + CORBA::Container::DescriptionSeq_var cont_desc = this->repo_->describe_contents (CORBA::dk_all, 0, diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_Test.dsp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_Test.dsp index 9f57519bc60..53c4156c8e0 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_Test.dsp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_Test.dsp @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.dsp b/TAO/orbsvcs/tests/Interoperable_Naming/client.dsp index 788203c5f3f..6d8ac8a4cb7 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/client.dsp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.dsp @@ -98,6 +98,7 @@ SOURCE=.\ncontextext_client_i.cpp # Begin Source File
SOURCE=.\Web_ServerC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.dsp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.dsp index 8a51a12b307..5c6fe5475ac 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.dsp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.dsp @@ -94,6 +94,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/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.dsp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.dsp index f2d2142f425..d9492adece3 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.dsp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.dsp @@ -102,6 +102,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.dsp b/TAO/orbsvcs/tests/Miop/McastHello/client.dsp index ad2afa1d59f..c40e5ef51a7 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/client.dsp +++ b/TAO/orbsvcs/tests/Miop/McastHello/client.dsp @@ -94,6 +94,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/orbsvcs/tests/Miop/McastHello/server.dsp b/TAO/orbsvcs/tests/Miop/McastHello/server.dsp index eeaea63e453..eff364067d4 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/server.dsp +++ b/TAO/orbsvcs/tests/Miop/McastHello/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.dsp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.dsp index 43354308ce3..51ac55c0c82 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.dsp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Structured_Consumer.exe" /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Blocking Structured Consumer - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Structured_Consumer.exe" /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
@@ -87,15 +87,12 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\Structured_Consumer.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\common.cpp
# End Source File
# Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -105,6 +102,10 @@ SOURCE=.\goS.cpp SOURCE=.\Notify_Structured_Push_Consumer.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\Structured_Consumer.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -151,7 +152,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -162,7 +163,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.dsp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.dsp index e6c371522b8..eca4d9eb888 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.dsp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Structured_Supplier.exe" /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Blocking Structured Supplier - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Structured_Supplier.exe" /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
@@ -92,6 +92,7 @@ SOURCE=.\common.cpp # Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -143,7 +144,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -154,7 +155,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.dsp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.dsp index cb5c8dd3c22..6ea7c37eed9 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.dsp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.dsp @@ -92,6 +92,7 @@ SOURCE=.\common.cpp # Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.dsp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.dsp index 6a2d09b3d47..8ca33399eec 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.dsp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Sequence_Supplier.exe" /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Discarding Sequence Supplier - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Sequence_Supplier.exe" /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
@@ -92,6 +92,7 @@ SOURCE=.\common.cpp # Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -143,7 +144,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -154,7 +155,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.dsp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.dsp index 195f1851707..85aaf9e0ef2 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.dsp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Structured_Consumer.exe" /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Discarding Structured Consumer - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Structured_Consumer.exe" /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
@@ -87,15 +87,12 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\Structured_Consumer.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\common.cpp
# End Source File
# Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -105,6 +102,10 @@ SOURCE=.\goS.cpp SOURCE=.\Notify_Structured_Push_Consumer.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\Structured_Consumer.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -151,7 +152,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -162,7 +163,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.dsp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.dsp index b8f03def30d..d5bf2069e8c 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.dsp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Structured_Supplier.exe" /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Discarding Structured Supplier - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Structured_Supplier.exe" /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
@@ -92,6 +92,7 @@ SOURCE=.\common.cpp # Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -143,7 +144,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -154,7 +155,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.dsp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.dsp index 89a0102a824..30e5f77f855 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.dsp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Structured_Consumer.exe" /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "MT_Dispatching Structured Consumer - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Structured_Consumer.exe" /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
@@ -87,11 +87,8 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\Structured_Consumer.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -101,6 +98,10 @@ SOURCE=.\goS.cpp SOURCE=.\Notify_Structured_Push_Consumer.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\Structured_Consumer.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -143,7 +144,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -154,7 +155,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.dsp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.dsp index 82546f7f1fc..c99e97bae3f 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.dsp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Structured_Supplier.exe" /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "MT_Dispatching Structured Supplier - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Structured_Supplier.exe" /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
@@ -88,6 +88,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -135,7 +136,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -146,7 +147,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.dsp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.dsp index b1e78dda9a0..6fc26aec832 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.dsp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Sequence_Consumer.exe" /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Ordering Sequence Consumer - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Sequence_Consumer.exe" /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
@@ -87,15 +87,12 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\Sequence_Consumer.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\common.cpp
# End Source File
# Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -105,6 +102,10 @@ SOURCE=.\goS.cpp SOURCE=.\Notify_Sequence_Push_Consumer.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\Sequence_Consumer.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -151,7 +152,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -162,7 +163,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.dsp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.dsp index 5ecee558018..4385011d4a3 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.dsp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Sequence_Supplier.exe" /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Ordering Sequence Supplier - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Sequence_Supplier.exe" /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
@@ -92,6 +92,7 @@ SOURCE=.\common.cpp # Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -143,7 +144,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -154,7 +155,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.dsp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.dsp index 14285f6341c..67e437d6a10 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.dsp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Structured_Consumer.exe" /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Ordering Structured Consumer - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Structured_Consumer.exe" /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
@@ -87,15 +87,12 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\Structured_Consumer.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\common.cpp
# End Source File
# Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -105,6 +102,10 @@ SOURCE=.\goS.cpp SOURCE=.\Notify_Structured_Push_Consumer.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\Structured_Consumer.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -151,7 +152,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -162,7 +163,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.dsp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.dsp index 04581c63f5c..5dac43b2179 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.dsp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Structured_Supplier.exe" /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Ordering Structured Supplier - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Structured_Supplier.exe" /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
@@ -92,6 +92,7 @@ SOURCE=.\common.cpp # Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -143,7 +144,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -154,7 +155,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.dsp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.dsp index e5ca2034a0a..058382d23d9 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.dsp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Sequence_Consumer.exe" /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Multi ETCL Filter Sequence Consumer - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Sequence_Consumer.exe" /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
@@ -87,15 +87,12 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\Sequence_Consumer.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\common.cpp
# End Source File
# Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -105,6 +102,10 @@ SOURCE=.\goS.cpp SOURCE=.\Notify_Sequence_Push_Consumer.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\Sequence_Consumer.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -151,7 +152,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -162,7 +163,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.dsp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.dsp index 0330ac8aaa3..23cfdf3c5f3 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.dsp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Sequence_Supplier.exe" /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Multi ETCL Filter Sequence Supplier - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Sequence_Supplier.exe" /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
@@ -92,6 +92,7 @@ SOURCE=.\common.cpp # Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -143,7 +144,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -154,7 +155,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.dsp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.dsp index c3761e9ecda..62321feaae5 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.dsp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Sequence_Consumer.exe" /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Multi Filter Sequence Consumer - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Sequence_Consumer.exe" /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
@@ -87,15 +87,12 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\Sequence_Consumer.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\common.cpp
# End Source File
# Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -105,6 +102,10 @@ SOURCE=.\goS.cpp SOURCE=.\Notify_Sequence_Push_Consumer.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\Sequence_Consumer.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -151,7 +152,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -162,7 +163,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.dsp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.dsp index 9134b6d88fc..646944c7ca6 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.dsp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Sequence_Supplier.exe" /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Multi Filter Sequence Supplier - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Sequence_Supplier.exe" /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
@@ -92,6 +92,7 @@ SOURCE=.\common.cpp # Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -143,7 +144,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -154,7 +155,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.dsp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.dsp index 04d1c0e0bb0..7372fb3dd65 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.dsp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.dsp @@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\controlC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Supplier.dsp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Supplier.dsp index fbd71e0df31..dab6bbf2aef 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Supplier.dsp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Supplier.dsp @@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\controlC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter_Consumer.dsp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter_Consumer.dsp index cdd1bc127ef..8754a417ad8 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter_Consumer.dsp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter_Consumer.dsp @@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\controlC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter_Supplier.dsp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter_Supplier.dsp index 8811d08df70..6b4112c044a 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter_Supplier.dsp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter_Supplier.dsp @@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\controlC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.dsp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.dsp index 5654c7cc623..fda7061df46 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.dsp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Sequence_Consumer.exe" /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Performance Filter Sequence Consumer - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\lib" /I "..\..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\lib" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Sequence_Consumer.exe" /pdbtype:sept /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
!ENDIF
@@ -87,15 +87,12 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\Sequence_Consumer.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\common.cpp
# End Source File
# Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -105,6 +102,10 @@ SOURCE=.\goS.cpp SOURCE=.\Notify_Sequence_Push_Consumer.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\Sequence_Consumer.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -151,7 +152,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -162,7 +163,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.dsp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.dsp index 5096a66be30..ac57346fc44 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.dsp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Sequence_Supplier.exe" /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Performance Filter Sequence Supplier - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\lib" /I "..\..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\lib" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Sequence_Supplier.exe" /pdbtype:sept /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
!ENDIF
@@ -92,6 +92,7 @@ SOURCE=.\common.cpp # Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -143,7 +144,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -154,7 +155,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.dsp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.dsp index 475ed433f01..de88670d573 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.dsp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Structured_Consumer.exe" /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Performance Filter Structured Consumer - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\lib" /I "..\..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\lib" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Structured_Consumer.exe" /pdbtype:sept /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
!ENDIF
@@ -87,15 +87,12 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\Structured_Consumer.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\common.cpp
# End Source File
# Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -105,6 +102,10 @@ SOURCE=.\goS.cpp SOURCE=.\Notify_Structured_Push_Consumer.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\Structured_Consumer.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -151,7 +152,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -162,7 +163,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.dsp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.dsp index a473140fd99..cb83d4e377c 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.dsp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.dsp @@ -50,7 +50,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 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 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Structured_Supplier.exe" /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTests.lib TAO_ETCL.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Performance Filter Structured Supplier - Win32 Debug"
@@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\lib" /I "..\..\..\..\\" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\lib" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,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 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 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Structured_Supplier.exe" /pdbtype:sept /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
+# ADD LINK32 TAO_NotifyTestsd.lib TAO_ETCLd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\lib" /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"
!ENDIF
@@ -92,6 +92,7 @@ SOURCE=.\common.cpp # Begin Source File
SOURCE=.\goC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -143,7 +144,7 @@ SOURCE=.\go.idl InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -154,7 +155,7 @@ InputName=go InputPath=.\go.idl
InputName=go
-"$(InputName)C.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.dsp b/TAO/orbsvcs/tests/Security/Big_Request/client.dsp index 1a76eb8d835..585c37ea4dc 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/client.dsp +++ b/TAO/orbsvcs/tests/Security/Big_Request/client.dsp @@ -94,6 +94,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\TX_ObjectC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.dsp b/TAO/orbsvcs/tests/Security/Big_Request/server.dsp index eba41a7b3db..1aaac6230c4 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/server.dsp +++ b/TAO/orbsvcs/tests/Security/Big_Request/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\TX_Object_i.cpp # Begin Source File
SOURCE=.\TX_ObjectC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.dsp b/TAO/orbsvcs/tests/Security/Callback/client.dsp index da4e4feef70..54497669893 100644 --- a/TAO/orbsvcs/tests/Security/Callback/client.dsp +++ b/TAO/orbsvcs/tests/Security/Callback/client.dsp @@ -98,6 +98,15 @@ SOURCE=.\client_i.cpp # Begin Source File
SOURCE=.\clientC.cpp
+
+!IF "$(CFG)" == "client - Win32 Release"
+
+!ELSEIF "$(CFG)" == "client - Win32 Debug"
+
+# ADD CPP /GR
+
+!ENDIF
+
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.dsp b/TAO/orbsvcs/tests/Security/Callback/server.dsp index 97beed64873..d3af3d8c61a 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server.dsp +++ b/TAO/orbsvcs/tests/Security/Callback/server.dsp @@ -90,6 +90,15 @@ LINK32=link.exe # Begin Source File
SOURCE=.\clientC.cpp
+
+!IF "$(CFG)" == "server - Win32 Release"
+
+!ELSEIF "$(CFG)" == "server - Win32 Debug"
+
+# ADD CPP /GR
+
+!ENDIF
+
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.dsp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.dsp index 45304b167cc..896ede7bdd0 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.dsp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.dsp @@ -98,6 +98,7 @@ SOURCE=.\Client_Worker.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.dsp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.dsp index a33089f1f73..8d5d45295bb 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.dsp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.dsp @@ -102,6 +102,7 @@ SOURCE=.\test_i.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.dsp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.dsp index b6b1db289d9..db9918cbf36 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.dsp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.dsp @@ -94,6 +94,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\FooC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.dsp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.dsp index ddc3dbb3698..2d38eb98859 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.dsp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.dsp @@ -94,6 +94,7 @@ SOURCE=.\Foo_i.cpp # Begin Source File
SOURCE=.\FooC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.dsp b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.dsp index 09f0f1f21b8..a89b14714bb 100644 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.dsp +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.dsp @@ -94,6 +94,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\SLevel1_TestC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/server.dsp b/TAO/orbsvcs/tests/Security/SecurityLevel1/server.dsp index eaad401dab6..514a841dc58 100644 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/server.dsp +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\SLevel1_Test_i.cpp # Begin Source File
SOURCE=.\SLevel1_TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.dsp b/TAO/orbsvcs/tests/Simple_Naming/client.dsp index 9c0e253ea70..6a6272082bc 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.dsp +++ b/TAO/orbsvcs/tests/Simple_Naming/client.dsp @@ -94,6 +94,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\test_objectC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/Trading/TradingLib.dsp b/TAO/orbsvcs/tests/Trading/TradingLib.dsp index 776512d4b34..0ad9ff0730a 100644 --- a/TAO/orbsvcs/tests/Trading/TradingLib.dsp +++ b/TAO/orbsvcs/tests/Trading/TradingLib.dsp @@ -104,6 +104,7 @@ SOURCE=.\TT_Info.cpp # Begin Source File
SOURCE=.\TTestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/tests/tests.dsw b/TAO/orbsvcs/tests/tests.dsw index c32cc27c3c9..6f61a04f7d2 100644 --- a/TAO/orbsvcs/tests/tests.dsw +++ b/TAO/orbsvcs/tests/tests.dsw @@ -126,18 +126,6 @@ Package=<4> ###############################################################################
-Project: "EC_Basic"=.\EC_Basic\EC_Basic.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
Project: "EC_Mcast"=.\EC_Mcast\EC_Mcast.dsp - Package Owner=<4>
Package=<5>
@@ -162,18 +150,6 @@ Package=<4> ###############################################################################
-Project: "Event_Latency"=.\Event_Latency\Event_Latency.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
Project: "Export_Test"=.\Trading\Export_Test.dsp - Package Owner=<4>
Package=<5>
@@ -185,6 +161,9 @@ Package=<4> Begin Project Dependency
Project_Dep_Name TradingLib
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name Trading Test Library
+ End Project Dependency
}}}
###############################################################################
@@ -200,6 +179,9 @@ Package=<4> Begin Project Dependency
Project_Dep_Name TradingLib
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name Trading Test Library
+ End Project Dependency
}}}
###############################################################################
@@ -216,30 +198,6 @@ Package=<4> ###############################################################################
-Project: "LoadBalancing client"=.\LoadBalancing\client.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "LoadBalancing server"=.\LoadBalancing\server.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
Project: "Nestea Client"=.\ImplRepo\nestea_client.dsp - Package Owner=<4>
Package=<5>
@@ -360,42 +318,6 @@ Package=<4> ###############################################################################
-Project: "av_benchmark_child"=.\AVStreams\benchmark\av_benchmark_child.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "av_benchmark_client"=.\AVStreams\benchmark\av_benchmark_client.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "av_benchmark_server"=.\AVStreams\benchmark\av_benchmark_server.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
Project: "imr_ns_test"=.\ImplRepo\NameService\test.dsp - Package Owner=<4>
Package=<5>
diff --git a/TAO/performance-tests/Callback/client.dsp b/TAO/performance-tests/Callback/client.dsp index f8d03e835a3..fda2d2497fc 100644 --- a/TAO/performance-tests/Callback/client.dsp +++ b/TAO/performance-tests/Callback/client.dsp @@ -94,6 +94,7 @@ SOURCE=.\Callback_i.cpp # Begin Source File
SOURCE=.\callbackC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Callback/server.dsp b/TAO/performance-tests/Callback/server.dsp index 1e2c89aadf1..06a3e9b6880 100644 --- a/TAO/performance-tests/Callback/server.dsp +++ b/TAO/performance-tests/Callback/server.dsp @@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\callbackC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp index 31f738de885..2c957952e06 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp @@ -152,6 +152,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=..\IDL_Cubit\cubitC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp index 99edc4177c7..647fcd33047 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp @@ -156,6 +156,7 @@ SOURCE=.\Cubit_Client.cpp # Begin Source File
SOURCE=.\cubitC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp index 7857170270b..b40eae27895 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp @@ -108,6 +108,7 @@ SOURCE=.\Cubit_Server.cpp # Begin Source File
SOURCE=.\cubitC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp index 85d13f91001..02e9079689b 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp @@ -156,6 +156,7 @@ SOURCE=.\Cubit_Server.cpp # Begin Source File
SOURCE=.\cubitC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp index b10a1fc8e8f..c4888eec429 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp @@ -161,6 +161,7 @@ SOURCE=.\Cubit_Task.cpp # Begin Source File
SOURCE=.\cubitC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp index 6c78095bf21..32ae070a051 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp @@ -157,6 +157,7 @@ SOURCE=.\Cubit_Task.cpp # Begin Source File
SOURCE=.\cubitC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Latency/AMH/Single_Threaded/client.dsp b/TAO/performance-tests/Latency/AMH/Single_Threaded/client.dsp index 679e451046c..49e1afa9511 100644 --- a/TAO/performance-tests/Latency/AMH/Single_Threaded/client.dsp +++ b/TAO/performance-tests/Latency/AMH/Single_Threaded/client.dsp @@ -94,6 +94,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/performance-tests/Latency/AMH/Single_Threaded/server.dsp b/TAO/performance-tests/Latency/AMH/Single_Threaded/server.dsp index dd95b39f2c0..80f798be8f9 100644 --- a/TAO/performance-tests/Latency/AMH/Single_Threaded/server.dsp +++ b/TAO/performance-tests/Latency/AMH/Single_Threaded/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Latency/AMI/client.dsp b/TAO/performance-tests/Latency/AMI/client.dsp index aa21636a048..5c516580c53 100644 --- a/TAO/performance-tests/Latency/AMI/client.dsp +++ b/TAO/performance-tests/Latency/AMI/client.dsp @@ -98,6 +98,7 @@ SOURCE=.\Roundtrip_Handler.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Latency/AMI/server.dsp b/TAO/performance-tests/Latency/AMI/server.dsp index ff4865ee45b..8c64a68ec48 100644 --- a/TAO/performance-tests/Latency/AMI/server.dsp +++ b/TAO/performance-tests/Latency/AMI/server.dsp @@ -102,6 +102,7 @@ SOURCE=.\Server_Task.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Latency/DII/client.dsp b/TAO/performance-tests/Latency/DII/client.dsp index 7d214195709..2c6be78524e 100644 --- a/TAO/performance-tests/Latency/DII/client.dsp +++ b/TAO/performance-tests/Latency/DII/client.dsp @@ -94,6 +94,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/performance-tests/Latency/DII/server.dsp b/TAO/performance-tests/Latency/DII/server.dsp index 90a520523ab..315c311da60 100644 --- a/TAO/performance-tests/Latency/DII/server.dsp +++ b/TAO/performance-tests/Latency/DII/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Latency/DSI/client.dsp b/TAO/performance-tests/Latency/DSI/client.dsp index 1e44887c489..88fe5936ca1 100644 --- a/TAO/performance-tests/Latency/DSI/client.dsp +++ b/TAO/performance-tests/Latency/DSI/client.dsp @@ -94,6 +94,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/performance-tests/Latency/DSI/server.dsp b/TAO/performance-tests/Latency/DSI/server.dsp index 38e14b13c33..10b36771c9c 100644 --- a/TAO/performance-tests/Latency/DSI/server.dsp +++ b/TAO/performance-tests/Latency/DSI/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Latency/Deferred/client.dsp b/TAO/performance-tests/Latency/Deferred/client.dsp index be402067afa..b25e9d2cc1b 100644 --- a/TAO/performance-tests/Latency/Deferred/client.dsp +++ b/TAO/performance-tests/Latency/Deferred/client.dsp @@ -94,6 +94,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/performance-tests/Latency/Deferred/server.dsp b/TAO/performance-tests/Latency/Deferred/server.dsp index 12c83f8a4b1..a299fbab84b 100644 --- a/TAO/performance-tests/Latency/Deferred/server.dsp +++ b/TAO/performance-tests/Latency/Deferred/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Latency/Single_Threaded/client.dsp b/TAO/performance-tests/Latency/Single_Threaded/client.dsp index 53e21e0f86d..03c71ea7811 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/client.dsp +++ b/TAO/performance-tests/Latency/Single_Threaded/client.dsp @@ -94,6 +94,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/performance-tests/Latency/Single_Threaded/server.dsp b/TAO/performance-tests/Latency/Single_Threaded/server.dsp index 8b266cee236..16bf73b8898 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/server.dsp +++ b/TAO/performance-tests/Latency/Single_Threaded/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/client.dsp b/TAO/performance-tests/Latency/Thread_Per_Connection/client.dsp index eccb5db62d6..bc177b46ff8 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/client.dsp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/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/performance-tests/Latency/Thread_Per_Connection/server.dsp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.dsp index f65aa8cf43b..1bc4d9e1e77 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.dsp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Latency/Thread_Pool/client.dsp b/TAO/performance-tests/Latency/Thread_Pool/client.dsp index 4f074a4e1e2..29b57c82c49 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/client.dsp +++ b/TAO/performance-tests/Latency/Thread_Pool/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -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/performance-tests/Latency/Thread_Pool/server.dsp b/TAO/performance-tests/Latency/Thread_Pool/server.dsp index 79ee4cecca5..9ef0cfb289e 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/server.dsp +++ b/TAO/performance-tests/Latency/Thread_Pool/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/POA/Implicit_Activation/client.dsp b/TAO/performance-tests/POA/Implicit_Activation/client.dsp index 6f4b29a01f8..2f1b7d20d39 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/client.dsp +++ b/TAO/performance-tests/POA/Implicit_Activation/client.dsp @@ -94,6 +94,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/performance-tests/POA/Implicit_Activation/collocated.dsp b/TAO/performance-tests/POA/Implicit_Activation/collocated.dsp index da2f127bdc6..2c48d2b017d 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/collocated.dsp +++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.dsp @@ -98,6 +98,7 @@ SOURCE=.\Simple.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/POA/Implicit_Activation/server.dsp b/TAO/performance-tests/POA/Implicit_Activation/server.dsp index bfb4397f33b..82170657899 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/server.dsp +++ b/TAO/performance-tests/POA/Implicit_Activation/server.dsp @@ -102,6 +102,7 @@ SOURCE=.\Simple.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.dsp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.dsp index 42bf50c5ff3..7a2d94848b4 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.dsp +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.dsp @@ -94,6 +94,7 @@ SOURCE=.\registration.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Pluggable/client.dsp b/TAO/performance-tests/Pluggable/client.dsp index 349f1af08ed..874a4c56f4d 100644 --- a/TAO/performance-tests/Pluggable/client.dsp +++ b/TAO/performance-tests/Pluggable/client.dsp @@ -98,6 +98,7 @@ SOURCE=.\PP_Test_Client.cpp # Begin Source File
SOURCE=.\PP_TestC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/performance-tests/Pluggable/server.dsp b/TAO/performance-tests/Pluggable/server.dsp index 5efad4a7427..adca7d2a4bc 100644 --- a/TAO/performance-tests/Pluggable/server.dsp +++ b/TAO/performance-tests/Pluggable/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\PP_Test_Server.cpp # Begin Source File
SOURCE=.\PP_TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/RTCORBA_Common.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/RTCORBA_Common.dsp index aa23051cad6..887576a07f9 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/RTCORBA_Common.dsp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/RTCORBA_Common.dsp @@ -97,35 +97,15 @@ LINK32=link.exe # Begin Source File
SOURCE=.\test_i.cpp
-
-!IF "$(CFG)" == "RTCORBA Test Common DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "RTCORBA Test Common DLL - Win32 Debug"
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\testC.cpp
-
-!IF "$(CFG)" == "RTCORBA Test Common DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "RTCORBA Test Common DLL - Win32 Debug"
-
-!ENDIF
-
+# ADD CPP /GR
# End Source File
# Begin Source File
SOURCE=.\testS.cpp
-
-!IF "$(CFG)" == "RTCORBA Test Common DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "RTCORBA Test Common DLL - Win32 Debug"
-
-!ENDIF
-
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.dsp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.dsp index 333283b4568..4e8fb7868da 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.dsp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.dsp @@ -94,6 +94,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/performance-tests/RTCorba/Oneways/Reliable/server.dsp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.dsp index c3a13855fca..f92166ea941 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.dsp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/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/performance-tests/RTCorba/Thread_Pool/client.dsp b/TAO/performance-tests/RTCorba/Thread_Pool/client.dsp index faad9b1e086..77bd081298f 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/client.dsp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.dsp @@ -94,6 +94,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/performance-tests/RTCorba/Thread_Pool/server.dsp b/TAO/performance-tests/RTCorba/Thread_Pool/server.dsp index c4a9b3da779..de9af6375cf 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/server.dsp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.dsp @@ -94,6 +94,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/performance-tests/Throughput/client.dsp b/TAO/performance-tests/Throughput/client.dsp index 6cb8f603c92..5fbe492e28a 100644 --- a/TAO/performance-tests/Throughput/client.dsp +++ b/TAO/performance-tests/Throughput/client.dsp @@ -94,6 +94,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/performance-tests/Throughput/server.dsp b/TAO/performance-tests/Throughput/server.dsp index f7d33637a04..533dae8bb32 100644 --- a/TAO/performance-tests/Throughput/server.dsp +++ b/TAO/performance-tests/Throughput/server.dsp @@ -102,6 +102,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tao/Any_T.cpp b/TAO/tao/Any_T.cpp index cd6ed922252..e32a352c20f 100644 --- a/TAO/tao/Any_T.cpp +++ b/TAO/tao/Any_T.cpp @@ -84,8 +84,14 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement); - TAO_InputCDR cdr (impl->_tao_get_cdr (), - impl->_tao_byte_order ()); + ACE_Message_Block *mb = impl->_tao_get_cdr (); + TAO_InputCDR cdr (mb->data_block (), + ACE_Message_Block::DONT_DELETE, + mb->rd_ptr () - mb->base (), + mb->wr_ptr () - mb->base (), + impl->_tao_byte_order (), + TAO_DEF_GIOP_MAJOR, + TAO_DEF_GIOP_MINOR); CORBA::Boolean result = replacement->demarshal_value (cdr); @@ -167,8 +173,13 @@ TAO::Any_Impl_T<T>::widen (const CORBA::Any & any, auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement); - TAO_InputCDR cdr (impl->_tao_get_cdr (), - impl->_tao_byte_order ()); + TAO_InputCDR cdr (mb->data_block (), + ACE_Message_Block::DONT_DELETE, + mb->rd_ptr () - mb->base (), + mb->wr_ptr () - mb->base (), + impl->_tao_byte_order (), + TAO_DEF_GIOP_MAJOR, + TAO_DEF_GIOP_MINOR); CORBA::Boolean result = replacement->demarshal_value (cdr); @@ -261,7 +272,8 @@ TAO::Any_Array_Impl_T<T, T_forany>::extract (const CORBA::Any & any, if (narrow_impl != 0) { - _tao_elem = (const T *&) narrow_impl->value_; + _tao_elem = ACE_const_cast (const T *&, + narrow_impl->value_); return 1; } @@ -277,14 +289,21 @@ TAO::Any_Array_Impl_T<T, T_forany>::extract (const CORBA::Any & any, replacement ); - TAO_InputCDR cdr (impl->_tao_get_cdr (), - impl->_tao_byte_order ()); + ACE_Message_Block *mb = impl->_tao_get_cdr (); + TAO_InputCDR cdr (mb->data_block (), + ACE_Message_Block::DONT_DELETE, + mb->rd_ptr () - mb->base (), + mb->wr_ptr () - mb->base (), + impl->_tao_byte_order (), + TAO_DEF_GIOP_MAJOR, + TAO_DEF_GIOP_MINOR); CORBA::Boolean result = replacement->demarshal_value (cdr); if (result == 1) { - _tao_elem = (const T *&) replacement->value_; + _tao_elem = ACE_const_cast (const T *&, + replacement->value_); ACE_const_cast (CORBA::Any &, any).replace (replacement); replacement_safety.release (); return result; @@ -438,8 +457,14 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, replacement ); - TAO_InputCDR cdr (impl->_tao_get_cdr (), - impl->_tao_byte_order ()); + ACE_Message_Block *mb = impl->_tao_get_cdr (); + TAO_InputCDR cdr (mb->data_block (), + ACE_Message_Block::DONT_DELETE, + mb->rd_ptr () - mb->base (), + mb->wr_ptr () - mb->base (), + impl->_tao_byte_order (), + TAO_DEF_GIOP_MAJOR, + TAO_DEF_GIOP_MINOR); CORBA::Boolean result = replacement->demarshal_value (cdr); @@ -535,8 +560,14 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, auto_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement); - TAO_InputCDR cdr (impl->_tao_get_cdr (), - impl->_tao_byte_order ()); + ACE_Message_Block *mb = impl->_tao_get_cdr (); + TAO_InputCDR cdr (mb->data_block (), + ACE_Message_Block::DONT_DELETE, + mb->rd_ptr () - mb->base (), + mb->wr_ptr () - mb->base (), + impl->_tao_byte_order (), + TAO_DEF_GIOP_MAJOR, + TAO_DEF_GIOP_MINOR); CORBA::Boolean result = replacement->demarshal_value (cdr); @@ -643,8 +674,14 @@ TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::extract ( auto_ptr<UNSIGNED_CHAR_ANY_IMPL> replacement_safety (replacement); - TAO_InputCDR cdr (impl->_tao_get_cdr (), - impl->_tao_byte_order ()); + ACE_Message_Block *mb = impl->_tao_get_cdr (); + TAO_InputCDR cdr (mb->data_block (), + ACE_Message_Block::DONT_DELETE, + mb->rd_ptr () - mb->base (), + mb->wr_ptr () - mb->base (), + impl->_tao_byte_order (), + TAO_DEF_GIOP_MAJOR, + TAO_DEF_GIOP_MINOR); CORBA::Boolean result = replacement->demarshal_value (cdr); diff --git a/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.dsp b/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.dsp index 050915682ce..2d9a4126c85 100644 --- a/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.dsp +++ b/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.dsp @@ -177,6 +177,7 @@ SOURCE=.\BiDirPolicy_Validator.cpp # Begin Source File
SOURCE=.\BiDirPolicyC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/tao/DynamicAny/TAO_DynamicAny.dsp b/TAO/tao/DynamicAny/TAO_DynamicAny.dsp index f262c8125d2..8ca6443aad9 100644 --- a/TAO/tao/DynamicAny/TAO_DynamicAny.dsp +++ b/TAO/tao/DynamicAny/TAO_DynamicAny.dsp @@ -161,6 +161,7 @@ SOURCE=.\DynamicAny.cpp # Begin Source File
SOURCE=.\DynamicAnyC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tao/IFR_Client/TAO_IFR_Client.dsp b/TAO/tao/IFR_Client/TAO_IFR_Client.dsp index b8d6ddfdf9c..af095ac548c 100644 --- a/TAO/tao/IFR_Client/TAO_IFR_Client.dsp +++ b/TAO/tao/IFR_Client/TAO_IFR_Client.dsp @@ -45,7 +45,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IFR_BASIC_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IFR_BASIC_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -100,7 +100,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -128,7 +128,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -155,10 +155,12 @@ LINK32=link.exe # Begin Source File
SOURCE=.\IFR_BaseC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
SOURCE=.\IFR_BasicC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -167,10 +169,12 @@ SOURCE=.\IFR_Client_Adapter_Impl.cpp # Begin Source File
SOURCE=.\IFR_ComponentsC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
SOURCE=.\IFR_ExtendedC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/tao/IORManipulation/TAO_IORManip.dsp b/TAO/tao/IORManipulation/TAO_IORManip.dsp index b01faeb2291..95d076d7e45 100644 --- a/TAO/tao/IORManipulation/TAO_IORManip.dsp +++ b/TAO/tao/IORManipulation/TAO_IORManip.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IORManip_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_IORMANIP_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_IORMANIP_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
diff --git a/TAO/tao/IORTable/TAO_IORTable.dsp b/TAO/tao/IORTable/TAO_IORTable.dsp index 2f0b6cd6364..660117c83a5 100644 --- a/TAO/tao/IORTable/TAO_IORTable.dsp +++ b/TAO/tao/IORTable/TAO_IORTable.dsp @@ -165,6 +165,7 @@ SOURCE=.\IORTable.cpp # Begin Source File
SOURCE=.\IORTableC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tao/Messaging/TAO_Messaging.dsp b/TAO/tao/Messaging/TAO_Messaging.dsp index 99750b75010..2c17893d794 100644 --- a/TAO/tao/Messaging/TAO_Messaging.dsp +++ b/TAO/tao/Messaging/TAO_Messaging.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Messaging_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_MESSAGING_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_MESSAGING_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -177,6 +177,7 @@ SOURCE=.\Messaging.cpp # Begin Source File
SOURCE=.\Messaging_No_ImplC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -193,14 +194,17 @@ SOURCE=.\Messaging_PolicyFactory.cpp # Begin Source File
SOURCE=.\Messaging_RT_PolicyC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
SOURCE=.\Messaging_SyncScope_PolicyC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
SOURCE=.\MessagingC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -209,6 +213,7 @@ SOURCE=.\MessagingS.cpp # Begin Source File
SOURCE=.\TAO_ExtC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tao/PortableServer/TAO_PortableServer.dsp b/TAO/tao/PortableServer/TAO_PortableServer.dsp index 71c8aee9be5..69e7663634e 100644 --- a/TAO/tao/PortableServer/TAO_PortableServer.dsp +++ b/TAO/tao/PortableServer/TAO_PortableServer.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PortableServer_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_PORTABLESERVER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_PORTABLESERVER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -206,6 +206,7 @@ SOURCE=.\ImplRepo_i.cpp # Begin Source File
SOURCE=.\ImplRepoC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -214,6 +215,7 @@ SOURCE=.\ImplRepoS.cpp # Begin Source File
SOURCE=.\ImR_ActivatorC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -222,6 +224,7 @@ SOURCE=.\ImR_ActivatorS.cpp # Begin Source File
SOURCE=.\ImR_LocatorC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tao/RTCORBA/TAO_RTCORBA.dsp b/TAO/tao/RTCORBA/TAO_RTCORBA.dsp index bddc3977608..74a0217c5b7 100644 --- a/TAO/tao/RTCORBA/TAO_RTCORBA.dsp +++ b/TAO/tao/RTCORBA/TAO_RTCORBA.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RTCORBA_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_RTCORBA_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_RTCORBA_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -253,6 +253,7 @@ SOURCE=.\RTCORBA.cpp # Begin Source File
SOURCE=.\RTCORBAC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp b/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp index 8ba0f2611a4..39021186d99 100644 --- a/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp +++ b/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp @@ -73,7 +73,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RTPortableServer_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_RTPORTABLESERVER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_RTPORTABLESERVER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -186,6 +186,7 @@ SOURCE=.\RTPortableServer.cpp # Begin Source File
SOURCE=.\RTPortableServerC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.i b/TAO/tao/Strategies/SHMIOP_Profile.i index 81c3adbedb7..df1b431c57f 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.i +++ b/TAO/tao/Strategies/SHMIOP_Profile.i @@ -10,7 +10,7 @@ TAO_SHMIOP_Profile::object_key (void) const ACE_INLINE TAO::ObjectKey * TAO_SHMIOP_Profile::_key (void) const { - TAO_ObjeTAO::ObjectKeyctKey *key = 0; + TAO::ObjectKey *key = 0; ACE_NEW_RETURN (key, TAO::ObjectKey (this->object_key_), diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp index cab6db6dde2..e0860484574 100644 --- a/TAO/tao/TAO.dsp +++ b/TAO/tao/TAO.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../../" /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../../" /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /Zi /O2 /I "../../" /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -78,7 +78,7 @@ LINK32=link.exe # PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../../" /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../../" /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /Gy /I "../../" /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -105,7 +105,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "../../" /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /Zi /O2 /I "../../" /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -133,7 +133,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "../../" /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /Gy /I "../../" /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -180,6 +180,7 @@ SOURCE=.\Adapter.cpp # Begin Source File
SOURCE=.\Any.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -220,6 +221,7 @@ SOURCE=.\Blocked_Connect_Strategy.cpp # Begin Source File
SOURCE=.\BoundsC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -288,6 +290,19 @@ SOURCE=.\Connector_Registry.cpp # Begin Source File
SOURCE=.\CONV_FRAMEC.cpp
+
+!IF "$(CFG)" == "TAO DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
+
+# ADD CPP /GR
+
+!ENDIF
+
# End Source File
# Begin Source File
@@ -308,6 +323,7 @@ SOURCE=.\CORBANAME_Parser.cpp # Begin Source File
SOURCE=.\CurrentC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -356,6 +372,7 @@ SOURCE=.\DLL_Parser.cpp # Begin Source File
SOURCE=.\DomainC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -364,6 +381,7 @@ SOURCE=.\Dynamic_Adapter.cpp # Begin Source File
SOURCE=.\DynamicC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -384,6 +402,7 @@ SOURCE=.\Environment.cpp # Begin Source File
SOURCE=.\Exception.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -448,6 +467,7 @@ SOURCE=.\GIOP_Utils.cpp # Begin Source File
SOURCE=.\GIOPC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -492,6 +512,7 @@ SOURCE=.\IIOP_Transport.cpp # Begin Source File
SOURCE=.\IIOPC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -512,6 +533,7 @@ SOURCE=.\Invocation_Endpoint_Selectors.cpp # Begin Source File
SOURCE=.\IOPC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -592,6 +614,7 @@ SOURCE=.\MCAST_Parser.cpp # Begin Source File
SOURCE=.\Messaging_PolicyValueC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -644,10 +667,12 @@ SOURCE=.\ObjectIdListC.cpp # Begin Source File
SOURCE=.\ObjectReferenceTemplateC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
SOURCE=.\OctetSeqC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -700,6 +725,7 @@ SOURCE=.\Pluggable_Messaging_Utils.cpp # Begin Source File
SOURCE=.\Policy_ForwardC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -716,6 +742,7 @@ SOURCE=.\Policy_Validator.cpp # Begin Source File
SOURCE=.\PolicyC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -728,6 +755,7 @@ SOURCE=.\PollableC.cpp # Begin Source File
SOURCE=.\PortableInterceptorC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -808,6 +836,7 @@ SOURCE=.\Services_Activate.cpp # Begin Source File
SOURCE=.\ServicesC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -816,6 +845,7 @@ SOURCE=.\skip.cpp # Begin Source File
SOURCE=.\StringSeqC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -864,6 +894,7 @@ SOURCE=.\TAO_Singleton_Manager.cpp # Begin Source File
SOURCE=.\TAOC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -880,6 +911,7 @@ SOURCE=.\Thread_Lane_Resources_Manager.cpp # Begin Source File
SOURCE=.\TimeBaseC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -952,6 +984,7 @@ SOURCE=.\Wait_Strategy.cpp # Begin Source File
SOURCE=.\WrongTransactionC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.dsp b/TAO/tao/TypeCodeFactory/TypeCodeFactory.dsp index c258159da11..0766ad74f8f 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.dsp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.dsp @@ -45,7 +45,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TYPECODEFACTORY_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_TYPECODEFACTORY_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /Zi /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_TYPECODEFACTORY_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TYPECODEFACTORY_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\.." /I "..\..\.." /D TAO_TYPECODEFACTORY_HAS_DLL=1 /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\.." /I "..\..\.." /D TAO_TYPECODEFACTORY_HAS_DLL=1 /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -100,7 +100,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\.." /D TAO_TYPECODEFACTORY_HAS_DLL=1 /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\.." /I "..\..\.." /D TAO_TYPECODEFACTORY_HAS_DLL=1 /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\.." /I "..\..\.." /D TAO_TYPECODEFACTORY_HAS_DLL=1 /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -128,7 +128,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_TYPECODEFACTORY_BUILD_DLL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /Zi /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -167,6 +167,7 @@ SOURCE=.\TypeCodeFactory_Loader.cpp # Begin Source File
SOURCE=.\TypeCodeFactoryC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/tests/AMI/AMI_Test_Client.dsp b/TAO/tests/AMI/AMI_Test_Client.dsp index 1ab1fcf08d0..25f4f4c0a24 100644 --- a/TAO/tests/AMI/AMI_Test_Client.dsp +++ b/TAO/tests/AMI/AMI_Test_Client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\ami_testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/AMI/AMI_Test_Simple_Client.dsp b/TAO/tests/AMI/AMI_Test_Simple_Client.dsp index 9bf946c04a6..795b4f3641d 100644 --- a/TAO/tests/AMI/AMI_Test_Simple_Client.dsp +++ b/TAO/tests/AMI/AMI_Test_Simple_Client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\ami_testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/AMI_Buffering/admin.dsp b/TAO/tests/AMI_Buffering/admin.dsp index 559b5dad9d7..15ee20ae67a 100644 --- a/TAO/tests/AMI_Buffering/admin.dsp +++ b/TAO/tests/AMI_Buffering/admin.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -98,6 +98,15 @@ SOURCE=.\AMI_Buffering_Admin.cpp # Begin Source File
SOURCE=.\TestC.cpp
+
+!IF "$(CFG)" == "AMI_Buffering Admin - Win32 Release"
+
+!ELSEIF "$(CFG)" == "AMI_Buffering Admin - Win32 Debug"
+
+# ADD CPP /GR
+
+!ENDIF
+
# End Source File
# Begin Source File
diff --git a/TAO/tests/AMI_Buffering/client.dsp b/TAO/tests/AMI_Buffering/client.dsp index 6bd36a7f36e..a102c67b1bb 100644 --- a/TAO/tests/AMI_Buffering/client.dsp +++ b/TAO/tests/AMI_Buffering/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -102,6 +102,7 @@ SOURCE=.\Reply_Handler.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/AMI_Buffering/server.dsp b/TAO/tests/AMI_Buffering/server.dsp index c984b194e99..a6a0c7d137b 100644 --- a/TAO/tests/AMI_Buffering/server.dsp +++ b/TAO/tests/AMI_Buffering/server.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -98,6 +98,15 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+
+!IF "$(CFG)" == "AMI_Buffering Server - Win32 Release"
+
+!ELSEIF "$(CFG)" == "AMI_Buffering Server - Win32 Debug"
+
+# ADD CPP /GR
+
+!ENDIF
+
# End Source File
# Begin Source File
diff --git a/TAO/tests/AMI_Timeouts/client.dsp b/TAO/tests/AMI_Timeouts/client.dsp index 0b74f6f4baf..f51d8b90304 100644 --- a/TAO/tests/AMI_Timeouts/client.dsp +++ b/TAO/tests/AMI_Timeouts/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -102,6 +102,7 @@ SOURCE=.\timeout_i.cpp # Begin Source File
SOURCE=.\timeoutC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/AMI_Timeouts/server.dsp b/TAO/tests/AMI_Timeouts/server.dsp index 13dd3934f2b..3bd110c9bcb 100644 --- a/TAO/tests/AMI_Timeouts/server.dsp +++ b/TAO/tests/AMI_Timeouts/server.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -102,6 +102,15 @@ SOURCE=.\timeout_i.cpp # Begin Source File
SOURCE=.\timeoutC.cpp
+
+!IF "$(CFG)" == "AMI Timeout Server - Win32 Release"
+
+!ELSEIF "$(CFG)" == "AMI Timeout Server - Win32 Debug"
+
+# ADD CPP /GR
+
+!ENDIF
+
# End Source File
# Begin Source File
diff --git a/TAO/tests/BiDirectional/client.dsp b/TAO/tests/BiDirectional/client.dsp index 0259223e000..431f7e80e5a 100644 --- a/TAO/tests/BiDirectional/client.dsp +++ b/TAO/tests/BiDirectional/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -100,6 +100,7 @@ SOURCE=.\test_i.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/BiDirectional/server.dsp b/TAO/tests/BiDirectional/server.dsp index a61d3072ef8..74ab4e22c91 100644 --- a/TAO/tests/BiDirectional/server.dsp +++ b/TAO/tests/BiDirectional/server.dsp @@ -100,6 +100,15 @@ SOURCE=.\test_i.cpp # Begin Source File
SOURCE=.\testC.cpp
+
+!IF "$(CFG)" == "BiDir Server - Win32 Release"
+
+!ELSEIF "$(CFG)" == "BiDir Server - Win32 Debug"
+
+# ADD CPP /GR
+
+!ENDIF
+
# End Source File
# Begin Source File
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.dsp b/TAO/tests/BiDirectional_NestedUpcall/client.dsp index b83692fb5a6..94ef6cd5498 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/client.dsp +++ b/TAO/tests/BiDirectional_NestedUpcall/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -99,6 +99,7 @@ SOURCE=.\test_i.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.dsp b/TAO/tests/BiDirectional_NestedUpcall/server.dsp index a42da2daf9f..11dec8bbdfb 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/server.dsp +++ b/TAO/tests/BiDirectional_NestedUpcall/server.dsp @@ -99,6 +99,7 @@ SOURCE=.\test_i.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Big_Oneways/client.dsp b/TAO/tests/Big_Oneways/client.dsp index 46f4d73be04..5814617f8fe 100644 --- a/TAO/tests/Big_Oneways/client.dsp +++ b/TAO/tests/Big_Oneways/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -106,6 +106,7 @@ SOURCE=.\Session_Task.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Big_Oneways/server.dsp b/TAO/tests/Big_Oneways/server.dsp index 5c8ad88f157..c8c0ded053b 100644 --- a/TAO/tests/Big_Oneways/server.dsp +++ b/TAO/tests/Big_Oneways/server.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -102,6 +102,7 @@ SOURCE=.\Session_Control.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Big_Reply/client.dsp b/TAO/tests/Big_Reply/client.dsp index 9eb4b97b736..f4c9e7354a4 100644 --- a/TAO/tests/Big_Reply/client.dsp +++ b/TAO/tests/Big_Reply/client.dsp @@ -7,19 +7,19 @@ CFG=Big_Reply Client - 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
!MESSAGE NMAKE /f "client.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "client.mak" CFG="Big_Reply Client - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "Big_Reply Client - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "Big_Reply Client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -78,7 +78,7 @@ 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 /debug /machine:I386 /pdbtype:sept
# ADD LINK32 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"
-!ENDIF
+!ENDIF
# Begin Target
@@ -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"
@@ -118,7 +119,7 @@ SOURCE=.\Test.idl !IF "$(CFG)" == "Big_Reply Client - Win32 Release"
# PROP Ignore_Default_Tool 1
-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\Test.idl
InputName=Test
@@ -156,7 +157,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Big_Reply Client - Win32 Debug"
-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\Test.idl
InputName=Test
@@ -192,7 +193,7 @@ BuildCmds= \ $(BuildCmds)
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
diff --git a/TAO/tests/Big_Reply/server.dsp b/TAO/tests/Big_Reply/server.dsp index d5dbbea4883..fe517fb7205 100644 --- a/TAO/tests/Big_Reply/server.dsp +++ b/TAO/tests/Big_Reply/server.dsp @@ -7,19 +7,19 @@ CFG=Big_Reply Server - 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
!MESSAGE NMAKE /f "server.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "server.mak" CFG="Big_Reply Server - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "Big_Reply Server - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "Big_Reply Server - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -78,7 +78,7 @@ 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 /debug /machine:I386 /pdbtype:sept
# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
-!ENDIF
+!ENDIF
# Begin Target
@@ -98,6 +98,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -122,7 +123,7 @@ SOURCE=.\Test.idl !IF "$(CFG)" == "Big_Reply Server - Win32 Release"
# PROP Ignore_Default_Tool 1
-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\Test.idl
InputName=Test
@@ -160,7 +161,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Big_Reply Server - Win32 Debug"
-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\Test.idl
InputName=Test
@@ -196,7 +197,7 @@ BuildCmds= \ $(BuildCmds)
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
diff --git a/TAO/tests/Big_Request_Muxing/client.dsp b/TAO/tests/Big_Request_Muxing/client.dsp index 698f07246aa..ae16669b67f 100644 --- a/TAO/tests/Big_Request_Muxing/client.dsp +++ b/TAO/tests/Big_Request_Muxing/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -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/tests/Big_Request_Muxing/server.dsp b/TAO/tests/Big_Request_Muxing/server.dsp index fd0d5be7f2b..49fdd3b6277 100644 --- a/TAO/tests/Big_Request_Muxing/server.dsp +++ b/TAO/tests/Big_Request_Muxing/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Big_Twoways/client.dsp b/TAO/tests/Big_Twoways/client.dsp index 4817d559d6b..7c395632ecc 100644 --- a/TAO/tests/Big_Twoways/client.dsp +++ b/TAO/tests/Big_Twoways/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -106,6 +106,7 @@ SOURCE=.\Session_Task.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Big_Twoways/server.dsp b/TAO/tests/Big_Twoways/server.dsp index c3ae4852ae3..603f98c0f3d 100644 --- a/TAO/tests/Big_Twoways/server.dsp +++ b/TAO/tests/Big_Twoways/server.dsp @@ -102,6 +102,7 @@ SOURCE=.\Session_Control.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Blocking_Sync_None/client.dsp b/TAO/tests/Blocking_Sync_None/client.dsp index a949c006a1c..ec213a2bb4a 100644 --- a/TAO/tests/Blocking_Sync_None/client.dsp +++ b/TAO/tests/Blocking_Sync_None/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -94,6 +94,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/tests/Blocking_Sync_None/server.dsp b/TAO/tests/Blocking_Sync_None/server.dsp index 2cfbaa39fb6..03e4fb7078b 100644 --- a/TAO/tests/Blocking_Sync_None/server.dsp +++ b/TAO/tests/Blocking_Sync_None/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Cache_Growth_Test/client.dsp b/TAO/tests/Cache_Growth_Test/client.dsp index ca7a9298548..7bc1510499c 100644 --- a/TAO/tests/Cache_Growth_Test/client.dsp +++ b/TAO/tests/Cache_Growth_Test/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -94,6 +94,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/tests/Cache_Growth_Test/server.dsp b/TAO/tests/Cache_Growth_Test/server.dsp index 968230d6d23..188a85e794f 100644 --- a/TAO/tests/Cache_Growth_Test/server.dsp +++ b/TAO/tests/Cache_Growth_Test/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Client_Leaks/child.dsp b/TAO/tests/Client_Leaks/child.dsp index 86fdcb9d9f8..e601b918ff8 100644 --- a/TAO/tests/Client_Leaks/child.dsp +++ b/TAO/tests/Client_Leaks/child.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -98,6 +98,7 @@ SOURCE=.\Process.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Client_Leaks/client.dsp b/TAO/tests/Client_Leaks/client.dsp index f415fc78034..6988821d2e5 100644 --- a/TAO/tests/Client_Leaks/client.dsp +++ b/TAO/tests/Client_Leaks/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -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/tests/Client_Leaks/server.dsp b/TAO/tests/Client_Leaks/server.dsp index 8da84a59082..16541ec4318 100644 --- a/TAO/tests/Client_Leaks/server.dsp +++ b/TAO/tests/Client_Leaks/server.dsp @@ -106,6 +106,7 @@ SOURCE=.\Startup_Callback.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Codec/client.dsp b/TAO/tests/Codec/client.dsp index 13780b22983..d0bafb0ce45 100644 --- a/TAO/tests/Codec/client.dsp +++ b/TAO/tests/Codec/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../.." /I "../.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../.." /I "../.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../.." /I "../.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../.." /I "../.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -94,6 +94,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/tests/Collocation/Collocation_Test_Stubs.dsp b/TAO/tests/Collocation/Collocation_Test_Stubs.dsp index 5e52cba1480..11766c8ceba 100644 --- a/TAO/tests/Collocation/Collocation_Test_Stubs.dsp +++ b/TAO/tests/Collocation/Collocation_Test_Stubs.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "MY_STUB_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "MY_STUB_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "MY_STUB_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "MY_STUB_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -95,6 +95,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\DiamondC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/tests/Connection_Purging/client.dsp b/TAO/tests/Connection_Purging/client.dsp index b7fd0c629b9..60f0f3ced2b 100644 --- a/TAO/tests/Connection_Purging/client.dsp +++ b/TAO/tests/Connection_Purging/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -94,6 +94,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/tests/Connection_Purging/server.dsp b/TAO/tests/Connection_Purging/server.dsp index c70ac270982..9c10e9198f4 100644 --- a/TAO/tests/Connection_Purging/server.dsp +++ b/TAO/tests/Connection_Purging/server.dsp @@ -7,19 +7,19 @@ CFG=Connection Purging Server - 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
!MESSAGE NMAKE /f "server.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "server.mak" CFG="Connection Purging Server - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "Connection Purging Server - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "Connection Purging Server - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -78,7 +78,7 @@ 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 /debug /machine:I386 /pdbtype:sept
# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\Strategies"
-!ENDIF
+!ENDIF
# Begin Target
@@ -89,15 +89,16 @@ LINK32=link.exe # PROP Default_Filter ".cpp"
# Begin Source File
-SOURCE=.\test_i.cpp
+SOURCE=.\server.cpp
# End Source File
# Begin Source File
-SOURCE=.\server.cpp
+SOURCE=.\test_i.cpp
# End Source File
# Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -122,7 +123,7 @@ SOURCE=.\test.idl !IF "$(CFG)" == "Connection Purging Server - Win32 Release"
# PROP Ignore_Default_Tool 1
-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\test.idl
InputName=test
@@ -160,7 +161,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Connection Purging Server - Win32 Debug"
-USERDEP__TEST_=""..\..\..\bin\tao_idl.exe"
+USERDEP__TEST_=""..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\test.idl
InputName=test
@@ -196,7 +197,7 @@ BuildCmds= \ $(BuildCmds)
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
diff --git a/TAO/tests/Crash_On_Write/client.dsp b/TAO/tests/Crash_On_Write/client.dsp index a6d3dfa4d2a..922190da99e 100644 --- a/TAO/tests/Crash_On_Write/client.dsp +++ b/TAO/tests/Crash_On_Write/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -94,6 +94,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/tests/Crash_On_Write/server.dsp b/TAO/tests/Crash_On_Write/server.dsp index e45568c9bc5..0a9077ec07e 100644 --- a/TAO/tests/Crash_On_Write/server.dsp +++ b/TAO/tests/Crash_On_Write/server.dsp @@ -102,6 +102,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Crashed_Callback/client.dsp b/TAO/tests/Crashed_Callback/client.dsp index ccf43592b91..053f47a7c42 100644 --- a/TAO/tests/Crashed_Callback/client.dsp +++ b/TAO/tests/Crashed_Callback/client.dsp @@ -98,6 +98,7 @@ SOURCE=.\Crashed_Callback.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Crashed_Callback/server.dsp b/TAO/tests/Crashed_Callback/server.dsp index 6b2203fd2f1..d40108814ac 100644 --- a/TAO/tests/Crashed_Callback/server.dsp +++ b/TAO/tests/Crashed_Callback/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\Service.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.dsp b/TAO/tests/DLL_ORB/Test_Client_Module.dsp index cb3fa0ff592..76be1e5c967 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.dsp +++ b/TAO/tests/DLL_ORB/Test_Client_Module.dsp @@ -100,6 +100,7 @@ SOURCE=.\Test_Client_Module.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.dsp b/TAO/tests/DLL_ORB/Test_Server_Module.dsp index b9aa9ad1ff4..061e827ccb4 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.dsp +++ b/TAO/tests/DLL_ORB/Test_Server_Module.dsp @@ -104,6 +104,7 @@ SOURCE=.\Test_Server_Module.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway_Client.dsp b/TAO/tests/DSI_Gateway/DSI_Gateway_Client.dsp index 4d22a2a468e..c5e0386e917 100644 --- a/TAO/tests/DSI_Gateway/DSI_Gateway_Client.dsp +++ b/TAO/tests/DSI_Gateway/DSI_Gateway_Client.dsp @@ -94,6 +94,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/tests/DSI_Gateway/DSI_Gateway_Server.dsp b/TAO/tests/DSI_Gateway/DSI_Gateway_Server.dsp index 9d866f68bb2..1faa41ceff7 100644 --- a/TAO/tests/DSI_Gateway/DSI_Gateway_Server.dsp +++ b/TAO/tests/DSI_Gateway/DSI_Gateway_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/tests/DynAny_Test/basic_test.dsp b/TAO/tests/DynAny_Test/basic_test.dsp index 49242184dda..fbe8a11ec10 100644 --- a/TAO/tests/DynAny_Test/basic_test.dsp +++ b/TAO/tests/DynAny_Test/basic_test.dsp @@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\da_testsC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp index 82b2fa3e934..610f9ab3d00 100644 --- a/TAO/tests/DynAny_Test/data.cpp +++ b/TAO/tests/DynAny_Test/data.cpp @@ -36,7 +36,7 @@ Data::Data (CORBA::ORB_var orb) m_typecode2 (CORBA::TypeCode::_duplicate (CORBA::_tc_null)), m_wchar1 (666), m_wchar2 (0), - m_any1 (CORBA::_tc_long), + m_any1 (CORBA::_tc_long, 0), orb_ (orb) { ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp index 1a795c95402..bf9b761e09f 100644 --- a/TAO/tests/DynAny_Test/test_dynany.cpp +++ b/TAO/tests/DynAny_Test/test_dynany.cpp @@ -70,7 +70,7 @@ Test_DynAny::run_test (void) -1); } - CORBA::Any in1 (CORBA::_tc_double); + CORBA::Any in1 (CORBA::_tc_double, 0); DynamicAny::DynAny_var fa1 = dynany_factory->create_dyn_any (in1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -130,7 +130,7 @@ Test_DynAny::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: constructor(Any)/insert/get\n")); - CORBA_Any in (CORBA::_tc_TypeCode); + CORBA::Any in (CORBA::_tc_TypeCode, 0); DynamicAny::DynAny_var fa2 = dynany_factory->create_dyn_any (in ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp index 0c069d92ae2..8c838165714 100644 --- a/TAO/tests/DynAny_Test/test_dynarray.cpp +++ b/TAO/tests/DynAny_Test/test_dynarray.cpp @@ -162,7 +162,7 @@ Test_DynArray::run_test (void) ACE_TRY_CHECK; DynamicAny::AnySeq_var as_out = ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_Any out_any2 = as_out[1U]; + CORBA::Any out_any2 = as_out[1U]; CORBA::Long l_out2; out_any2 >>= l_out2; diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp index f910bdfb5e5..4ff1d7dbe21 100644 --- a/TAO/tests/DynAny_Test/test_dynenum.cpp +++ b/TAO/tests/DynAny_Test/test_dynenum.cpp @@ -66,7 +66,7 @@ Test_DynEnum::run_test (void) } DynAnyTests::test_enum te = DynAnyTests::TE_ZEROTH; - CORBA_Any in_any1; + CORBA::Any in_any1; in_any1 <<= te; DynamicAny::DynAny_var dp1 = dynany_factory->create_dyn_any (in_any1 @@ -132,12 +132,12 @@ Test_DynEnum::run_test (void) -1); } - CORBA_Any in_any2; + CORBA::Any in_any2; in_any2 <<= DynAnyTests::TE_THIRD; de2->from_any (in_any2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_Any_var out_any1 = de2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var out_any1 = de2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; out_any1.in () >>= te; diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp index 8bea56e8f1b..c307e1e6277 100644 --- a/TAO/tests/DynAny_Test/test_dynsequence.cpp +++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp @@ -77,7 +77,7 @@ Test_DynSequence::run_test (void) ts[0] = data.m_string2; ts[1] = data.m_string2; - CORBA_Any in_any1; + CORBA::Any in_any1; in_any1 <<= ts; DynamicAny::DynAny_var dp1 = dynany_factory->create_dyn_any (in_any1 @@ -130,7 +130,7 @@ Test_DynSequence::run_test (void) -1); elem_ptr->length (length); DynamicAny::DynAnySeq_var elements (elem_ptr); - CORBA_Any elem_any; + CORBA::Any elem_any; CORBA::ULong i; for (i = 0; i < length; ++i) @@ -208,7 +208,7 @@ Test_DynSequence::run_test (void) } ts[0] = CORBA::string_dup (data.m_string1); - CORBA_Any in_any2; + CORBA::Any in_any2; in_any2 <<= ts; ftc1->from_any (in_any2 ACE_ENV_ARG_PARAMETER); @@ -244,7 +244,7 @@ Test_DynSequence::run_test (void) ACE_TRY_CHECK; DynamicAny::AnySeq as_in (3); as_in.length (3); - CORBA_Any in_any3; + CORBA::Any in_any3; in_any3 <<= CORBA::Any::from_string (data.m_string2, 8); as_in[0] = in_any3; as_in[1] = in_any3; @@ -256,7 +256,7 @@ Test_DynSequence::run_test (void) DynamicAny::AnySeq_var as_out = ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong index = 2; - CORBA_Any out_any2 = as_out[index]; + CORBA::Any out_any2 = as_out[index]; char* out_str2; out_any2 >>= CORBA::Any::to_string (out_str2, 8); diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp index 52c2abf7ee2..1e8658bdb77 100644 --- a/TAO/tests/DynAny_Test/test_dynstruct.cpp +++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp @@ -179,12 +179,12 @@ Test_DynStruct::run_test (void) ts.l = data.m_long1; ts.es.f = data.m_float1; ts.es.s = data.m_short1; - CORBA_Any in_any2; + CORBA::Any in_any2; in_any2 <<= ts; ftc1->from_any (in_any2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; DynAnyTests::test_struct* ts_out; out_any1.in () >>= ts_out; diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp index c12a5b576e4..64427858f68 100644 --- a/TAO/tests/DynAny_Test/test_dynunion.cpp +++ b/TAO/tests/DynAny_Test/test_dynunion.cpp @@ -75,7 +75,7 @@ Test_DynUnion::run_test (void) tu._d (DynAnyTests::TE_SECOND); tu.tc (data.m_typecode2); - CORBA_Any in_any1; + CORBA::Any in_any1; in_any1 <<= tu; DynamicAny::DynAny_var dp1 = dynany_factory->create_dyn_any (in_any1 @@ -107,7 +107,7 @@ Test_DynUnion::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: constructor(TypeCode)/from_any/to_any\n")); - CORBA_Any_var out_any1 = fa1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var out_any1 = fa1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAny_var ftc1_base = dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_union diff --git a/TAO/tests/Explicit_Event_Loop/client.dsp b/TAO/tests/Explicit_Event_Loop/client.dsp index a1c53ef0ee1..f91f85e5f2c 100644 --- a/TAO/tests/Explicit_Event_Loop/client.dsp +++ b/TAO/tests/Explicit_Event_Loop/client.dsp @@ -93,6 +93,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\timeC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/tests/Explicit_Event_Loop/server.dsp b/TAO/tests/Explicit_Event_Loop/server.dsp index b0317fdeaf1..5f5e289944c 100644 --- a/TAO/tests/Explicit_Event_Loop/server.dsp +++ b/TAO/tests/Explicit_Event_Loop/server.dsp @@ -94,6 +94,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\timeC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Exposed_Policies/Client.dsp b/TAO/tests/Exposed_Policies/Client.dsp index 14ee46deee8..4e877fd032c 100644 --- a/TAO/tests/Exposed_Policies/Client.dsp +++ b/TAO/tests/Exposed_Policies/Client.dsp @@ -94,6 +94,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\CounterC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Exposed_Policies/Server.dsp b/TAO/tests/Exposed_Policies/Server.dsp index 2a083a01f2f..b836e9014c8 100644 --- a/TAO/tests/Exposed_Policies/Server.dsp +++ b/TAO/tests/Exposed_Policies/Server.dsp @@ -51,7 +51,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 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 ace.lib tao.lib TAO_PortableServer.lib TAO_Strategies.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\RTCORBA" /libpath:"..\..\tao\RTPortableServer" /libpath:"../../tao/Strategies"
+# ADD LINK32 ace.lib tao.lib TAO_PortableServer.lib TAO_Strategies.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\RTCORBA" /libpath:"..\..\tao\RTPortableServer" /libpath:"../../tao/Strategies"
!ELSEIF "$(CFG)" == "Exposed_Policies Server - Win32 Debug"
@@ -94,6 +94,7 @@ SOURCE=.\Counter_i.cpp # Begin Source File
SOURCE=.\CounterC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Faults/client.dsp b/TAO/tests/Faults/client.dsp index 889ca8e2b18..e72d1f7e6a2 100644 --- a/TAO/tests/Faults/client.dsp +++ b/TAO/tests/Faults/client.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/tests/Faults/middle.dsp b/TAO/tests/Faults/middle.dsp index ba3652b6db3..2adfdfb365c 100644 --- a/TAO/tests/Faults/middle.dsp +++ b/TAO/tests/Faults/middle.dsp @@ -8,12 +8,12 @@ CFG=Faults Middle Server - 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 "server.mak".
+!MESSAGE NMAKE /f "middle.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 "server.mak" CFG="Faults Middle Server - Win32 Debug"
+!MESSAGE NMAKE /f "middle.mak" CFG="Faults Middle Server - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -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/tests/Faults/ping.dsp b/TAO/tests/Faults/ping.dsp index 65733cff7f1..12de68b7504 100644 --- a/TAO/tests/Faults/ping.dsp +++ b/TAO/tests/Faults/ping.dsp @@ -98,6 +98,7 @@ SOURCE=.\ping_i.cpp # Begin Source File
SOURCE=.\pingC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Faults/pong.dsp b/TAO/tests/Faults/pong.dsp index 503b156cf48..7c3b7f6b324 100644 --- a/TAO/tests/Faults/pong.dsp +++ b/TAO/tests/Faults/pong.dsp @@ -94,6 +94,7 @@ SOURCE=.\ping_i.cpp # Begin Source File
SOURCE=.\pingC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Faults/server.dsp b/TAO/tests/Faults/server.dsp index e9986e07864..7d500474734 100644 --- a/TAO/tests/Faults/server.dsp +++ b/TAO/tests/Faults/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/tests/Forwarding/client.dsp b/TAO/tests/Forwarding/client.dsp index 4af3239c795..2405144ab82 100644 --- a/TAO/tests/Forwarding/client.dsp +++ b/TAO/tests/Forwarding/client.dsp @@ -94,6 +94,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/tests/Forwarding/server.dsp b/TAO/tests/Forwarding/server.dsp index 3ee8691224f..1368d5ad318 100644 --- a/TAO/tests/Forwarding/server.dsp +++ b/TAO/tests/Forwarding/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/tests/Hello/client.dsp b/TAO/tests/Hello/client.dsp index 0700c101117..c3d1de5f24f 100644 --- a/TAO/tests/Hello/client.dsp +++ b/TAO/tests/Hello/client.dsp @@ -94,6 +94,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/tests/Hello/server.dsp b/TAO/tests/Hello/server.dsp index d59eea1bc5c..69268902e9c 100644 --- a/TAO/tests/Hello/server.dsp +++ b/TAO/tests/Hello/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/IDL_Test/idl_test.dsp b/TAO/tests/IDL_Test/idl_test.dsp index 73d63b33a73..9dfbdfb71d2 100644 --- a/TAO/tests/IDL_Test/idl_test.dsp +++ b/TAO/tests/IDL_Test/idl_test.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\anonymousC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -98,6 +99,7 @@ SOURCE=.\anonymousS.cpp # Begin Source File
SOURCE=.\arrayC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -106,6 +108,7 @@ SOURCE=.\arrayS.cpp # Begin Source File
SOURCE=.\constantsC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -114,6 +117,7 @@ SOURCE=.\constantsS.cpp # Begin Source File
SOURCE=.\enum_in_structC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -122,6 +126,7 @@ SOURCE=.\enum_in_structS.cpp # Begin Source File
SOURCE=.\fullC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -130,6 +135,7 @@ SOURCE=.\fullS.cpp # Begin Source File
SOURCE=.\fwdC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -138,6 +144,7 @@ SOURCE=.\fwdS.cpp # Begin Source File
SOURCE=.\generic_objectC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -146,6 +153,7 @@ SOURCE=.\generic_objectS.cpp # Begin Source File
SOURCE=.\gperfC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -154,6 +162,7 @@ SOURCE=.\gperfS.cpp # Begin Source File
SOURCE=.\includedC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -162,6 +171,7 @@ SOURCE=.\includedS.cpp # Begin Source File
SOURCE=.\includingC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -170,6 +180,7 @@ SOURCE=.\includingS.cpp # Begin Source File
SOURCE=.\interfaceC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -178,6 +189,7 @@ SOURCE=.\interfaceS.cpp # Begin Source File
SOURCE=.\keywordsC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -190,6 +202,7 @@ SOURCE=.\main.cpp # Begin Source File
SOURCE=.\nested_scopeC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -198,6 +211,7 @@ SOURCE=.\nested_scopeS.cpp # Begin Source File
SOURCE=.\paramsC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -206,6 +220,7 @@ SOURCE=.\paramsS.cpp # Begin Source File
SOURCE=.\pragmaC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -214,6 +229,7 @@ SOURCE=.\pragmaS.cpp # Begin Source File
SOURCE=.\reopen_include1C.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -222,6 +238,7 @@ SOURCE=.\reopen_include1S.cpp # Begin Source File
SOURCE=.\reopen_include2C.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -230,6 +247,7 @@ SOURCE=.\reopen_include2S.cpp # Begin Source File
SOURCE=.\reopened_modulesC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -238,10 +256,12 @@ SOURCE=.\reopened_modulesS.cpp # Begin Source File
SOURCE=.\repo_id_modC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
SOURCE=.\sequenceC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -250,6 +270,7 @@ SOURCE=.\sequenceS.cpp # Begin Source File
SOURCE=.\typedefC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -258,6 +279,7 @@ SOURCE=.\typedefS.cpp # Begin Source File
SOURCE=.\unionC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/InterOp-Naming/server.dsp b/TAO/tests/InterOp-Naming/server.dsp index 688cba9f50b..c92bc1de566 100644 --- a/TAO/tests/InterOp-Naming/server.dsp +++ b/TAO/tests/InterOp-Naming/server.dsp @@ -215,6 +215,7 @@ SOURCE=.\INS_test_server.cpp # Begin Source File
SOURCE=.\INSC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Leader_Followers/client.dsp b/TAO/tests/Leader_Followers/client.dsp index b5fab29a6ee..d46713ae3ee 100644 --- a/TAO/tests/Leader_Followers/client.dsp +++ b/TAO/tests/Leader_Followers/client.dsp @@ -94,6 +94,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/tests/Leader_Followers/server.dsp b/TAO/tests/Leader_Followers/server.dsp index 03fb509c8c3..ebc38cbb425 100644 --- a/TAO/tests/Leader_Followers/server.dsp +++ b/TAO/tests/Leader_Followers/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/tests/LongUpcalls/ami_client.dsp b/TAO/tests/LongUpcalls/ami_client.dsp index 898c8e24daf..a195396c85a 100644 --- a/TAO/tests/LongUpcalls/ami_client.dsp +++ b/TAO/tests/LongUpcalls/ami_client.dsp @@ -102,6 +102,7 @@ SOURCE=.\Manager_Handler.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/LongUpcalls/ami_server.dsp b/TAO/tests/LongUpcalls/ami_server.dsp index d79f7745f8f..25d4034a96a 100644 --- a/TAO/tests/LongUpcalls/ami_server.dsp +++ b/TAO/tests/LongUpcalls/ami_server.dsp @@ -98,6 +98,7 @@ SOURCE=.\ami_server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/LongUpcalls/blocking_client.dsp b/TAO/tests/LongUpcalls/blocking_client.dsp index 6cb16aa58a8..639d28462dd 100644 --- a/TAO/tests/LongUpcalls/blocking_client.dsp +++ b/TAO/tests/LongUpcalls/blocking_client.dsp @@ -98,6 +98,7 @@ SOURCE=.\Controller.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/LongUpcalls/blocking_server.dsp b/TAO/tests/LongUpcalls/blocking_server.dsp index 8b15a822fc8..47af66d2a5d 100644 --- a/TAO/tests/LongUpcalls/blocking_server.dsp +++ b/TAO/tests/LongUpcalls/blocking_server.dsp @@ -98,6 +98,7 @@ SOURCE=.\Manager.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/MProfile/client.dsp b/TAO/tests/MProfile/client.dsp index 1b754e2c8cd..cefb21af165 100644 --- a/TAO/tests/MProfile/client.dsp +++ b/TAO/tests/MProfile/client.dsp @@ -95,6 +95,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/tests/MProfile/server.dsp b/TAO/tests/MProfile/server.dsp index 48633b3f9c9..92b0a57aee8 100644 --- a/TAO/tests/MProfile/server.dsp +++ b/TAO/tests/MProfile/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/tests/MT_Client/client.dsp b/TAO/tests/MT_Client/client.dsp index f4f2f6e0a9f..a57f27abc52 100644 --- a/TAO/tests/MT_Client/client.dsp +++ b/TAO/tests/MT_Client/client.dsp @@ -94,6 +94,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/tests/MT_Client/orb_creation.dsp b/TAO/tests/MT_Client/orb_creation.dsp index c0207a3604b..8f582596c4f 100644 --- a/TAO/tests/MT_Client/orb_creation.dsp +++ b/TAO/tests/MT_Client/orb_creation.dsp @@ -94,6 +94,7 @@ SOURCE=.\orb_creation.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/tests/MT_Client/server.dsp b/TAO/tests/MT_Client/server.dsp index bc29526ead8..deb75edf62c 100644 --- a/TAO/tests/MT_Client/server.dsp +++ b/TAO/tests/MT_Client/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/tests/MT_Server/client.dsp b/TAO/tests/MT_Server/client.dsp index 7e3d25f3a56..7b50a416ab0 100644 --- a/TAO/tests/MT_Server/client.dsp +++ b/TAO/tests/MT_Server/client.dsp @@ -94,6 +94,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/tests/MT_Server/server.dsp b/TAO/tests/MT_Server/server.dsp index 47233db58b4..2f1cfb0a3c5 100644 --- a/TAO/tests/MT_Server/server.dsp +++ b/TAO/tests/MT_Server/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/tests/MT_Timeout/MT_Timeout_Client.dsp b/TAO/tests/MT_Timeout/MT_Timeout_Client.dsp index 0354efed639..fab63473150 100644 --- a/TAO/tests/MT_Timeout/MT_Timeout_Client.dsp +++ b/TAO/tests/MT_Timeout/MT_Timeout_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/tests/MT_Timeout/MT_Timeout_Server.dsp b/TAO/tests/MT_Timeout/MT_Timeout_Server.dsp index 5779dfef4b4..24846cd2bec 100644 --- a/TAO/tests/MT_Timeout/MT_Timeout_Server.dsp +++ b/TAO/tests/MT_Timeout/MT_Timeout_Server.dsp @@ -102,6 +102,7 @@ SOURCE=.\Sleep_Service.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Multiple/Client.dsp b/TAO/tests/Multiple/Client.dsp index 36e90ce9b33..2f069e85bb5 100644 --- a/TAO/tests/Multiple/Client.dsp +++ b/TAO/tests/Multiple/Client.dsp @@ -98,6 +98,7 @@ SOURCE=.\Collocation_Tester.cpp # Begin Source File
SOURCE=.\MultipleC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/tests/Multiple/Server.dsp b/TAO/tests/Multiple/Server.dsp index e78eeaf1dcb..04d949105c3 100644 --- a/TAO/tests/Multiple/Server.dsp +++ b/TAO/tests/Multiple/Server.dsp @@ -98,6 +98,7 @@ SOURCE=.\Multiple_Impl.cpp # Begin Source File
SOURCE=.\MultipleC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Multiple_Inheritance/client.dsp b/TAO/tests/Multiple_Inheritance/client.dsp index 5a03e4db467..0eb9cbffbb4 100644 --- a/TAO/tests/Multiple_Inheritance/client.dsp +++ b/TAO/tests/Multiple_Inheritance/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -96,6 +96,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\Multiple_InheritanceC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/tests/Multiple_Inheritance/server.dsp b/TAO/tests/Multiple_Inheritance/server.dsp index f2a13c44e06..ac6c1add600 100644 --- a/TAO/tests/Multiple_Inheritance/server.dsp +++ b/TAO/tests/Multiple_Inheritance/server.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -92,6 +92,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\Multiple_InheritanceC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Muxing/client.dsp b/TAO/tests/Muxing/client.dsp index 94f39ccec9d..5fd9939a401 100644 --- a/TAO/tests/Muxing/client.dsp +++ b/TAO/tests/Muxing/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/tests/Muxing/server.dsp b/TAO/tests/Muxing/server.dsp index bbd049e0d23..8dce4b914c6 100644 --- a/TAO/tests/Muxing/server.dsp +++ b/TAO/tests/Muxing/server.dsp @@ -102,6 +102,7 @@ SOURCE=.\Server_Task.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Native_Exceptions/client.dsp b/TAO/tests/Native_Exceptions/client.dsp index fd541397959..c98bdc38c9f 100644 --- a/TAO/tests/Native_Exceptions/client.dsp +++ b/TAO/tests/Native_Exceptions/client.dsp @@ -94,6 +94,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/tests/Native_Exceptions/server.dsp b/TAO/tests/Native_Exceptions/server.dsp index edd5e37c345..2d50fb98e7a 100644 --- a/TAO/tests/Native_Exceptions/server.dsp +++ b/TAO/tests/Native_Exceptions/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/tests/NestedUpcall/MT_Client_Test/client.dsp b/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp index 988a13522c4..80bdf78a385 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp @@ -98,6 +98,7 @@ SOURCE=.\local_server.cpp # Begin Source File
SOURCE=.\MT_Client_TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp b/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp index d771e70a54a..9a810a4db17 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp @@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\MT_Client_TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/NestedUpcall/Simple/client.dsp b/TAO/tests/NestedUpcall/Simple/client.dsp index e2a1087ba5a..c1fcd758593 100644 --- a/TAO/tests/NestedUpcall/Simple/client.dsp +++ b/TAO/tests/NestedUpcall/Simple/client.dsp @@ -97,6 +97,7 @@ SOURCE=.\client_i.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/NestedUpcall/Simple/server.dsp b/TAO/tests/NestedUpcall/Simple/server.dsp index 7a5bc9d2f03..748542e8954 100644 --- a/TAO/tests/NestedUpcall/Simple/server.dsp +++ b/TAO/tests/NestedUpcall/Simple/server.dsp @@ -97,6 +97,7 @@ SOURCE=.\server_i.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp index cce7d348145..8b8e783adb3 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp @@ -98,6 +98,7 @@ SOURCE=.\Initiator_i.cpp # Begin Source File
SOURCE=.\Triangle_TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp index f01e70fe5f1..2b1020c2684 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp @@ -51,7 +51,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 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer"
!ELSEIF "$(CFG)" == "Nested Upcall Triangle Server_A - Win32 Debug"
@@ -98,6 +98,7 @@ SOURCE=.\server_A.cpp # Begin Source File
SOURCE=.\Triangle_TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp index 0a6747d9eb5..83269e93b4e 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp @@ -98,6 +98,7 @@ SOURCE=.\server_B.cpp # Begin Source File
SOURCE=.\Triangle_TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Nested_Event_Loop/client.dsp b/TAO/tests/Nested_Event_Loop/client.dsp index 84b181a71a9..1d1ba23b1e6 100644 --- a/TAO/tests/Nested_Event_Loop/client.dsp +++ b/TAO/tests/Nested_Event_Loop/client.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/tests/Nested_Event_Loop/server.dsp b/TAO/tests/Nested_Event_Loop/server.dsp index f159de499f4..9e12c6d3b45 100644 --- a/TAO/tests/Nested_Event_Loop/server.dsp +++ b/TAO/tests/Nested_Event_Loop/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/tests/ORB_init/Portspan/portspan.dsp b/TAO/tests/ORB_init/Portspan/portspan.dsp index aa097b9d5c2..8f327a3af9e 100644 --- a/TAO/tests/ORB_init/Portspan/portspan.dsp +++ b/TAO/tests/ORB_init/Portspan/portspan.dsp @@ -66,8 +66,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -176,6 +176,7 @@ BuildCmds= \ # Begin Source File
SOURCE=.\simpleC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/ORT/client.dsp b/TAO/tests/ORT/client.dsp index ef764048877..bb8060e3b15 100644 --- a/TAO/tests/ORT/client.dsp +++ b/TAO/tests/ORT/client.dsp @@ -197,6 +197,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\ORT_testC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# End Target
diff --git a/TAO/tests/ORT/server.dsp b/TAO/tests/ORT/server.dsp index 267ea1d6cc5..986bf05dba6 100644 --- a/TAO/tests/ORT/server.dsp +++ b/TAO/tests/ORT/server.dsp @@ -312,6 +312,7 @@ SOURCE=.\ObjectReferenceFactory.cpp # Begin Source File
SOURCE=.\ObjectReferenceFactoryC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -324,6 +325,7 @@ SOURCE=.\ORT_test_IORInterceptor.cpp # Begin Source File
SOURCE=.\ORT_testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Object_Loader/Test_DLL.dsp b/TAO/tests/Object_Loader/Test_DLL.dsp index a96ca863f76..f8d23b56bb0 100644 --- a/TAO/tests/Object_Loader/Test_DLL.dsp +++ b/TAO/tests/Object_Loader/Test_DLL.dsp @@ -103,6 +103,7 @@ SOURCE=.\Test_i.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Object_Loader/driver.dsp b/TAO/tests/Object_Loader/driver.dsp index 4fdeb9847ad..047356d78ce 100644 --- a/TAO/tests/Object_Loader/driver.dsp +++ b/TAO/tests/Object_Loader/driver.dsp @@ -94,6 +94,7 @@ SOURCE=.\driver.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/tests/OctetSeq/OctetSeq.dsp b/TAO/tests/OctetSeq/OctetSeq.dsp index d8d16be18a8..8d4d9af8cc2 100644 --- a/TAO/tests/OctetSeq/OctetSeq.dsp +++ b/TAO/tests/OctetSeq/OctetSeq.dsp @@ -94,6 +94,7 @@ SOURCE=.\OctetSeq.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/tests/OctetSeq/client.dsp b/TAO/tests/OctetSeq/client.dsp index 736eadf3271..8839bcececd 100644 --- a/TAO/tests/OctetSeq/client.dsp +++ b/TAO/tests/OctetSeq/client.dsp @@ -93,6 +93,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/tests/OctetSeq/server.dsp b/TAO/tests/OctetSeq/server.dsp index 3099432fcb7..8af8f21147f 100644 --- a/TAO/tests/OctetSeq/server.dsp +++ b/TAO/tests/OctetSeq/server.dsp @@ -97,6 +97,7 @@ SOURCE=.\test_i.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.dsp b/TAO/tests/Oneways_Invoking_Twoways/client.dsp index de85042c14e..ebc85ea3d95 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/client.dsp +++ b/TAO/tests/Oneways_Invoking_Twoways/client.dsp @@ -108,6 +108,7 @@ SOURCE=.\Server_Task.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.dsp b/TAO/tests/Oneways_Invoking_Twoways/server.dsp index e7f82bc32cc..24b82fc3d9d 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/server.dsp +++ b/TAO/tests/Oneways_Invoking_Twoways/server.dsp @@ -102,6 +102,7 @@ SOURCE=.\Server_Task.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.dsp b/TAO/tests/POA/Default_Servant/Default_Servant.dsp index 484955c10e4..09f53825ad7 100644 --- a/TAO/tests/POA/Default_Servant/Default_Servant.dsp +++ b/TAO/tests/POA/Default_Servant/Default_Servant.dsp @@ -94,6 +94,7 @@ SOURCE=.\Default_Servant.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/POA/Etherealization/Etherealization.dsp b/TAO/tests/POA/Etherealization/Etherealization.dsp index 2666bb6c72b..a3252e597a5 100644 --- a/TAO/tests/POA/Etherealization/Etherealization.dsp +++ b/TAO/tests/POA/Etherealization/Etherealization.dsp @@ -94,6 +94,7 @@ SOURCE=.\Etherealization.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.dsp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.dsp index 2a2d6956e50..a9114cd69be 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.dsp +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.dsp @@ -94,6 +94,7 @@ SOURCE=.\Excessive_Object_Deactivations.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/POA/Identity/Identity.dsp b/TAO/tests/POA/Identity/Identity.dsp index d691d10e660..9fe4a0e3b5f 100644 --- a/TAO/tests/POA/Identity/Identity.dsp +++ b/TAO/tests/POA/Identity/Identity.dsp @@ -93,6 +93,7 @@ SOURCE=.\Identity.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.dsp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.dsp index 0d3a462de5a..90fa0cd7f44 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.dsp +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.dsp @@ -94,6 +94,7 @@ SOURCE=.\MT_Servant_Locator.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.dsp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.dsp index bf6af407954..bef3f149f31 100644 --- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.dsp +++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.dsp @@ -94,6 +94,7 @@ SOURCE=.\Non_Servant_Upcalls.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.dsp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.dsp index faf58f10e50..21ac069c6a4 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.dsp +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.dsp @@ -94,6 +94,7 @@ SOURCE=.\Object_Reactivation.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.dsp b/TAO/tests/POA/POA_Destruction/POA_Destruction.dsp index 1f6c35ca930..129d4cb3afd 100644 --- a/TAO/tests/POA/POA_Destruction/POA_Destruction.dsp +++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.dsp @@ -94,6 +94,7 @@ SOURCE=.\POA_Destruction.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/POA/Persistent_ID/client.dsp b/TAO/tests/POA/Persistent_ID/client.dsp index ed87be92ca4..aa03c8e320d 100644 --- a/TAO/tests/POA/Persistent_ID/client.dsp +++ b/TAO/tests/POA/Persistent_ID/client.dsp @@ -96,6 +96,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
@@ -115,7 +116,7 @@ SOURCE=.\test.idl !IF "$(CFG)" == "POA Persistent ID Client - Win32 Release"
-USERDEP__TEST_I="..\..\..\..\bin\Release\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
@@ -154,7 +155,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "POA Persistent ID Client - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__TEST_I="..\..\..\..\bin\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
diff --git a/TAO/tests/POA/Persistent_ID/server.dsp b/TAO/tests/POA/Persistent_ID/server.dsp index d24f638028f..74689d389ca 100644 --- a/TAO/tests/POA/Persistent_ID/server.dsp +++ b/TAO/tests/POA/Persistent_ID/server.dsp @@ -91,15 +91,16 @@ LINK32=link.exe # PROP Default_Filter ""
# Begin Source File
-SOURCE=.\testC.cpp
+SOURCE=.\server.cpp
# End Source File
# Begin Source File
-SOURCE=.\testS.cpp
+SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
-SOURCE=.\server.cpp
+SOURCE=.\testS.cpp
# End Source File
# End Group
# Begin Group "Header Files"
@@ -123,7 +124,7 @@ SOURCE=.\test.idl !IF "$(CFG)" == "POA Persistent ID Server - Win32 Release"
-USERDEP__TEST_I="..\..\..\..\bin\Release\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
@@ -162,7 +163,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "POA Persistent ID Server - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__TEST_I="..\..\..\..\bin\tao_idl.exe"
+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.dsp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.dsp index 8d2fea8dc42..1e2b907a436 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.dsp +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.dsp @@ -94,6 +94,7 @@ SOURCE=.\Single_Threaded_POA.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.dsp b/TAO/tests/POA/wait_for_completion/wait_for_completion.dsp index 188064f21ec..eaa7246d916 100644 --- a/TAO/tests/POA/wait_for_completion/wait_for_completion.dsp +++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.dsp @@ -89,15 +89,16 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\wait_for_completion.cpp
+SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
-SOURCE=.\testC.cpp
+SOURCE=.\testS.cpp
# End Source File
# Begin Source File
-SOURCE=.\testS.cpp
+SOURCE=.\wait_for_completion.cpp
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp index af6bddcb277..cce2e7d9d88 100644 --- a/TAO/tests/Param_Test/any.cpp +++ b/TAO/tests/Param_Test/any.cpp @@ -52,7 +52,7 @@ Test_Any::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL) { req->add_in_arg ("o1") <<= this->in_; req->add_inout_arg ("o2") <<= this->inout_; - req->add_out_arg ("o3") = CORBA::Any (CORBA::_tc_any); + req->add_out_arg ("o3") = CORBA::Any (CORBA::_tc_any, 0); req->set_return_type (CORBA::_tc_any); diff --git a/TAO/tests/Param_Test/client.dsp b/TAO/tests/Param_Test/client.dsp index 81d4cb36c33..92971f8d317 100644 --- a/TAO/tests/Param_Test/client.dsp +++ b/TAO/tests/Param_Test/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -178,6 +178,7 @@ SOURCE=.\options.cpp # Begin Source File
SOURCE=.\param_testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp index 730761cca34..a12fbe7073d 100644 --- a/TAO/tests/Param_Test/complex_any.cpp +++ b/TAO/tests/Param_Test/complex_any.cpp @@ -56,7 +56,7 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; - req->add_out_arg ("s3") <<= CORBA::Any (CORBA::_tc_any); + req->add_out_arg ("s3") <<= CORBA::Any (CORBA::_tc_any, 0); req->set_return_type (CORBA::_tc_any); diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp index b868c76ee54..12034ad2c16 100644 --- a/TAO/tests/Param_Test/recursive_union.cpp +++ b/TAO/tests/Param_Test/recursive_union.cpp @@ -52,7 +52,7 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); - req->add_out_arg ("s3") = CORBA::Any (Param_Test::_tc_Recursive_Union); + req->add_out_arg ("s3") = CORBA::Any (Param_Test::_tc_Recursive_Union, 0); req->set_return_type (Param_Test::_tc_Recursive_Union); diff --git a/TAO/tests/Param_Test/server.dsp b/TAO/tests/Param_Test/server.dsp index 17c3c98c50b..fa7fd54cd88 100644 --- a/TAO/tests/Param_Test/server.dsp +++ b/TAO/tests/Param_Test/server.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -94,6 +94,7 @@ SOURCE=.\param_test_i.cpp # Begin Source File
SOURCE=.\param_testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp index 25da331a550..c1774571900 100644 --- a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp +++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp @@ -10,6 +10,7 @@ #include "tao/Asynch_Queued_Message.h" #include "ace/Log_Msg.h" +#include "ace/Message_Block.h" ACE_RCSID(tests, Queued_Message_Test, "$Id$") diff --git a/TAO/tests/Reliable_Oneways/client.dsp b/TAO/tests/Reliable_Oneways/client.dsp index 8466ac9f18f..da917d96633 100644 --- a/TAO/tests/Reliable_Oneways/client.dsp +++ b/TAO/tests/Reliable_Oneways/client.dsp @@ -94,6 +94,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/tests/Reliable_Oneways/server.dsp b/TAO/tests/Reliable_Oneways/server.dsp index 5ba39a60ecc..8301a719bd2 100644 --- a/TAO/tests/Reliable_Oneways/server.dsp +++ b/TAO/tests/Reliable_Oneways/server.dsp @@ -102,6 +102,7 @@ SOURCE=.\Shutdown_Helper.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Server_Leaks/client.dsp b/TAO/tests/Server_Leaks/client.dsp index 71e32f8b90a..08c35f38ac4 100644 --- a/TAO/tests/Server_Leaks/client.dsp +++ b/TAO/tests/Server_Leaks/client.dsp @@ -94,6 +94,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/tests/Server_Leaks/server.dsp b/TAO/tests/Server_Leaks/server.dsp index 4ed1ffebc4d..52674c8735a 100644 --- a/TAO/tests/Server_Leaks/server.dsp +++ b/TAO/tests/Server_Leaks/server.dsp @@ -98,6 +98,7 @@ SOURCE=.\server.cpp # Begin Source File
SOURCE=.\TestC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/Single_Read/client.dsp b/TAO/tests/Single_Read/client.dsp index c41dd979b44..0d6c17a9307 100644 --- a/TAO/tests/Single_Read/client.dsp +++ b/TAO/tests/Single_Read/client.dsp @@ -7,19 +7,19 @@ CFG=Single_Read Client - 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
!MESSAGE NMAKE /f "client.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "client.mak" CFG="Single_Read Client - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "Single_Read Client - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "Single_Read Client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -78,7 +78,7 @@ 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 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 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
-!ENDIF
+!ENDIF
# Begin Target
@@ -94,6 +94,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# End Group
# Begin Group "Header Files"
@@ -113,7 +114,7 @@ SOURCE=.\test.idl !IF "$(CFG)" == "Single_Read Client - Win32 Release"
-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
@@ -151,7 +152,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Single_Read Client - Win32 Debug"
-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
@@ -187,7 +188,7 @@ BuildCmds= \ $(BuildCmds)
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
diff --git a/TAO/tests/Single_Read/server.dsp b/TAO/tests/Single_Read/server.dsp index 2b148c045d4..2de734607d1 100644 --- a/TAO/tests/Single_Read/server.dsp +++ b/TAO/tests/Single_Read/server.dsp @@ -7,19 +7,19 @@ CFG=Single_Read Server - 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
!MESSAGE NMAKE /f "server.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "server.mak" CFG="Single_Read Server - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "Single_Read Server - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "Single_Read Server - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -78,7 +78,7 @@ 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 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 aced.lib taod.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\lib" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
-!ENDIF
+!ENDIF
# Begin Target
@@ -98,6 +98,7 @@ SOURCE=.\test_i.cpp # Begin Source File
SOURCE=.\testC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
@@ -125,7 +126,7 @@ SOURCE=.\test.idl !IF "$(CFG)" == "Single_Read Server - Win32 Release"
-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
@@ -163,7 +164,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Single_Read Server - Win32 Debug"
-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
@@ -199,7 +200,7 @@ BuildCmds= \ $(BuildCmds)
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.dsp b/TAO/tests/Timed_Buffered_Oneways/client.dsp index f0bdc322ade..6ed4a6fe417 100644 --- a/TAO/tests/Timed_Buffered_Oneways/client.dsp +++ b/TAO/tests/Timed_Buffered_Oneways/client.dsp @@ -94,6 +94,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/tests/Timed_Buffered_Oneways/server.dsp b/TAO/tests/Timed_Buffered_Oneways/server.dsp index 5f3229e425e..f15c9bdf1bf 100644 --- a/TAO/tests/Timed_Buffered_Oneways/server.dsp +++ b/TAO/tests/Timed_Buffered_Oneways/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/tests/Timeout/client.dsp b/TAO/tests/Timeout/client.dsp index f76a38a8920..297aea8f185 100644 --- a/TAO/tests/Timeout/client.dsp +++ b/TAO/tests/Timeout/client.dsp @@ -92,6 +92,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/tests/Timeout/server.dsp b/TAO/tests/Timeout/server.dsp index 974f0b589fe..afa81ffda0e 100644 --- a/TAO/tests/Timeout/server.dsp +++ b/TAO/tests/Timeout/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/tests/ior_corbaloc/ior_corbaloc_client.dsp b/TAO/tests/ior_corbaloc/ior_corbaloc_client.dsp index 6372f42e818..0182c2c0587 100644 --- a/TAO/tests/ior_corbaloc/ior_corbaloc_client.dsp +++ b/TAO/tests/ior_corbaloc/ior_corbaloc_client.dsp @@ -8,12 +8,12 @@ CFG=IOR CorbaLoc Client - 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 "IOR CorbaLoc Client.mak".
+!MESSAGE NMAKE /f "ior_corbaloc_client.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 "IOR CorbaLoc Client.mak" CFG="IOR CorbaLoc Client - Win32 Debug"
+!MESSAGE NMAKE /f "ior_corbaloc_client.mak" CFG="IOR CorbaLoc Client - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -50,7 +50,7 @@ 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 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 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 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 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /out:"Release/client.exe" /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
!ELSEIF "$(CFG)" == "IOR CorbaLoc Client - Win32 Debug"
@@ -66,8 +66,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -75,7 +75,7 @@ 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 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 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 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 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
!ENDIF
@@ -94,6 +94,7 @@ SOURCE=.\client.cpp # Begin Source File
SOURCE=.\corbalocC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc_server.dsp b/TAO/tests/ior_corbaloc/ior_corbaloc_server.dsp index 13028d590a4..66b0a7f3a26 100644 --- a/TAO/tests/ior_corbaloc/ior_corbaloc_server.dsp +++ b/TAO/tests/ior_corbaloc/ior_corbaloc_server.dsp @@ -8,12 +8,12 @@ CFG=IOR CorbaLoc Server - 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 "IOR CorbaLoc Server.mak".
+!MESSAGE NMAKE /f "ior_corbaloc_server.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 "IOR CorbaLoc Server.mak" CFG="IOR CorbaLoc Server - Win32 Debug"
+!MESSAGE NMAKE /f "ior_corbaloc_server.mak" CFG="IOR CorbaLoc Server - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -50,7 +50,7 @@ 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 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 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 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 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /out:"Release/server.exe" /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
!ELSEIF "$(CFG)" == "IOR CorbaLoc Server - Win32 Debug"
@@ -66,8 +66,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -75,7 +75,7 @@ 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 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 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 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 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
!ENDIF
@@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\corbalocC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
diff --git a/TAO/tests/ior_corbaloc/ior_corbaname_client.dsp b/TAO/tests/ior_corbaloc/ior_corbaname_client.dsp index 4ce7391fcbf..d1051667e3c 100644 --- a/TAO/tests/ior_corbaloc/ior_corbaname_client.dsp +++ b/TAO/tests/ior_corbaloc/ior_corbaname_client.dsp @@ -8,12 +8,12 @@ CFG=IOR CorbaName Client - 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 "IOR CorbaName Client.mak".
+!MESSAGE NMAKE /f "ior_corbaname_client.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 "IOR CorbaName Client.mak" CFG="IOR CorbaName Client - Win32 Debug"
+!MESSAGE NMAKE /f "ior_corbaname_client.mak" CFG="IOR CorbaName Client - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -50,7 +50,7 @@ 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 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 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 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 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /out:"Release/corbaname_client.exe" /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
!ELSEIF "$(CFG)" == "IOR CorbaName Client - Win32 Debug"
@@ -66,8 +66,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -75,7 +75,7 @@ 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 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 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 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 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /out:"corbaname_client.exe" /pdbtype:sept /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
!ENDIF
@@ -90,6 +90,7 @@ LINK32=link.exe # Begin Source File
SOURCE=.\corbalocC.cpp
+# ADD CPP /GR
# End Source File
# Begin Source File
|