summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2003-10-30 10:43:32 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2003-10-30 10:43:32 +0000
commitdf7c7b1036c56501cd58b3c86147e8e0cddc4171 (patch)
treeff520410742389eaeaf5df478359bc61b719fcc6
parent492a60e3ce2d8ff1b308c3a83c73c5d7f01f11a1 (diff)
downloadATCD-df7c7b1036c56501cd58b3c86147e8e0cddc4171.tar.gz
ChangeLogTag: Thu Oct 30 10:43:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/tao/DynamicInterface/DII_Invocation_Adapter.h4
-rw-r--r--TAO/tao/PortableServer/Makefile.bor3
2 files changed, 3 insertions, 4 deletions
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
index c9148b0ae76..3db8b289fc7 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
@@ -110,10 +110,10 @@ namespace TAO
private:
/// Dont allow default initializations
- ACE_UNIMPLEMENTED_FUNC (DII_Invocation_Adapter (void));
+ ACE_UNIMPLEMENTED_FUNC (DII_Invocation_Adapter (void))
ACE_UNIMPLEMENTED_FUNC (
- DII_Invocation_Adapter & operator= (const DII_Invocation_Adapter &));
+ DII_Invocation_Adapter & operator= (const DII_Invocation_Adapter &))
};
/**
diff --git a/TAO/tao/PortableServer/Makefile.bor b/TAO/tao/PortableServer/Makefile.bor
index 3e06c2d4939..ecbf9c69012 100644
--- a/TAO/tao/PortableServer/Makefile.bor
+++ b/TAO/tao/PortableServer/Makefile.bor
@@ -7,7 +7,7 @@ NAME = TAO_PortableServer
OBJFILES = \
$(OBJDIR)\Active_Object_Map.obj \
$(OBJDIR)\AMH_Response_handler.obj \
- $(OBJDIR)\Collocated_Object.obj \
+ $(OBJDIR)\Collocated_Object_Proxy_Broker.obj \
$(OBJDIR)\Default_Acceptor_Filter.obj \
$(OBJDIR)\Default_Policy_Validator.obj \
$(OBJDIR)\Default_ORTC.obj \
@@ -41,7 +41,6 @@ OBJFILES = \
$(OBJDIR)\Servant_Dispatcher.obj \
$(OBJDIR)\ServerInterceptorAdapter.obj \
$(OBJDIR)\ServerRequestInfo.obj \
- $(OBJDIR)\Strategized_Object_Proxy_Broker.obj \
$(OBJDIR)\ThruPOA_Object_Proxy_Impl.obj
RESOURCE = $(OBJDIR)\TAO_PortableServer.res