summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2003-10-30 08:12:51 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2003-10-30 08:12:51 +0000
commit492a60e3ce2d8ff1b308c3a83c73c5d7f01f11a1 (patch)
tree31fbc66039f9b2ad1c27c206aefda6caeaca497f
parentffcace8e2714d44a1be19a569f1aef88355107e2 (diff)
downloadATCD-492a60e3ce2d8ff1b308c3a83c73c5d7f01f11a1.tar.gz
ChangeLogTag: Thu Oct 30 08:10:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/tao/Makefile.bor6
2 files changed, 12 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b584c33fb59..9356f8fa493 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Thu Oct 30 08:10:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/Collocated_Invocation.h:
+ Removed ; after ACE_UNIMPLEMENTED_FUNC
+
+ * tao/Makefile.bor:
+ Updated this makefile with all the recent changes
+
Thu Oct 30 07:22:33 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/ClientInterceptorAdapter.h:
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
index 97041f66bca..e82a15bbdaa 100644
--- a/TAO/tao/Makefile.bor
+++ b/TAO/tao/Makefile.bor
@@ -80,6 +80,7 @@ OBJFILES = \
$(OBJDIR)\DomainC.obj \
$(OBJDIR)\DynamicC.obj \
$(OBJDIR)\Dynamic_Adapter.obj \
+ $(OBJDIR)\Dynamic_ParameterC.obj \
$(OBJDIR)\Encodable.obj \
$(OBJDIR)\Endpoint.obj \
$(OBJDIR)\Endpoint_Selector_Factory.obj \
@@ -144,8 +145,8 @@ OBJFILES = \
$(OBJDIR)\Managed_Types.obj \
$(OBJDIR)\Marshal.obj \
$(OBJDIR)\MCAST_Parser.obj \
- $(OBJDIR)\Messaging_PolicyValueC.obj \
- $(OBJDIR)\Messaging_SyncScopeC.obj \
+ $(OBJDIR)\Messaging_PolicyValueC.obj \
+ $(OBJDIR)\Messaging_SyncScopeC.obj \
$(OBJDIR)\Muxed_TMS.obj \
$(OBJDIR)\NVList.obj \
$(OBJDIR)\ORB.obj \
@@ -163,6 +164,7 @@ OBJFILES = \
$(OBJDIR)\Object_Proxy_Impl.obj \
$(OBJDIR)\Object_Ref_Table.obj \
$(OBJDIR)\OctetSeqC.obj \
+ $(OBJDIR)\ParameterMode.obj \
$(OBJDIR)\Parser_Registry.obj \
$(OBJDIR)\PICurrent.obj \
$(OBJDIR)\PICurrent_ORBInitializer.obj \