diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-02 18:08:12 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-02 18:08:12 +0000 |
| commit | 0684f2ac6ed91467e93a84a867fd77ffe5ec42c6 (patch) | |
| tree | 051cf5a54ffc96accd4ac3139837ddd3603a4d56 | |
| parent | e0fb824b24d0705b0dfd47cdc0374ba6601a7dbe (diff) | |
| download | ATCD-0684f2ac6ed91467e93a84a867fd77ffe5ec42c6.tar.gz | |
ChangeLogTag: Thu Nov 2 12:03:07 2000 Jeff Parsons <parsons@cs.wustl.edu>
| -rw-r--r-- | TAO/tao/DynamicInterface/TAO_DynamicInterface.dsp | 4 | ||||
| -rw-r--r-- | TAO/tao/Dynamic_Adapter.cpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/TAO/tao/DynamicInterface/TAO_DynamicInterface.dsp b/TAO/tao/DynamicInterface/TAO_DynamicInterface.dsp index 025c59c04ec..9e8050b9e9f 100644 --- a/TAO/tao/DynamicInterface/TAO_DynamicInterface.dsp +++ b/TAO/tao/DynamicInterface/TAO_DynamicInterface.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 "DynamicInterface_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_DYNAMICANY_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_DYNAMICINTERFACE_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -56,7 +56,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 /dll /machine:I386
-# ADD LINK32 ace.lib TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_DynamicInterface.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 TAO.lib ace.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_DynamicInterface.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
!ELSEIF "$(CFG)" == "DynamicInterface - Win32 Debug"
diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp index c345e8b71d1..a6645c06917 100644 --- a/TAO/tao/Dynamic_Adapter.cpp +++ b/TAO/tao/Dynamic_Adapter.cpp @@ -147,8 +147,6 @@ CORBA::release (CORBA::ServerRequest_ptr req) dynamic_adapter->server_request_release (req); } -#endif /* TAO_HAS_MINIMUM_CORBA */ - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Dynamic_Service<TAO_Dynamic_Adapter>; @@ -158,3 +156,6 @@ template class ACE_Dynamic_Service<TAO_Dynamic_Adapter>; #pragma instantiate ACE_Dynamic_Service<TAO_Dynamic_Adapter> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA */ + |