ChangeLogTag:Mon Aug 30 15:58:44 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

3 files changed, 340 insertions, 18 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 91dc458003c..cf161a9cd18 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,9 @@
+Mon Aug 30 15:58:44 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* tao/TAO.dsp:
+	* tao/TAO_Static.dsp:
+	  Added the new files to the MSVC projects.
+
 Mon Aug 30 15:56:09 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* tests/Interceptors/Makefile: Updated dependencies.
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index b91d91cd55f..8275ab9bff4 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -18,16 +18,20 @@ CFG=TAO DLL - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "TAO DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "TAO DLL - Win32 Release" (based on\

+ "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "TAO DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "TAO DLL - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE "TAO DLL - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE "TAO DLL - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "TAO DLL - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "TAO DLL - Win32 Alpha Release" (based on\

+ "Win32 (ALPHA) Dynamic-Link Library")

+!MESSAGE "TAO DLL - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Dynamic-Link Library")

+!MESSAGE "TAO DLL - Win32 MFC Debug" (based on\

+ "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "TAO DLL - Win32 MFC Release" (based on\

+ "Win32 (x86) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath "Desktop"

 

@@ -106,12 +110,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /Gt0 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD nologo MT Gt0 W3 GX O2 I "../../" /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 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD nologo MT Gt0 W3 GX O2 I "../../" /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"

@@ -136,12 +140,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /Gt0 /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "../../" /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 /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "../../" /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"

@@ -1297,6 +1301,25 @@ SOURCE=.\Key_Adapters.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Leader_Follower.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=.\Managed_Types.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Release"

@@ -1772,6 +1795,25 @@ SOURCE=.\PollableS.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Pool_Per_Endpoint.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=.\Principal.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Release"

@@ -1791,6 +1833,25 @@ SOURCE=.\Principal.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Priority_Mapping.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=.\Protocol_Factory.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Release"

@@ -1810,6 +1871,44 @@ SOURCE=.\Protocol_Factory.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Reactor_Per_Priority.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Reactor_Registry.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=.\Reply_Dispatcher.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Release"

@@ -1867,6 +1966,44 @@ SOURCE=.\Resource_Factory.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\RT_Current.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\rtcorbafwd.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=.\Sequence.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Release"

@@ -1962,6 +2099,25 @@ SOURCE=.\Services.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Single_Reactor.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=.\skip.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Release"

@@ -2588,6 +2744,10 @@ SOURCE=.\IORS.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Leader_Follower.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Managed_Types.h

 # End Source File

 # Begin Source File

@@ -2704,14 +2864,30 @@ SOURCE=.\PollableS.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Pool_Per_Endpoint.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Principal.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\Priority_Mapping.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Protocol_Factory.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\Reactor_Per_Priority.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Reactor_Registry.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Reply_Dispatcher.h

 # End Source File

 # Begin Source File

@@ -2724,6 +2900,14 @@ SOURCE=.\Resource_Factory.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\RT_Current.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\rtcorbafwd.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\sequence.h

 # End Source File

 # Begin Source File

@@ -2748,6 +2932,10 @@ SOURCE=.\Services.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Single_Reactor.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\singletons.h

 # End Source File

 # Begin Source File

@@ -2932,6 +3120,10 @@ SOURCE=.\IOPS.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Leader_Follower.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Managed_Types.i

 # End Source File

 # Begin Source File

@@ -3004,10 +3196,34 @@ SOURCE=.\PolicyC.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Pool_Per_Endpoint.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Priority_Mapping.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Reactor_Per_Priority.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Reactor_Registry.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Request.i

 # End Source File

 # Begin Source File

 

+SOURCE=.\RT_Current.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\rtcorbafwd.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\sequence.i

 # End Source File

 # Begin Source File

@@ -3024,6 +3240,10 @@ SOURCE=.\Services.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Single_Reactor.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\stub.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index 5078d4889f8..69ef9e9046b 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -22,11 +22,9 @@ CFG=TAO LIB - Win32 Debug
 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath "Desktop"

 CPP=cl.exe

-RSC=rc.exe

 

 !IF  "$(CFG)" == "TAO LIB - Win32 Release"

 

@@ -40,11 +38,12 @@ RSC=rc.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

@@ -64,10 +63,11 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir "LIB\Debug"

 # PROP Target_Dir ""

-# 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

+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

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -310,6 +310,10 @@ SOURCE=.\Key_Adapters.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Leader_Follower.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Managed_Types.cpp

 # End Source File

 # Begin Source File

@@ -410,14 +414,30 @@ SOURCE=.\PollableS.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Pool_Per_Endpoint.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Principal.cpp

 # End Source File

 # Begin Source File

 

+SOURCE=.\Priority_Mapping.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Protocol_Factory.cpp

 # End Source File

 # Begin Source File

 

+SOURCE=.\Reactor_Per_Priority.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Reactor_Registry.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Reply_Dispatcher.cpp

 # End Source File

 # Begin Source File

@@ -430,6 +450,14 @@ SOURCE=.\Resource_Factory.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\RT_Current.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\rtcorbafwd.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Sequence.cpp

 # End Source File

 # Begin Source File

@@ -450,6 +478,10 @@ SOURCE=.\Services.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Single_Reactor.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\skip.cpp

 # End Source File

 # Begin Source File

@@ -746,6 +778,10 @@ SOURCE=.\IORS.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Leader_Follower.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Managed_Types.h

 # End Source File

 # Begin Source File

@@ -862,14 +898,30 @@ SOURCE=.\PollableS.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Pool_Per_Endpoint.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Principal.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\Priority_Mapping.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Protocol_Factory.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\Reactor_Per_Priority.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Reactor_Registry.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Reply_Dispatcher.h

 # End Source File

 # Begin Source File

@@ -882,6 +934,14 @@ SOURCE=.\Resource_Factory.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\RT_Current.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\rtcorbafwd.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\sequence.h

 # End Source File

 # Begin Source File

@@ -906,6 +966,10 @@ SOURCE=.\Services.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Single_Reactor.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\singletons.h

 # End Source File

 # Begin Source File

@@ -1090,6 +1154,10 @@ SOURCE=.\IOPS.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Leader_Follower.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Managed_Types.i

 # End Source File

 # Begin Source File

@@ -1162,10 +1230,34 @@ SOURCE=.\PolicyC.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Pool_Per_Endpoint.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Priority_Mapping.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Reactor_Per_Priority.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Reactor_Registry.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Request.i

 # End Source File

 # Begin Source File

 

+SOURCE=.\RT_Current.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\rtcorbafwd.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\sequence.i

 # End Source File

 # Begin Source File

@@ -1182,6 +1274,10 @@ SOURCE=.\Services.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Single_Reactor.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\stub.i

 # End Source File

 # Begin Source File