summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-07 04:01:25 +0000
committermk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-07 04:01:25 +0000
commitd944d55e3519d7a038efdc92a890a02459254c52 (patch)
tree5928d7722f15b9f93158fffc1c2c97b2d2e5fcda
parent2ad9defc7bf3bb3be4beb13717b30b425403c27c (diff)
downloadATCD-d944d55e3519d7a038efdc92a890a02459254c52.tar.gz
ChangeLog entry: Tue Jul 6 22:10:00 1999 Michael Kircher <mk1@cs.wustl.edu>
Diffstat
-rw-r--r--TAO/ChangeLog-99c4
-rw-r--r--TAO/tao/TAO.dsp76
-rw-r--r--TAO/tao/TAO_Static.dsp28
3 files changed, 92 insertions, 16 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 388716ed28f..925c7a0302d 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -4,6 +4,10 @@ Tue Jul 6 22:10:00 1999 Michael Kircher <mk1@cs.wustl.edu>
Replaced three ACE_BASE_CLASS macros with ACE_CORBA_1 macros to
get VC to compile it.
+ * tao/TAO.dsp
+ * tao/TAO_Static.dsp:
+ Added the files Pollable{C,S}.{h,cpp} and Asynch_Invocation.{h,cpp}.
+
* TAO_IDL/be_include/be_decl.h
* TAO_IDL/be/be_decl.cpp
* TAO_IDL/be_include/be_interface.h
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 3e766b78a86..1442539bdda 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -20,13 +20,12 @@ CFG=TAO - Win32 Debug
!MESSAGE
!MESSAGE "TAO - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "TAO - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "TAO - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Dynamic-Link Library")
-!MESSAGE "TAO - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Dynamic-Link Library")
+!MESSAGE "TAO - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
+!MESSAGE "TAO - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath "Desktop"
@@ -105,12 +104,12 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /Gt0 nologo MT Gt0 W3 GX O2 I "..\..\\ /I" D "WIN32" D "NDEBUG" D "_WINDOWS" D "TAO_BUILD_DLL" FD ..\\ c
+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\\ /I "..\\ /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-CPP=cl.exe
-# ADD BASE CPP /Gt0 nologo MT Gt0 W3 GX O2 I "..\..\\ /I" D "WIN32" D "NDEBUG" D "_WINDOWS" D "TAO_BUILD_DLL" FD ..\\ c
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -135,12 +134,12 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy I "..\..\\ /I" D "WIN32" D "_DEBUG" D "_WINDOWS" D "TAO_BUILD_DLL" FD MTd ..\\ c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\..\\ /I "..\\ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MDd /c
MTL=midl.exe
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-CPP=cl.exe
-# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy I "..\..\\ /I" D "WIN32" D "_DEBUG" D "_WINDOWS" D "TAO_BUILD_DLL" FD MTd ..\\ c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\..\\" /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MDd /c
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -224,6 +223,21 @@ SOURCE=.\append.cpp
# End Source File
# Begin Source File
+SOURCE=.\Asynch_Invocation.cpp
+
+!IF "$(CFG)" == "TAO - Win32 Release"
+
+!ELSEIF "$(CFG)" == "TAO - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "TAO - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "TAO - Win32 Alpha Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\CDR.cpp
!IF "$(CFG)" == "TAO - Win32 Release"
@@ -1229,6 +1243,36 @@ SOURCE=.\PolicyS.cpp
# End Source File
# Begin Source File
+SOURCE=.\PollableC.cpp
+
+!IF "$(CFG)" == "TAO - Win32 Release"
+
+!ELSEIF "$(CFG)" == "TAO - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "TAO - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "TAO - Win32 Alpha Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\PollableS.cpp
+
+!IF "$(CFG)" == "TAO - Win32 Release"
+
+!ELSEIF "$(CFG)" == "TAO - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "TAO - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "TAO - Win32 Alpha Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\Principal.cpp
!IF "$(CFG)" == "TAO - Win32 Release"
@@ -1639,6 +1683,10 @@ SOURCE=.\arg_shifter.h
# End Source File
# Begin Source File
+SOURCE=.\Asynch_Invocation.h
+# End Source File
+# Begin Source File
+
SOURCE=.\cdr.h
# End Source File
# Begin Source File
@@ -1903,6 +1951,14 @@ SOURCE=.\PolicyC.h
# End Source File
# Begin Source File
+SOURCE=.\PollableC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\PollableS.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Principal.h
# End Source File
# Begin Source File
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index f863ac0e34e..06ac8cae668 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -22,9 +22,11 @@ CFG=TAO Static - Win32 Debug
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath "Desktop"
CPP=cl.exe
+RSC=rc.exe
!IF "$(CFG)" == "TAO Static - Win32 Release"
@@ -38,12 +40,11 @@ CPP=cl.exe
# PROP Output_Dir ""
# PROP Intermediate_Dir "LIB\Release"
# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c
# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -63,11 +64,10 @@ LIB32=link.exe -lib
# PROP Output_Dir ""
# PROP Intermediate_Dir "LIB\Debug"
# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\..\\" /I "..\\" /D TAO_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -366,6 +366,14 @@ SOURCE=.\PolicyS.cpp
# End Source File
# Begin Source File
+SOURCE=.\PollableC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\PollableS.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Principal.cpp
# End Source File
# Begin Source File
@@ -738,6 +746,14 @@ SOURCE=.\PolicyC.h
# End Source File
# Begin Source File
+SOURCE=.\PollableC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\PollableS.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Principal.h
# End Source File
# Begin Source File
View Lorry Controller Status