summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-07-21 18:14:38 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-07-21 18:14:38 +0000
commit96aea82837c8cf584f22c631a21aa2e66246a76d (patch)
tree924a2fd0ef2bd43e748e2f742670a3cf6be2474b
parent6bf25b30dedf36df9cb0489996ccb86f1f16f85a (diff)
downloadATCD-96aea82837c8cf584f22c631a21aa2e66246a76d.tar.gz
ChangeLogTag: Mon Jul 21 13:11:40 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog_ref7
-rw-r--r--TAO/tao/TAO.dsp20
-rw-r--r--TAO/tao/TAO_Static.dsp32
3 files changed, 57 insertions, 2 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 3f822598d83..2240997a316 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,10 @@
+Mon Jul 21 13:11:40 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * tao/TAO.dsp:
+ * tao/TAO_Static.dsp:
+
+ Added Bala's new collocation-related files to these projects.
+
Mon Jul 21 11:41:17 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/include/utl_idlist.h:
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 8546e93a4dc..31974912077 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -281,6 +281,10 @@ SOURCE=.\Codeset_Translator_Factory.cpp
# End Source File
# Begin Source File
+SOURCE=.\Collocated_Invocation.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Collocation_Resolver.cpp
# End Source File
# Begin Source File
@@ -528,6 +532,10 @@ SOURCE=.\Invocation.cpp
# End Source File
# Begin Source File
+SOURCE=.\Invocation_Adapter.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Invocation_Base.cpp
# End Source File
# Begin Source File
@@ -1212,6 +1220,14 @@ SOURCE=.\Codeset_Translator_Factory.h
# End Source File
# Begin Source File
+SOURCE=.\Collocated_Invocation.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Collocation_Proxy_Broker.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Collocation_Resolver.h
# End Source File
# Begin Source File
@@ -1480,6 +1496,10 @@ SOURCE=.\Invocation.h
# End Source File
# Begin Source File
+SOURCE=.\Invocation_Adapter.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Invocation_Base.h
# End Source File
# Begin Source File
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index 75d6d7cae45..e3bdf42e3e4 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -40,8 +40,8 @@ RSC=rc.exe
# PROP Output_Dir ""
# PROP Intermediate_Dir "LIB\Release"
# PROP Target_Dir ""
-MTL=midl.exe
LINK32=link.exe -lib
+MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "../../" /I "../" /D "_WINDOWS" /D "_CONSOLE" /D "NDEBUG" /D "WIN32" /D "TAO_AS_STATIC_LIBS" /D "ACE_AS_STATIC_LIBS" /FD /c
# SUBTRACT CPP /YX
@@ -66,8 +66,8 @@ LIB32=link.exe -lib
# PROP Output_Dir ""
# PROP Intermediate_Dir "LIB\Debug"
# PROP Target_Dir ""
-MTL=midl.exe
LINK32=link.exe -lib
+MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /GR /GX /Zi /Od /I "../../" /I "../" /D "_WINDOWS" /D "_CONSOLE" /D "_DEBUG" /D "WIN32" /D "ACE_AS_STATIC_LIBS" /D "TAO_AS_STATIC_LIBS" /FD /c
# SUBTRACT CPP /YX
@@ -203,6 +203,10 @@ SOURCE=.\Codeset_Translator_Factory.cpp
# End Source File
# Begin Source File
+SOURCE=.\Collocated_Invocation.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Collocation_Resolver.cpp
# End Source File
# Begin Source File
@@ -443,6 +447,14 @@ SOURCE=.\Invocation.cpp
# End Source File
# Begin Source File
+SOURCE=.\Invocation_Adapter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Invocation_Base.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Invocation_Endpoint_Selectors.cpp
# End Source File
# Begin Source File
@@ -1067,6 +1079,14 @@ SOURCE=.\Codeset_Translator_Factory.h
# End Source File
# Begin Source File
+SOURCE=.\Collocated_Invocation.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Collocation_Proxy_Broker.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Collocation_Resolver.h
# End Source File
# Begin Source File
@@ -1331,6 +1351,14 @@ SOURCE=.\Invocation.h
# End Source File
# Begin Source File
+SOURCE=.\Invocation_Adapter.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Invocation_Base.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Invocation_Endpoint_Selectors.h
# End Source File
# Begin Source File