diff options
| author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-01-02 19:04:55 +0000 |
|---|---|---|
| committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-01-02 19:04:55 +0000 |
| commit | 891e926100763cdaac1afde5d3e3fed05b28312a (patch) | |
| tree | 4f0d91032cbb74bd81b96980ac0b1aabf08bc2c1 /TAO/tests | |
| parent | 06609ff1d7e730c776f7230a5aec92c7c1959266 (diff) | |
| download | ATCD-891e926100763cdaac1afde5d3e3fed05b28312a.tar.gz | |
ChangeLogTag:Fri Jan 02 13:09:19 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tests')
| -rw-r--r-- | TAO/tests/Smart_Proxies/Collocation/Collocation.dsp | 6 | ||||
| -rw-r--r-- | TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/TAO/tests/Smart_Proxies/Collocation/Collocation.dsp b/TAO/tests/Smart_Proxies/Collocation/Collocation.dsp index ac20861c4ee..b34da5e4eca 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Collocation.dsp +++ b/TAO/tests/Smart_Proxies/Collocation/Collocation.dsp @@ -51,7 +51,8 @@ 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 Diamond.lib coll_test_stubs.lib TAO_SmartProxies.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\SmartProxies"
+# ADD LINK32 Diamond.lib coll_test_stubs.lib TAO_Strategies.lib TAO_SmartProxies.lib TAO_PortableServer.lib TAO_Valuetype.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\SmartProxies" /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\IORInterceptor" /libpath:"..\..\..\tao\ObjRefTemplate"
+# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "Collocation - Win32 Debug"
@@ -76,7 +77,8 @@ 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 Diamondd.lib coll_test_stubsd.lib TAO_SmartProxiesd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\SmartProxies"
+# ADD LINK32 Diamondd.lib coll_test_stubsd.lib TAO_SmartProxiesd.lib TAO_PortableServerd.lib TAO_ObjRefTemplated.lib TAO_IORInterceptord.lib TAO_Valuetyped.lib TAO_Strategiesd.lib TAOTAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\tao\IORInterceptor" /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\SmartProxies"
+# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp index fa9262ed5d3..b7777cd8cd0 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp @@ -41,7 +41,7 @@ Smart_Diamond_Top_Proxy::shape ( ACE_ENV_SINGLE_ARG_DECL) { ans = ACE_OS::strdup ( - Diamond::TAO_Diamond_Top_Smart_Proxy_Base::shape ( + ACE_NESTED_CLASS (Diamond,TAO_Diamond_Top_Smart_Proxy_Base)::shape ( ACE_ENV_SINGLE_ARG_PARAMETER ) ); |