diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-10 01:59:08 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-10 01:59:08 +0000 |
| commit | c4c55b86710e76da26192b775adda1f58496248e (patch) | |
| tree | b9eb30f23029d5c6c8246b1d05cbe493c3598f45 /TAO/utils | |
| parent | a964111dea3900c947831d4b2fffb0735d160f50 (diff) | |
| download | ATCD-c4c55b86710e76da26192b775adda1f58496248e.tar.gz | |
ChangeLogTag:Thu Nov 9 17:54:21 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'TAO/utils')
| -rw-r--r-- | TAO/utils/catior/Makefile | 23 | ||||
| -rw-r--r-- | TAO/utils/catior/catior.cpp | 2 |
2 files changed, 13 insertions, 12 deletions
diff --git a/TAO/utils/catior/Makefile b/TAO/utils/catior/Makefile index ba9713bf2f8..d5a0770c3aa 100644 --- a/TAO/utils/catior/Makefile +++ b/TAO/utils/catior/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO +LDLIBS = -lTAO_Strategies -lTAO BIN = catior @@ -199,6 +199,8 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -357,8 +359,6 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ @@ -371,9 +371,10 @@ include $(TAO_ROOT)/taoconfig.mk $(ACE_ROOT)/ace/INET_Addr.i \ $(TAO_ROOT)/tao/IIOP_Endpoint.i \ $(TAO_ROOT)/tao/IIOP_Profile.i \ - $(TAO_ROOT)/tao/UIOP_Profile.h \ - $(TAO_ROOT)/tao/UIOP_Connect.h \ - $(TAO_ROOT)/tao/UIOP_Transport.h \ + $(TAO_ROOT)/tao/Strategies/UIOP_Profile.h \ + $(TAO_ROOT)/tao/Strategies/strategies_export.h \ + $(TAO_ROOT)/tao/Strategies/UIOP_Connect.h \ + $(TAO_ROOT)/tao/Strategies/UIOP_Transport.h \ $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -407,15 +408,15 @@ include $(TAO_ROOT)/taoconfig.mk $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ - $(TAO_ROOT)/tao/UIOP_Transport.i \ + $(TAO_ROOT)/tao/Strategies/UIOP_Transport.i \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Connection_Handler.inl \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/UIOP_Connect.i \ - $(TAO_ROOT)/tao/UIOP_Endpoint.h \ - $(TAO_ROOT)/tao/UIOP_Endpoint.i \ - $(TAO_ROOT)/tao/UIOP_Profile.i + $(TAO_ROOT)/tao/Strategies/UIOP_Connect.i \ + $(TAO_ROOT)/tao/Strategies/UIOP_Endpoint.h \ + $(TAO_ROOT)/tao/Strategies/UIOP_Endpoint.i \ + $(TAO_ROOT)/tao/Strategies/UIOP_Profile.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp index cdbfc96496b..35ff01969b0 100644 --- a/TAO/utils/catior/catior.cpp +++ b/TAO/utils/catior/catior.cpp @@ -20,7 +20,7 @@ #include "ace/streams.h" #include "tao/corba.h" #include "tao/IIOP_Profile.h" -#include "tao/UIOP_Profile.h" +#include "tao/Strategies/UIOP_Profile.h" static CORBA::Boolean catiiop (char* string, |