diff options
| author | storri <storri@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-18 21:30:42 +0000 |
|---|---|---|
| committer | storri <storri@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-18 21:30:42 +0000 |
| commit | 7cc29793b986678612f9431b44b151a2ab59772f (patch) | |
| tree | bc648970682d16d475eba2764f3fcc730f6a70c3 | |
| parent | 235cb92daba2cc4d5622568fd7f210d64ac64b3a (diff) | |
| download | ATCD-7cc29793b986678612f9431b44b151a2ab59772f.tar.gz | |
RMCast done
SSL done
113 files changed, 487 insertions, 1721 deletions
diff --git a/ace/CLASSIX/Makefile b/ace/CLASSIX/Makefile index a207ce3da0e..d42f6107cf9 100644 --- a/ace/CLASSIX/Makefile +++ b/ace/CLASSIX/Makefile @@ -1,81 +1,54 @@ +# $Id$ + #---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the entire ACE release +# Makefile for the libACE_ATM #---------------------------------------------------------------------------- MAKEFILE = Makefile -LIB = libCLASSIX.a - -FILES = \ - CLASSIX_OS \ - CLASSIX_Select_Reactor \ - CLASSIX_Addr \ - CLASSIX_Port_Core \ - CLASSIX_Port \ - CLASSIX_Port_Default \ - CLASSIX_Group \ - CLASSIX_Group_Stamp \ - CLASSIX_Group_Dynamic \ - CLASSIX_SAP \ - CLASSIX_Peer_SAP \ - CLASSIX_Stream \ - CLASSIX_Dgram_Mcast \ - CLASSIX_CO_Acceptor \ - CLASSIX_CO_Connector \ - CLASSIX_CLD_Connector - -DEFS = $(addsuffix .h,$(FILES)) Svc_Conf_Tokens.h -DEFS += $(addsuffix .i,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) - -BUILD = $(VLIB) +LIBNAME = libACE_CLASSIX +LIB = $(LIBNAME).a +SHLIB = $(LIBNAME).$(SOEXT) + + +FILES = \ + CLASSIX_Addr\ + CLASSIX_CLD_Connector\ + CLASSIX_CO_Acceptor\ + CLASSIX_CO_Connector\ + CLASSIX_Dgram_Mcast\ + CLASSIX_Group\ + CLASSIX_Group_Dynamic\ + CLASSIX_Group_Stamp\ + CLASSIX_OS\ + CLASSIX_Peer_SAP\ + CLASSIX_Port\ + CLASSIX_Port_Core\ + CLASSIX_Port_Default\ + CLASSIX_SAP\ + CLASSIX_Select_Reactor #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU + +#### +#### ACE_COMPONENTS support. +#### + +LSRC = $(addsuffix .cpp,$(FILES)) + include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -#### Disable installs in this ($(ACE_ROOT)/ace) directory, because this -#### is the (default) destination of installs anyways. And this will prevent -#### creation of a link from the ACE library to itself when the build of -#### the ACE library fails. -INSTALL = include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#### Setting ACELIB to null allows it to be used for building shared libraries, -#### including libACE.$(SOEXT,) on certain platforms. -ACELIB = - - -ifeq ($(SUPPRESS_DASH_G),1) -#### Build this target without -g on some platforms. - $(COMPILE-NO_DASH_G.cc) -o $@ $< -endif # SUPPRESS_DASH_G - -ifeq ($(CHORUS),1) - ifeq ($(CC),$(GHS_DIR)/build -driver ch68) - #### Build this target without -g, because it causes ghs 1.8.8 to core - #### dump. - $(VDIR)Select_Reactor.o .obj/Select_Reactor.so .shobj/Select_Reactor.o .shobj/Select_Reactor.so: - $(COMPILE-NO_DASH_G.cc) -o $@ $< - endif # CC -endif # CHORUS +INSTALL = -ifneq ($(GHS),) - ifeq ($(CPU),86) - $(VDIR)gethrtime.$(OBJEXT): - make $@ ghs=0 - endif # 86 -endif # GHS +clean: + $(RM) -f $(LIBNAME).a $(LIBNAME).so #---------------------------------------------------------------------------- # Dependencies @@ -83,462 +56,3 @@ endif # GHS # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/CLASSIX_OS.o .obj/CLASSIX_OS.so .shobj/CLASSIX_OS.o .shobj/CLASSIX_OS.so: CLASSIX_OS.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Select_Reactor.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Select_Reactor.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_SAP.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_SAP.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Select_Reactor.i -.obj/CLASSIX_Select_Reactor.o .obj/CLASSIX_Select_Reactor.so .shobj/CLASSIX_Select_Reactor.o .shobj/CLASSIX_Select_Reactor.so: CLASSIX_Select_Reactor.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Select_Reactor.h \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Select_Reactor.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_SAP.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_SAP.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Select_Reactor.i -.obj/CLASSIX_Addr.o .obj/CLASSIX_Addr.so .shobj/CLASSIX_Addr.o .shobj/CLASSIX_Addr.so: CLASSIX_Addr.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.i -.obj/CLASSIX_Port_Core.o .obj/CLASSIX_Port_Core.so .shobj/CLASSIX_Port_Core.o .shobj/CLASSIX_Port_Core.so: CLASSIX_Port_Core.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.h \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Select_Reactor.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.i -.obj/CLASSIX_Port.o .obj/CLASSIX_Port.so .shobj/CLASSIX_Port.o .shobj/CLASSIX_Port.so: CLASSIX_Port.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.h \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Select_Reactor.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.i -.obj/CLASSIX_Port_Default.o .obj/CLASSIX_Port_Default.so .shobj/CLASSIX_Port_Default.o .shobj/CLASSIX_Port_Default.so: CLASSIX_Port_Default.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Default.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.h \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Select_Reactor.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Default.i -.obj/CLASSIX_Group.o .obj/CLASSIX_Group.so .shobj/CLASSIX_Group.o .shobj/CLASSIX_Group.so: CLASSIX_Group.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Group.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Group.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ace/RMCast/RMCast.cpp b/ace/RMCast/RMCast.cpp index 92ea637e481..40e51aeca38 100644 --- a/ace/RMCast/RMCast.cpp +++ b/ace/RMCast/RMCast.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "RMCast.h" +#include "ace/RMCast/RMCast.h" #if !defined (__ACE_INLINE__) -#include "RMCast.i" +#include "ace/RMCast/RMCast.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, RMCast, "$Id$") diff --git a/ace/RMCast/RMCast.h b/ace/RMCast/RMCast.h index 22afdebe3ce..be0e0bbdfbd 100644 --- a/ace/RMCast/RMCast.h +++ b/ace/RMCast/RMCast.h @@ -18,8 +18,8 @@ #define ACE_RMCAST_H #include "ace/pre.h" -#include "ace/OS.h" -#include "RMCast_Export.h" +#include "ace/OS/OS.h" +#include "ace/RMCast/RMCast_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -254,7 +254,7 @@ public: }; #if defined (__ACE_INLINE__) -#include "RMCast.i" +#include "ace/RMCast/RMCast.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_Ack_Worker.cpp b/ace/RMCast/RMCast_Ack_Worker.cpp index d9843ebe93b..bf4de61d757 100644 --- a/ace/RMCast/RMCast_Ack_Worker.cpp +++ b/ace/RMCast/RMCast_Ack_Worker.cpp @@ -2,11 +2,11 @@ // $Id$ // -#include "RMCast_Ack_Worker.h" -#include "ace/Message_Block.h" +#include "ace/RMCast/RMCast_Ack_Worker.h" +#include "ace/Utils/Message_Block.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Ack_Worker.i" +# include "ace/RMCast/RMCast_Ack_Worker.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Ack_Worker, "$Id$") diff --git a/ace/RMCast/RMCast_Ack_Worker.h b/ace/RMCast/RMCast_Ack_Worker.h index 565ef7feed8..6efd2980823 100644 --- a/ace/RMCast/RMCast_Ack_Worker.h +++ b/ace/RMCast/RMCast_Ack_Worker.h @@ -5,7 +5,7 @@ #define ACE_RMCAST_ACK_WORKER_H #include "ace/pre.h" -#include "RMCast_Retransmission.h" +#include "ace/RMCast/RMCast_Retransmission.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -40,7 +40,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Ack_Worker.i" +#include "ace/RMCast/RMCast_Ack_Worker.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_Copy_On_Write.cpp b/ace/RMCast/RMCast_Copy_On_Write.cpp index 39bf16f88a2..0406ef931e6 100644 --- a/ace/RMCast/RMCast_Copy_On_Write.cpp +++ b/ace/RMCast/RMCast_Copy_On_Write.cpp @@ -3,10 +3,10 @@ #ifndef ACE_RMCAST_COPY_ON_WRITE_CPP #define ACE_RMCAST_COPY_ON_WRITE_CPP -#include "RMCast_Copy_On_Write.h" +#include "ace/RMCast/RMCast_Copy_On_Write.h" #if ! defined (__ACE_INLINE__) -#include "RMCast_Copy_On_Write.i" +#include "ace/RMCast/RMCast_Copy_On_Write.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(RMCast, RMCast_Copy_On_Write, "$Id$") diff --git a/ace/RMCast/RMCast_Copy_On_Write.h b/ace/RMCast/RMCast_Copy_On_Write.h index 5efac63e80f..14ef5ed41b1 100644 --- a/ace/RMCast/RMCast_Copy_On_Write.h +++ b/ace/RMCast/RMCast_Copy_On_Write.h @@ -6,8 +6,8 @@ #define ACE_RMCAST_COPY_ON_WRITE_H #include "ace/pre.h" -#include "RMCast_Worker.h" -#include "ace/Synch.h" +#include "ace/RMCast/RMCast_Worker.h" +#include "ace/Threads/Synch.h" //! A wrapper to implement reference counted collections template<class COLLECTION, class ITERATOR> @@ -198,11 +198,11 @@ public: }; #if defined (__ACE_INLINE__) -#include "RMCast_Copy_On_Write.i" +#include "ace/RMCast/RMCast_Copy_On_Write.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "RMCast_Copy_On_Write.cpp" +#include "ace/RMCast/RMCast_Copy_On_Write.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/RMCast/RMCast_Fork.cpp b/ace/RMCast/RMCast_Fork.cpp index 928d34cb411..3dca1d49572 100644 --- a/ace/RMCast/RMCast_Fork.cpp +++ b/ace/RMCast/RMCast_Fork.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "RMCast_Fork.h" +#include "ace/RMCast/RMCast_Fork.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Fork.i" +# include "ace/RMCast/RMCast_Fork.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Fork, "$Id$") diff --git a/ace/RMCast/RMCast_Fork.h b/ace/RMCast/RMCast_Fork.h index 5fd216d68f3..fb4554c3930 100644 --- a/ace/RMCast/RMCast_Fork.h +++ b/ace/RMCast/RMCast_Fork.h @@ -5,7 +5,7 @@ #define ACE_RMCAST_FORK_H #include "ace/pre.h" -#include "RMCast_Module.h" +#include "ace/RMCast/RMCast_Module.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -48,7 +48,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Fork.i" +#include "ace/RMCast/RMCast_Fork.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_Fragment.cpp b/ace/RMCast/RMCast_Fragment.cpp index 2d4389c1a92..32202d6df37 100644 --- a/ace/RMCast/RMCast_Fragment.cpp +++ b/ace/RMCast/RMCast_Fragment.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "RMCast_Fragment.h" -#include "ace/Message_Block.h" +#include "ace/RMCast/RMCast_Fragment.h" +#include "ace/Utils/Message_Block.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (__ACE_INLINE__) -#include "RMCast_Fragment.i" +#include "ace/RMCast/RMCast_Fragment.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Fragment, "$Id$") diff --git a/ace/RMCast/RMCast_Fragment.h b/ace/RMCast/RMCast_Fragment.h index eed08c92517..fb171ee27ed 100644 --- a/ace/RMCast/RMCast_Fragment.h +++ b/ace/RMCast/RMCast_Fragment.h @@ -4,8 +4,8 @@ #define ACE_RMCAST_FRAGMENT_H #include "ace/pre.h" -#include "RMCast_Module.h" -#include "ace/Synch.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/Threads/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -55,7 +55,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Fragment.i" +#include "ace/RMCast/RMCast_Fragment.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_IO_UDP.cpp b/ace/RMCast/RMCast_IO_UDP.cpp index 1a2f00c1eca..1b342d10dda 100644 --- a/ace/RMCast/RMCast_IO_UDP.cpp +++ b/ace/RMCast/RMCast_IO_UDP.cpp @@ -2,16 +2,16 @@ // $Id$ // -#include "RMCast_IO_UDP.h" -#include "RMCast_UDP_Proxy.h" -#include "RMCast_Module_Factory.h" +#include "ace/RMCast/RMCast_IO_UDP.h" +#include "ace/RMCast/RMCast_UDP_Proxy.h" +#include "ace/RMCast/RMCast_Module_Factory.h" -#include "ace/Handle_Set.h" -#include "ace/Reactor.h" -#include "ace/Message_Block.h" +#include "ace/OS/Handle_Set.h" +#include "ace/Demux/Reactor.h" +#include "ace/Utils/Message_Block.h" #if !defined (__ACE_INLINE__) -# include "RMCast_IO_UDP.i" +# include "ace/RMCast/RMCast_IO_UDP.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_IO_UDP, "$Id$") diff --git a/ace/RMCast/RMCast_IO_UDP.h b/ace/RMCast/RMCast_IO_UDP.h index 7b9d2440517..a3ecaaf38ee 100644 --- a/ace/RMCast/RMCast_IO_UDP.h +++ b/ace/RMCast/RMCast_IO_UDP.h @@ -14,11 +14,11 @@ #define ACE_RMCAST_IO_UDP_H #include "ace/pre.h" -#include "RMCast_Module.h" -#include "ace/SOCK_Dgram_Mcast.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" -#include "ace/INET_Addr.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/Sockets/SOCK_Dgram_Mcast.h" +#include "ace/Utils/Hash_Map_Manager.h" +#include "ace/Threads/Synch.h" +#include "ace/IPC/INET_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -131,7 +131,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_IO_UDP.i" +#include "ace/RMCast/RMCast_IO_UDP.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_IO_UDP.i b/ace/RMCast/RMCast_IO_UDP.i index 99c1524d3a6..b203e118a4f 100644 --- a/ace/RMCast/RMCast_IO_UDP.i +++ b/ace/RMCast/RMCast_IO_UDP.i @@ -1,7 +1,7 @@ // $Id$ -#include "RMCast_UDP_Proxy.h" -#include "RMCast_Module_Factory.h" +#include "ace/RMCast/RMCast_UDP_Proxy.h" +#include "ace/RMCast/RMCast_Module_Factory.h" ACE_INLINE ACE_RMCast_IO_UDP:: diff --git a/ace/RMCast/RMCast_Membership.cpp b/ace/RMCast/RMCast_Membership.cpp index 91c9b1a9cea..b9f45528dc9 100644 --- a/ace/RMCast/RMCast_Membership.cpp +++ b/ace/RMCast/RMCast_Membership.cpp @@ -2,11 +2,11 @@ // $Id$ // -#include "RMCast_Membership.h" -#include "RMCast_Proxy.h" +#include "ace/RMCast/RMCast_Membership.h" +#include "ace/RMCast/RMCast_Proxy.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Membership.i" +# include "ace/RMCast/RMCast_Membership.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Membership, "$Id$") diff --git a/ace/RMCast/RMCast_Membership.h b/ace/RMCast/RMCast_Membership.h index 07f9aab593c..ad84ee7c64c 100644 --- a/ace/RMCast/RMCast_Membership.h +++ b/ace/RMCast/RMCast_Membership.h @@ -18,9 +18,9 @@ #define ACE_RMCAST_MEMBERSHIP_H #include "ace/pre.h" -#include "RMCast_Module.h" -#include "ace/Containers.h" -#include "ace/Synch.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/Utils/Containers.h" +#include "ace/Threads/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -96,7 +96,7 @@ protected: }; #if defined (__ACE_INLINE__) -#include "RMCast_Membership.i" +#include "ace/RMCast/RMCast_Membership.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_Module.cpp b/ace/RMCast/RMCast_Module.cpp index 727ef631d9d..a3d9d8064a2 100644 --- a/ace/RMCast/RMCast_Module.cpp +++ b/ace/RMCast/RMCast_Module.cpp @@ -2,10 +2,10 @@ // $Id$ // -#include "RMCast_Module.h" +#include "ace/RMCast/RMCast_Module.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Module.i" +# include "ace/RMCast/RMCast_Module.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Module, "$Id$") diff --git a/ace/RMCast/RMCast_Module.h b/ace/RMCast/RMCast_Module.h index d362dac2366..e5217d3d525 100644 --- a/ace/RMCast/RMCast_Module.h +++ b/ace/RMCast/RMCast_Module.h @@ -18,7 +18,7 @@ #define ACE_RMCAST_MODULE_H #include "ace/pre.h" -#include "RMCast.h" +#include "ace/RMCast/RMCast.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -81,7 +81,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Module.i" +#include "ace/RMCast/RMCast_Module.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_Partial_Message.cpp b/ace/RMCast/RMCast_Partial_Message.cpp index 5de2e660a11..4e1c9807d5e 100644 --- a/ace/RMCast/RMCast_Partial_Message.cpp +++ b/ace/RMCast/RMCast_Partial_Message.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "RMCast_Partial_Message.h" +#include "ace/RMCast/RMCast_Partial_Message.h" #if !defined (__ACE_INLINE__) -#include "RMCast_Partial_Message.i" +#include "ace/RMCast/RMCast_Partial_Message.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Partial_Message, "$Id$") diff --git a/ace/RMCast/RMCast_Partial_Message.h b/ace/RMCast/RMCast_Partial_Message.h index 88fa9ab2f1a..88343146133 100644 --- a/ace/RMCast/RMCast_Partial_Message.h +++ b/ace/RMCast/RMCast_Partial_Message.h @@ -15,8 +15,8 @@ #define ACE_RMCAST_PARTIAL_MESSAGE_H #include "ace/pre.h" -#include "RMCast_Export.h" -#include "ace/Task.h" +#include "ace/RMCast/RMCast_Export.h" +#include "ace/Streams/Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -95,7 +95,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Partial_Message.i" +#include "ace/RMCast/RMCast_Partial_Message.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_Proxy.cpp b/ace/RMCast/RMCast_Proxy.cpp index 2257f9a2bd7..c2e20ffdd41 100644 --- a/ace/RMCast/RMCast_Proxy.cpp +++ b/ace/RMCast/RMCast_Proxy.cpp @@ -2,10 +2,10 @@ // $Id$ // -#include "RMCast_Proxy.h" +#include "ace/RMCast/RMCast_Proxy.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Proxy.i" +# include "ace/RMCast/RMCast_Proxy.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Proxy, "$Id$") diff --git a/ace/RMCast/RMCast_Proxy.h b/ace/RMCast/RMCast_Proxy.h index d774efe4b2c..eaf5b782944 100644 --- a/ace/RMCast/RMCast_Proxy.h +++ b/ace/RMCast/RMCast_Proxy.h @@ -18,7 +18,7 @@ #define ACE_RMCAST_PROXY_H #include "ace/pre.h" -#include "RMCast_Module.h" +#include "ace/RMCast/RMCast_Module.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -95,7 +95,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Proxy.i" +#include "ace/RMCast/RMCast_Proxy.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_Reassembly.cpp b/ace/RMCast/RMCast_Reassembly.cpp index d20b72d88c5..15eca429349 100644 --- a/ace/RMCast/RMCast_Reassembly.cpp +++ b/ace/RMCast/RMCast_Reassembly.cpp @@ -1,15 +1,15 @@ // $Id$ -#include "RMCast_Reassembly.h" -#include "RMCast_Partial_Message.h" -#include "ace/Message_Block.h" +#include "ace/RMCast/RMCast_Reassembly.h" +#include "ace/RMCast/RMCast_Partial_Message.h" +#include "ace/Utils/Message_Block.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (__ACE_INLINE__) -#include "RMCast_Reassembly.i" +#include "ace/RMCast/RMCast_Reassembly.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Reassembly, "$Id$") diff --git a/ace/RMCast/RMCast_Reassembly.h b/ace/RMCast/RMCast_Reassembly.h index a9ebb480ac3..0ea77a39d54 100644 --- a/ace/RMCast/RMCast_Reassembly.h +++ b/ace/RMCast/RMCast_Reassembly.h @@ -14,9 +14,9 @@ #define ACE_RMCAST_REASSEMBLY_H #include "ace/pre.h" -#include "RMCast_Module.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/Utils/Hash_Map_Manager.h" +#include "ace/Threads/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -66,7 +66,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Reassembly.i" +#include "ace/RMCast/RMCast_Reassembly.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_Receiver_Module.cpp b/ace/RMCast/RMCast_Receiver_Module.cpp index 2d08ca4bb02..177725d915b 100644 --- a/ace/RMCast/RMCast_Receiver_Module.cpp +++ b/ace/RMCast/RMCast_Receiver_Module.cpp @@ -2,12 +2,15 @@ // $Id$ // -#include "RMCast_Receiver_Module.h" -#include "RMCast_Proxy.h" -#include "ace/Log_Msg.h" +#include "ace/RMCast/RMCast_Receiver_Module.h" +#include "ace/RMCast/RMCast_Proxy.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if !defined (__ACE_INLINE__) -# include "RMCast_Receiver_Module.i" +# include "ace/RMCast/RMCast_Receiver_Module.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Receiver_Module, "$Id$") diff --git a/ace/RMCast/RMCast_Receiver_Module.h b/ace/RMCast/RMCast_Receiver_Module.h index 35ae8c642c7..09c7c784c5a 100644 --- a/ace/RMCast/RMCast_Receiver_Module.h +++ b/ace/RMCast/RMCast_Receiver_Module.h @@ -15,7 +15,7 @@ #define ACE_RMCAST_RECEIVER_MODULE_H #include "ace/pre.h" -#include "RMCast_Module.h" +#include "ace/RMCast/RMCast_Module.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -101,7 +101,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Receiver_Module.i" +#include "ace/RMCast/RMCast_Receiver_Module.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_Reliable_Factory.cpp b/ace/RMCast/RMCast_Reliable_Factory.cpp index 6140c685153..ea392928dbc 100644 --- a/ace/RMCast/RMCast_Reliable_Factory.cpp +++ b/ace/RMCast/RMCast_Reliable_Factory.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "RMCast_Reliable_Factory.h" -#include "RMCast_Receiver_Module.h" -#include "RMCast_Reassembly.h" -#include "RMCast_Reordering.h" +#include "ace/RMCast/RMCast_Reliable_Factory.h" +#include "ace/RMCast/RMCast_Receiver_Module.h" +#include "ace/RMCast/RMCast_Reassembly.h" +#include "ace/RMCast/RMCast_Reordering.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Reliable_Factory.i" +# include "ace/RMCast/RMCast_Reliable_Factory.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Reliable_Factory, "$Id$") diff --git a/ace/RMCast/RMCast_Reliable_Factory.h b/ace/RMCast/RMCast_Reliable_Factory.h index e41c7fd9e74..e1c616ff892 100644 --- a/ace/RMCast/RMCast_Reliable_Factory.h +++ b/ace/RMCast/RMCast_Reliable_Factory.h @@ -18,7 +18,7 @@ #define ACE_RMCAST_RELIABLE_FACTORY_H #include "ace/pre.h" -#include "RMCast_Module_Factory.h" +#include "ace/RMCast/RMCast_Module_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -53,7 +53,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Reliable_Factory.i" +#include "ace/RMCast/RMCast_Reliable_Factory.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_Reordering.cpp b/ace/RMCast/RMCast_Reordering.cpp index 5a81a360783..33233669908 100644 --- a/ace/RMCast/RMCast_Reordering.cpp +++ b/ace/RMCast/RMCast_Reordering.cpp @@ -2,12 +2,12 @@ // $Id$ // -#include "RMCast_Reordering.h" -#include "RMCast_Proxy.h" -#include "ace/Message_Block.h" +#include "ace/RMCast/RMCast_Reordering.h" +#include "ace/RMCast/RMCast_Proxy.h" +#include "ace/Utils/Message_Block.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Reordering.i" +# include "ace/RMCast/RMCast_Reordering.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Reordering, "$Id$") diff --git a/ace/RMCast/RMCast_Reordering.h b/ace/RMCast/RMCast_Reordering.h index 5647e35a585..1daf8957775 100644 --- a/ace/RMCast/RMCast_Reordering.h +++ b/ace/RMCast/RMCast_Reordering.h @@ -15,9 +15,9 @@ #define ACE_RMCAST_REORDERING_H #include "ace/pre.h" -#include "RMCast_Module.h" -#include "ace/RB_Tree.h" -#include "ace/Synch.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/Utils/Templates/RB_Tree.h" +#include "ace/Threads/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -89,7 +89,7 @@ protected: }; #if defined (__ACE_INLINE__) -#include "RMCast_Reordering.i" +#include "ace/RMCast/RMCast_Reordering.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_Resend_Handler.cpp b/ace/RMCast/RMCast_Resend_Handler.cpp index c8597b301f0..11ece87106f 100644 --- a/ace/RMCast/RMCast_Resend_Handler.cpp +++ b/ace/RMCast/RMCast_Resend_Handler.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "RMCast_Resend_Handler.h" -#include "RMCast_Retransmission.h" +#include "ace/RMCast/RMCast_Resend_Handler.h" +#include "ace/RMCast/RMCast_Retransmission.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Resend_Handler.i" +# include "ace/RMCast/RMCast_Resend_Handler.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Resend_Handler, "$Id$") diff --git a/ace/RMCast/RMCast_Resend_Handler.h b/ace/RMCast/RMCast_Resend_Handler.h index 0d2ec0fe13c..7cf3ae1e011 100644 --- a/ace/RMCast/RMCast_Resend_Handler.h +++ b/ace/RMCast/RMCast_Resend_Handler.h @@ -4,8 +4,8 @@ #define ACE_RMCAST_RESEND_HANDLER_H #include "ace/pre.h" -#include "RMCast_Export.h" -#include "ace/Event_Handler.h" +#include "ace/RMCast/RMCast_Export.h" +#include "ace/Demux/Event_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +37,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Resend_Handler.i" +#include "ace/RMCast/RMCast_Resend_Handler.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_Resend_Worker.cpp b/ace/RMCast/RMCast_Resend_Worker.cpp index a4acbeff0cd..a50ce7164d9 100644 --- a/ace/RMCast/RMCast_Resend_Worker.cpp +++ b/ace/RMCast/RMCast_Resend_Worker.cpp @@ -2,11 +2,11 @@ // $Id$ // -#include "RMCast_Resend_Worker.h" -#include "RMCast_Module.h" +#include "ace/RMCast/RMCast_Resend_Worker.h" +#include "ace/RMCast/RMCast_Module.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Resend_Worker.i" +# include "ace/RMCast/RMCast_Resend_Worker.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Resend_Worker, "$Id$") diff --git a/ace/RMCast/RMCast_Resend_Worker.h b/ace/RMCast/RMCast_Resend_Worker.h index 03fd81e2a05..14c57eb99ab 100644 --- a/ace/RMCast/RMCast_Resend_Worker.h +++ b/ace/RMCast/RMCast_Resend_Worker.h @@ -5,8 +5,8 @@ #define ACE_RMCAST_RESEND_WORKER_H #include "ace/pre.h" -#include "RMCast.h" -#include "RMCast_Copy_On_Write.h" +#include "ace/RMCast/RMCast.h" +#include "ace/RMCast/RMCast_Copy_On_Write.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -42,7 +42,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Resend_Worker.i" +#include "ace/RMCast/RMCast_Resend_Worker.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_Retransmission.cpp b/ace/RMCast/RMCast_Retransmission.cpp index 7b626a4ef7d..69a1f8e33ad 100644 --- a/ace/RMCast/RMCast_Retransmission.cpp +++ b/ace/RMCast/RMCast_Retransmission.cpp @@ -2,14 +2,14 @@ // $Id$ // -#include "RMCast_Retransmission.h" -#include "RMCast_Proxy.h" -#include "RMCast_Ack_Worker.h" -#include "RMCast_Resend_Worker.h" -#include "ace/Message_Block.h" +#include "ace/RMCast/RMCast_Retransmission.h" +#include "ace/RMCast/RMCast_Proxy.h" +#include "ace/RMCast/RMCast_Ack_Worker.h" +#include "ace/RMCast/RMCast_Resend_Worker.h" +#include "ace/Utils/Message_Block.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Retransmission.i" +# include "ace/RMCast/RMCast_Retransmission.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Retransmission, "$Id$") diff --git a/ace/RMCast/RMCast_Retransmission.h b/ace/RMCast/RMCast_Retransmission.h index 89b431917b3..3bc6858460a 100644 --- a/ace/RMCast/RMCast_Retransmission.h +++ b/ace/RMCast/RMCast_Retransmission.h @@ -18,10 +18,10 @@ #define ACE_RMCAST_RETRANSMISSION_H #include "ace/pre.h" -#include "RMCast_Module.h" -#include "RMCast_Copy_On_Write.h" -#include "ace/RB_Tree.h" -#include "ace/Synch.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/RMCast/RMCast_Copy_On_Write.h" +#include "ace/Utils/Templates/RB_Tree.h" +#include "ace/Threads/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -113,7 +113,7 @@ protected: }; #if defined (__ACE_INLINE__) -#include "RMCast_Retransmission.i" +#include "ace/RMCast/RMCast_Retransmission.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_Sequencer.cpp b/ace/RMCast/RMCast_Sequencer.cpp index f8bc0e6c57d..82ccbdedb04 100644 --- a/ace/RMCast/RMCast_Sequencer.cpp +++ b/ace/RMCast/RMCast_Sequencer.cpp @@ -2,10 +2,10 @@ // $Id$ // -#include "RMCast_Sequencer.h" +#include "ace/RMCast/RMCast_Sequencer.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Sequencer.i" +# include "ace/RMCast/RMCast_Sequencer.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Sequencer, "$Id$") diff --git a/ace/RMCast/RMCast_Sequencer.h b/ace/RMCast/RMCast_Sequencer.h index 321d778853e..88e4d232692 100644 --- a/ace/RMCast/RMCast_Sequencer.h +++ b/ace/RMCast/RMCast_Sequencer.h @@ -15,8 +15,8 @@ #define ACE_RMCAST_SEQUENCER_H #include "ace/pre.h" -#include "RMCast_Module.h" -#include "ace/Synch.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/Threads/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -47,7 +47,7 @@ protected: }; #if defined (__ACE_INLINE__) -#include "RMCast_Sequencer.i" +#include "ace/RMCast/RMCast_Sequencer.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_UDP_Event_Handler.cpp b/ace/RMCast/RMCast_UDP_Event_Handler.cpp index 963928845f7..2c1ca016546 100644 --- a/ace/RMCast/RMCast_UDP_Event_Handler.cpp +++ b/ace/RMCast/RMCast_UDP_Event_Handler.cpp @@ -2,11 +2,11 @@ // $Id$ // -#include "RMCast_UDP_Event_Handler.h" -#include "RMCast_IO_UDP.h" +#include "ace/RMCast/RMCast_UDP_Event_Handler.h" +#include "ace/RMCast/RMCast_IO_UDP.h" #if !defined (__ACE_INLINE__) -# include "RMCast_UDP_Event_Handler.i" +# include "ace/RMCast/RMCast_UDP_Event_Handler.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_UDP_Event_Handler, "$Id$") diff --git a/ace/RMCast/RMCast_UDP_Event_Handler.h b/ace/RMCast/RMCast_UDP_Event_Handler.h index 2a6e7c45d42..69bdd86606d 100644 --- a/ace/RMCast/RMCast_UDP_Event_Handler.h +++ b/ace/RMCast/RMCast_UDP_Event_Handler.h @@ -4,8 +4,8 @@ #define ACE_RMCAST_UDP_EVENT_HANDLER_H #include "ace/pre.h" -#include "RMCast_Export.h" -#include "ace/Event_Handler.h" +#include "ace/RMCast/RMCast_Export.h" +#include "ace/Demux/Event_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -52,7 +52,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_UDP_Event_Handler.i" +#include "ace/RMCast/RMCast_UDP_Event_Handler.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_UDP_Proxy.cpp b/ace/RMCast/RMCast_UDP_Proxy.cpp index c84b8c0f2ef..75cbe45674d 100644 --- a/ace/RMCast/RMCast_UDP_Proxy.cpp +++ b/ace/RMCast/RMCast_UDP_Proxy.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "RMCast_UDP_Proxy.h" -#include "RMCast_Module.h" -#include "RMCast_IO_UDP.h" -#include "ace/Message_Block.h" +#include "ace/RMCast/RMCast_UDP_Proxy.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/RMCast/RMCast_IO_UDP.h" +#include "ace/Utils/Message_Block.h" #if !defined (__ACE_INLINE__) -# include "RMCast_UDP_Proxy.i" +# include "ace/RMCast/RMCast_UDP_Proxy.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_UDP_Proxy, "$Id$") diff --git a/ace/RMCast/RMCast_UDP_Proxy.h b/ace/RMCast/RMCast_UDP_Proxy.h index f1a7f77a25a..7f343aded02 100644 --- a/ace/RMCast/RMCast_UDP_Proxy.h +++ b/ace/RMCast/RMCast_UDP_Proxy.h @@ -18,13 +18,13 @@ #define ACE_RMCAST_UDP_PROXY_H #include "ace/pre.h" -#include "RMCast_Proxy.h" +#include "ace/RMCast/RMCast_Proxy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/INET_Addr.h" +#include "ace/IPC/INET_Addr.h" class ACE_RMCast_IO_UDP; @@ -81,7 +81,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_UDP_Proxy.i" +#include "ace/RMCast/RMCast_UDP_Proxy.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp b/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp index 9057281cc52..480d400a8e9 100644 --- a/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp +++ b/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "RMCast_UDP_Reliable_Receiver.h" -#include "RMCast_UDP_Event_Handler.h" -#include "ace/Reactor.h" +#include "ace/RMCast/RMCast_UDP_Reliable_Receiver.h" +#include "ace/RMCast/RMCast_UDP_Event_Handler.h" +#include "ace/Demux/Reactor.h" #if !defined (__ACE_INLINE__) -# include "RMCast_UDP_Reliable_Receiver.i" +# include "ace/RMCast/RMCast_UDP_Reliable_Receiver.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_UDP_Reliable_Receiver, "$Id$") diff --git a/ace/RMCast/RMCast_UDP_Reliable_Receiver.h b/ace/RMCast/RMCast_UDP_Reliable_Receiver.h index 902da503737..175613eb0df 100644 --- a/ace/RMCast/RMCast_UDP_Reliable_Receiver.h +++ b/ace/RMCast/RMCast_UDP_Reliable_Receiver.h @@ -5,9 +5,9 @@ #define ACE_RMCAST_UDP_RELIABLE_RECEIVER_H #include "ace/pre.h" -#include "RMCast_Singleton_Factory.h" -#include "RMCast_Reliable_Factory.h" -#include "RMCast_IO_UDP.h" +#include "ace/RMCast/RMCast_Singleton_Factory.h" +#include "ace/RMCast/RMCast_Reliable_Factory.h" +#include "ace/RMCast/RMCast_IO_UDP.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -42,7 +42,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_UDP_Reliable_Receiver.i" +#include "ace/RMCast/RMCast_UDP_Reliable_Receiver.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp b/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp index befab142320..2b197692e3e 100644 --- a/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp +++ b/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "RMCast_UDP_Reliable_Sender.h" -#include "RMCast_UDP_Event_Handler.h" -#include "RMCast_Resend_Handler.h" -#include "ace/Reactor.h" +#include "ace/RMCast/RMCast_UDP_Reliable_Sender.h" +#include "ace/RMCast/RMCast_UDP_Event_Handler.h" +#include "ace/RMCast/RMCast_Resend_Handler.h" +#include "ace/Demux/Reactor.h" #if !defined (__ACE_INLINE__) -# include "RMCast_UDP_Reliable_Sender.i" +# include "ace/RMCast/RMCast_UDP_Reliable_Sender.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_UDP_Reliable_Sender, "$Id$") diff --git a/ace/RMCast/RMCast_UDP_Reliable_Sender.h b/ace/RMCast/RMCast_UDP_Reliable_Sender.h index 488859a8e2f..5f510686f22 100644 --- a/ace/RMCast/RMCast_UDP_Reliable_Sender.h +++ b/ace/RMCast/RMCast_UDP_Reliable_Sender.h @@ -5,13 +5,13 @@ #define ACE_RMCAST_UDP_RELIABLE_SENDER_H #include "ace/pre.h" -#include "RMCast_Singleton_Factory.h" -#include "RMCast_IO_UDP.h" -#include "RMCast_Sequencer.h" -#include "RMCast_Retransmission.h" -#include "RMCast_Membership.h" -#include "RMCast_Fragment.h" -#include "RMCast_Fork.h" +#include "ace/RMCast/RMCast_Singleton_Factory.h" +#include "ace/RMCast/RMCast_IO_UDP.h" +#include "ace/RMCast/RMCast_Sequencer.h" +#include "ace/RMCast/RMCast_Retransmission.h" +#include "ace/RMCast/RMCast_Membership.h" +#include "ace/RMCast/RMCast_Fragment.h" +#include "ace/RMCast/RMCast_Fork.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -71,7 +71,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_UDP_Reliable_Sender.i" +#include "ace/RMCast/RMCast_UDP_Reliable_Sender.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/SSL/Makefile b/ace/SSL/Makefile index 2978731a5fb..ce7a6456284 100644 --- a/ace/SSL/Makefile +++ b/ace/SSL/Makefile @@ -1,847 +1,56 @@ -#---------------------------------------------------------------------------- -# # $Id$ -# -#---------------------------------------------------------------------------- -ifndef ACE_ROOT -default: - @echo 'You must set ACE_ROOT' -endif # ! ACE_ROOT +#---------------------------------------------------------------------------- +# Makefile for the libACE_OS +#---------------------------------------------------------------------------- MAKEFILE = Makefile -LIBNAME = libACE_SSL -LIB = $(LIBNAME).a -SHLIB = $(LIBNAME).$(SOEXT) +LIBOS = libACE_SSL +LIB = $(LIBOS).a +SHLIB = $(LIBOS).$(SOEXT) -FILES = \ - SSL_Context \ - SSL_SOCK \ - SSL_SOCK_Acceptor \ - SSL_SOCK_Connector \ - SSL_SOCK_Stream \ - SSL_Asynch_Stream \ - SSL_Asynch_BIO -LSRC = $(addsuffix .cpp,$(FILES)) +FILES = \ + SSL_Asynch_BIO\ + SSL_Asynch_Stream\ + SSL_Context\ + SSL_SOCK\ + SSL_SOCK_Acceptor\ + SSL_SOCK_Connector\ + SSL_SOCK_Stream #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU + +#### +#### ACE_COMPONENTS support. +#### +LSRC = $(addsuffix .cpp,$(FILES)) + include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +INSTALL = + +clean: + $(RM) -f $(LIBOS).a $(LIBOS).so + #---------------------------------------------------------------------------- -# Local targets (and local hacks) +# Local targets #---------------------------------------------------------------------------- -ifeq ($(HPUX_VERS),) -ACE_SHLIBS = -lACE -lssl -lcrypto -endif # HPUX_VERS + #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- - # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/SSL_Context.o .obj/SSL_Context.so .shobj/SSL_Context.o .shobj/SSL_Context.so: SSL_Context.cpp SSL_Context.h \ - $(ACE_ROOT)/ace/pre.h \ - SSL_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - SSL_Context.inl sslconf.h - -.obj/SSL_SOCK.o .obj/SSL_SOCK.so .shobj/SSL_SOCK.o .shobj/SSL_SOCK.so: SSL_SOCK.cpp SSL_SOCK.h \ - $(ACE_ROOT)/ace/pre.h \ - SSL_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - SSL_SOCK.i - -.obj/SSL_SOCK_Acceptor.o .obj/SSL_SOCK_Acceptor.so .shobj/SSL_SOCK_Acceptor.o .shobj/SSL_SOCK_Acceptor.so: SSL_SOCK_Acceptor.cpp SSL_SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/pre.h \ - SSL_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - SSL_SOCK_Stream.h SSL_SOCK.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - SSL_SOCK.i SSL_Context.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - SSL_Context.inl \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - SSL_SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/OS_QoS.h \ - SSL_SOCK_Acceptor.i - -.obj/SSL_SOCK_Connector.o .obj/SSL_SOCK_Connector.so .shobj/SSL_SOCK_Connector.o .shobj/SSL_SOCK_Connector.so: SSL_SOCK_Connector.cpp SSL_SOCK_Connector.h \ - $(ACE_ROOT)/ace/pre.h \ - SSL_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - SSL_SOCK_Stream.h SSL_SOCK.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - SSL_SOCK.i SSL_Context.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - SSL_Context.inl \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - SSL_SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/OS_QoS.h \ - SSL_SOCK_Connector.i - -.obj/SSL_SOCK_Stream.o .obj/SSL_SOCK_Stream.so .shobj/SSL_SOCK_Stream.o .shobj/SSL_SOCK_Stream.so: SSL_SOCK_Stream.cpp \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - SSL_SOCK_Stream.h SSL_Export.h SSL_SOCK.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - SSL_SOCK.i SSL_Context.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - SSL_Context.inl \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - SSL_SOCK_Stream.i - -.obj/SSL_Asynch_Stream.o .obj/SSL_Asynch_Stream.so .shobj/SSL_Asynch_Stream.o .shobj/SSL_Asynch_Stream.so: SSL_Asynch_Stream.cpp SSL_Asynch_Stream.h \ - $(ACE_ROOT)/ace/pre.h \ - SSL_Context.h SSL_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - SSL_Context.inl \ - $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ - $(ACE_ROOT)/ace/Asynch_IO.h \ - $(ACE_ROOT)/ace/Asynch_IO_Impl.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - SSL_Asynch_BIO.h \ - $(ACE_ROOT)/ace/POSIX_Proactor.h \ - $(ACE_ROOT)/ace/Proactor_Impl.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/POSIX_Asynch_IO.h \ - $(ACE_ROOT)/ace/POSIX_Asynch_IO.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/POSIX_Proactor.i \ - $(ACE_ROOT)/ace/Proactor.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Timer_List.h \ - $(ACE_ROOT)/ace/Timer_List_T.h \ - $(ACE_ROOT)/ace/Timer_List_T.cpp \ - $(ACE_ROOT)/ace/Timer_Heap.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ - $(ACE_ROOT)/ace/Timer_Wheel.h \ - $(ACE_ROOT)/ace/Timer_Wheel_T.h \ - $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \ - $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Proactor.i - -.obj/SSL_Asynch_BIO.o .obj/SSL_Asynch_BIO.so .shobj/SSL_Asynch_BIO.o .shobj/SSL_Asynch_BIO.so: SSL_Asynch_BIO.cpp SSL_Asynch_BIO.h \ - $(ACE_ROOT)/ace/pre.h \ - SSL_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - SSL_Asynch_Stream.h SSL_Context.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - SSL_Context.inl \ - $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ - $(ACE_ROOT)/ace/Asynch_IO.h \ - $(ACE_ROOT)/ace/Asynch_IO_Impl.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ace/SSL/SSL_Asynch_Stream.cpp b/ace/SSL/SSL_Asynch_Stream.cpp index cbf26b3d5a1..233a27ddebe 100644 --- a/ace/SSL/SSL_Asynch_Stream.cpp +++ b/ace/SSL/SSL_Asynch_Stream.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "SSL_Asynch_Stream.h" +#include "ace/SSL/SSL_Asynch_Stream.h" ACE_RCSID (ACE_SSL, SSL_Asynch_Stream, @@ -28,11 +28,11 @@ ACE_RCSID (ACE_SSL, # define ERR_CANCELED ECANCELED -# include "ace/POSIX_Proactor.h" +# include "ace/Demux/POSIX_Proactor.h" #endif /* ACE_WIN32 */ -#include "ace/Proactor.h" +#include "ace/Demux/Proactor.h" #include <openssl/err.h> diff --git a/ace/SSL/SSL_Asynch_Stream.h b/ace/SSL/SSL_Asynch_Stream.h index 8e90b33b7b7..bea4cd13646 100644 --- a/ace/SSL/SSL_Asynch_Stream.h +++ b/ace/SSL/SSL_Asynch_Stream.h @@ -15,7 +15,7 @@ #define ACE_SSL_ASYNCH_STREAM_H #include "ace/pre.h" -#include "SSL_Context.h" +#include "ace/SSL/SSL_Context.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -23,10 +23,10 @@ #if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) -#include "ace/Asynch_IO_Impl.h" -#include "ace/Message_Block.h" +#include "ace/Connection/Asynch_IO_Impl.h" +#include "ace/Utils/Message_Block.h" -#include "SSL_Asynch_BIO.h" +#include "ace/SSL/SSL_Asynch_BIO.h" extern "C" { diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp index bebea766fae..e5f78331a9d 100644 --- a/ace/SSL/SSL_Context.cpp +++ b/ace/SSL/SSL_Context.cpp @@ -1,16 +1,19 @@ // -*- C++ -*- -#include "SSL_Context.h" +#include "ace/SSL/SSL_Context.h" -#include "sslconf.h" +#include "ace/SSL/sslconf.h" #if !defined(__ACE_INLINE__) -#include "SSL_Context.inl" +#include "ace/SSL/SSL_Context.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Synch.h" -#include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" +#include "ace/Threads/Synch.h" +#include "ace/Utils/Object_Manager.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #include <openssl/x509.h> #include <openssl/err.h> @@ -68,12 +71,17 @@ ACE_SSL_Context::ssl_library_init (void) { // rwlock_init(&(ACE_SSL_Context::lock_[i]), USYNC_THREAD, // 0); +#ifdef ACE_SUBSET_0 if (ACE_OS::mutex_init (&(ACE_SSL_Context::lock_[i]), USYNC_THREAD) != 0) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ACE_SSL_Context::ssl_library_init ") ACE_TEXT ("- %p\n"), - ACE_TEXT ("mutex_init"))); + ACE_TEXT ("mutex_init"))) +#else + ACE_OS::mutex_init (&(ACE_SSL_Context::lock_[i]), + USYNC_THREAD); +#endif } # if !defined (WIN32) @@ -427,10 +435,12 @@ ACE_SSL_Context::report_error (unsigned long error_code) (void) ::ERR_error_string (error_code, error_string); +#ifdef ACE_SUBSET_0 ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_SSL (%P|%t) error code: %u - %s\n"), error_code, error_string)); +#endif } void diff --git a/ace/SSL/SSL_Context.h b/ace/SSL/SSL_Context.h index 34f8af5ec91..f45624d637f 100644 --- a/ace/SSL/SSL_Context.h +++ b/ace/SSL/SSL_Context.h @@ -16,15 +16,15 @@ #include "ace/pre.h" -#include "SSL_Export.h" +#include "ace/SSL/SSL_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/SString.h" -#include "ace/Singleton.h" -#include "ace/Synch.h" +#include "ace/Utils/SString.h" +#include "ace/Utils/Templates/Singleton.h" +#include "ace/Threads/Synch.h" #include <openssl/ssl.h> diff --git a/ace/SSL/SSL_SOCK.cpp b/ace/SSL/SSL_SOCK.cpp index 4a2f37e3fc1..276655e8ffb 100644 --- a/ace/SSL/SSL_SOCK.cpp +++ b/ace/SSL/SSL_SOCK.cpp @@ -3,10 +3,10 @@ // $Id$ -#include "SSL_SOCK.h" +#include "ace/SSL/SSL_SOCK.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK.i" +#include "ace/SSL/SSL_SOCK.i" #endif ACE_RCSID (ACE_SSL, diff --git a/ace/SSL/SSL_SOCK.h b/ace/SSL/SSL_SOCK.h index 17a8e6c50bd..a00fdb319db 100644 --- a/ace/SSL/SSL_SOCK.h +++ b/ace/SSL/SSL_SOCK.h @@ -16,13 +16,13 @@ #include "ace/pre.h" -#include "SSL_Export.h" +#include "ace/SSL/SSL_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/SOCK.h" +#include "ace/Sockets/SOCK.h" #if defined (ACE_HAS_TEMPLATE_TYPEDEFS) # define ACE_SSL_SOCK_ACCEPTOR ACE_SSL_SOCK_Acceptor @@ -82,7 +82,7 @@ protected: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK.i" +#include "ace/SSL/SSL_SOCK.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ #include "ace/post.h" diff --git a/ace/SSL/SSL_SOCK_Acceptor.cpp b/ace/SSL/SSL_SOCK_Acceptor.cpp index 92b6ab7da76..7430d28f65d 100644 --- a/ace/SSL/SSL_SOCK_Acceptor.cpp +++ b/ace/SSL/SSL_SOCK_Acceptor.cpp @@ -3,16 +3,19 @@ // $Id$ -#include "SSL_SOCK_Acceptor.h" +#include "ace/SSL/SSL_SOCK_Acceptor.h" -#include "ace/Handle_Set.h" -#include "ace/OS_Errno.h" -#include "ace/Log_Msg.h" +#include "ace/OS/Handle_Set.h" +#include "ace/OS/OS_Errno.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Acceptor) #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK_Acceptor.i" +#include "ace/SSL/SSL_SOCK_Acceptor.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ ACE_RCSID (ACE_SSL, diff --git a/ace/SSL/SSL_SOCK_Acceptor.h b/ace/SSL/SSL_SOCK_Acceptor.h index 12262c57355..bd3b43b8369 100644 --- a/ace/SSL/SSL_SOCK_Acceptor.h +++ b/ace/SSL/SSL_SOCK_Acceptor.h @@ -18,16 +18,16 @@ #include "ace/pre.h" -#include "SSL_Export.h" +#include "ace/SSL/SSL_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSL_SOCK_Stream.h" +#include "ace/SSL/SSL_SOCK_Stream.h" -#include "ace/SOCK_Acceptor.h" -#include "ace/OS_QoS.h" +#include "ace/Sockets/SOCK_Acceptor.h" +#include "ace/OS/OS_QoS.h" /** * @class ACE_SSL_SOCK_Acceptor @@ -186,7 +186,7 @@ private: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK_Acceptor.i" +#include "ace/SSL/SSL_SOCK_Acceptor.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ #include "ace/post.h" diff --git a/ace/SSL/SSL_SOCK_Connector.cpp b/ace/SSL/SSL_SOCK_Connector.cpp index 3ee84bcaaa6..2dddcf6f761 100644 --- a/ace/SSL/SSL_SOCK_Connector.cpp +++ b/ace/SSL/SSL_SOCK_Connector.cpp @@ -1,17 +1,20 @@ // -*- C++ -*- // $Id$ -#include "SSL_SOCK_Connector.h" +#include "ace/SSL/SSL_SOCK_Connector.h" -#include "ace/Handle_Set.h" -#include "ace/INET_Addr.h" -#include "ace/Synch_T.h" +#include "ace/OS/Handle_Set.h" +#include "ace/IPC/INET_Addr.h" +#include "ace/Threads/Synch_T.h" + +#ifdef ACE_SUBSET_0 #include "ace/Log_Msg.h" +#endif #include <openssl/err.h> #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK_Connector.i" +#include "ace/SSL/SSL_SOCK_Connector.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ ACE_RCSID (ACE_SSL, diff --git a/ace/SSL/SSL_SOCK_Connector.h b/ace/SSL/SSL_SOCK_Connector.h index 0f935a75332..fcd4fa0302d 100644 --- a/ace/SSL/SSL_SOCK_Connector.h +++ b/ace/SSL/SSL_SOCK_Connector.h @@ -19,16 +19,16 @@ #include "ace/pre.h" -#include "SSL_Export.h" +#include "ace/SSL/SSL_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSL_SOCK_Stream.h" +#include "ace/SSL/SSL_SOCK_Stream.h" -#include "ace/SOCK_Connector.h" -#include "ace/OS_QoS.h" +#include "ace/Sockets/SOCK_Connector.h" +#include "ace/OS/OS_QoS.h" /** * @class ACE_SSL_SOCK_Connector @@ -210,7 +210,7 @@ private: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK_Connector.i" +#include "ace/SSL/SSL_SOCK_Connector.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ #include "ace/post.h" diff --git a/ace/SSL/SSL_SOCK_Stream.cpp b/ace/SSL/SSL_SOCK_Stream.cpp index 5030e37ae3a..7cd912fbde0 100644 --- a/ace/SSL/SSL_SOCK_Stream.cpp +++ b/ace/SSL/SSL_SOCK_Stream.cpp @@ -2,15 +2,18 @@ // // $Id$ -#include "ace/Handle_Set.h" -#include "ace/Log_Msg.h" +#include "ace/OS/Handle_Set.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #include <openssl/err.h> -#include "SSL_SOCK_Stream.h" +#include "ace/SSL/SSL_SOCK_Stream.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK_Stream.i" +#include "ace/SSL/SSL_SOCK_Stream.i" #endif ACE_RCSID (ACE_SSL, diff --git a/ace/SSL/SSL_SOCK_Stream.h b/ace/SSL/SSL_SOCK_Stream.h index 1438451e6f5..6fec1579ffa 100644 --- a/ace/SSL/SSL_SOCK_Stream.h +++ b/ace/SSL/SSL_SOCK_Stream.h @@ -18,7 +18,7 @@ #include "ace/pre.h" -#include "SSL_Export.h" +#include "ace/SSL/SSL_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,10 +26,10 @@ #include <openssl/err.h> -#include "SSL_SOCK.h" -#include "SSL_Context.h" +#include "ace/SSL/SSL_SOCK.h" +#include "ace/SSL/SSL_Context.h" -#include "ace/SOCK_Stream.h" +#include "ace/Sockets/SOCK_Stream.h" /** @@ -294,7 +294,7 @@ protected: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK_Stream.i" +#include "ace/SSL/SSL_SOCK_Stream.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ #include "ace/post.h" diff --git a/ace/Svcconf/DLL.cpp b/ace/Svcconf/DLL.cpp index 622cbe081ab..5d3367386f8 100644 --- a/ace/Svcconf/DLL.cpp +++ b/ace/Svcconf/DLL.cpp @@ -1,9 +1,12 @@ // DLL.cpp // $Id$ -#include "ace/DLL.h" +#include "ace/Svcconf/DLL.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif -#include "ace/Log_Msg.h" #include "ace/ACE.h" ACE_RCSID(ace, DLL, "$Id$") @@ -27,10 +30,12 @@ ACE_DLL::ACE_DLL (const ACE_TCHAR *dll_name, open_mode)), close_on_destruction_ (close_on_destruction) { +#ifdef ACE_SUBSET_0 if (this->handle_ == ACE_SHLIB_INVALID_HANDLE) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%s\n"), this->error ())); +#endif } // The library is closed before the class gets destroyed depending on @@ -98,15 +103,19 @@ ACE_DLL::open (const ACE_TCHAR *dll_filename, if (this->handle_ != ACE_SHLIB_INVALID_HANDLE) break; // end up returning 0 } +#ifdef ACE_SUBSET_0 ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%s\n"), this->error ()), -1); +#endif } while (0); #else +#ifdef ACE_SUBSET_0 ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%s\n"), this->error ()), -1); +#endif /* ACE_SUBSET_0 */ #endif /* AIX */ } @@ -176,10 +185,14 @@ ACE_DLL::set_handle (ACE_SHLIB_HANDLE handle, int close_on_destruction) { // Close the handle in use before accepting the next one. +#ifdef ACE_SUBSET_0 if (this->close () == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%s\n"), this->error ()), -1); +#else + this->close(); +#endif this->handle_ = handle; this->close_on_destruction_ = close_on_destruction; diff --git a/ace/Svcconf/DLL.h b/ace/Svcconf/DLL.h index 2a870fa08c1..019372ec8c3 100644 --- a/ace/Svcconf/DLL.h +++ b/ace/Svcconf/DLL.h @@ -15,7 +15,7 @@ #define ACE_DLL_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/OS/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Svcconf/Dynamic_Service.cpp b/ace/Svcconf/Dynamic_Service.cpp index ee40d45f112..3165b0d1f16 100644 --- a/ace/Svcconf/Dynamic_Service.cpp +++ b/ace/Svcconf/Dynamic_Service.cpp @@ -4,14 +4,14 @@ #ifndef ACE_DYNAMIC_SERVICE_C #define ACE_DYNAMIC_SERVICE_C -#include "ace/Dynamic_Service.h" +#include "ace/Svcconf/Dynamic_Service.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (__ACE_INLINE__) -#include "ace/Dynamic_Service.i" +#include "ace/Svcconf/Dynamic_Service.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Dynamic_Service, "$Id$") diff --git a/ace/Svcconf/Dynamic_Service.h b/ace/Svcconf/Dynamic_Service.h index bd3a92c24af..61620d7b46e 100644 --- a/ace/Svcconf/Dynamic_Service.h +++ b/ace/Svcconf/Dynamic_Service.h @@ -15,9 +15,9 @@ #define ACE_DYNAMIC_SERVICE_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/OS/OS.h" -#include "ace/Dynamic_Service_Base.h" +#include "ace/Svcconf/Dynamic_Service_Base.h" /** * @class ACE_Dynamic_Service @@ -37,11 +37,11 @@ public: }; #if defined (__ACE_INLINE__) -#include "ace/Dynamic_Service.i" +#include "ace/Svcconf/Dynamic_Service.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "ace/Dynamic_Service.cpp" +# include "ace/Svcconf/Dynamic_Service.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Svcconf/Dynamic_Service_Base.cpp b/ace/Svcconf/Dynamic_Service_Base.cpp index 6bcc87ad1ec..17f65c5b007 100644 --- a/ace/Svcconf/Dynamic_Service_Base.cpp +++ b/ace/Svcconf/Dynamic_Service_Base.cpp @@ -1,12 +1,16 @@ // $Id$ -#include "ace/Dynamic_Service_Base.h" -#include "ace/Service_Config.h" -#include "ace/Service_Repository.h" -#include "ace/Log_Msg.h" +#include "ace/Svcconf/Dynamic_Service_Base.h" +#include "ace/Svcconf/Service_Config.h" +#include "ace/Svcconf/Service_Repository.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif ACE_RCSID(ace, Dynamic_Service_Base, "$Id$") +#ifdef ACE_SUBSET_0 void ACE_Dynamic_Service_Base::dump (void) const { @@ -16,6 +20,7 @@ ACE_Dynamic_Service_Base::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif // Get the instance using <name>. diff --git a/ace/Svcconf/Dynamic_Service_Base.h b/ace/Svcconf/Dynamic_Service_Base.h index 15379c32e5b..5bce0b33cbe 100644 --- a/ace/Svcconf/Dynamic_Service_Base.h +++ b/ace/Svcconf/Dynamic_Service_Base.h @@ -15,7 +15,7 @@ #define ACE_DYNAMIC_SERVICE_BASE_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/OS/OS.h" /** * @class ACE_Dynamic_Service_Base diff --git a/ace/Utils/Templates/RB_Tree.cpp b/ace/Utils/Templates/RB_Tree.cpp index 086999af7c6..1570a042453 100644 --- a/ace/Utils/Templates/RB_Tree.cpp +++ b/ace/Utils/Templates/RB_Tree.cpp @@ -5,15 +5,15 @@ #ifndef ACE_RB_TREE_C #define ACE_RB_TREE_C -#include "ace/RB_Tree.h" -#include "ace/SString.h" +#include "ace/Utils/Templates/RB_Tree.h" +#include "ace/Utils/SString.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (__ACE_INLINE__) -#include "ace/RB_Tree.i" +#include "ace/Utils/Templates/RB_Tree.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, RB_Tree, "$Id$") diff --git a/ace/Utils/Templates/RB_Tree.h b/ace/Utils/Templates/RB_Tree.h index 12e127f7a00..1d9446c0151 100644 --- a/ace/Utils/Templates/RB_Tree.h +++ b/ace/Utils/Templates/RB_Tree.h @@ -15,8 +15,8 @@ #define ACE_RB_TREE_H #include "ace/pre.h" -#include "ace/OS.h" -#include "ace/Functor.h" +#include "ace/OS/OS.h" +#include "ace/Utils/Functor.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -783,11 +783,11 @@ public: }; #if defined (__ACE_INLINE__) -#include "ace/RB_Tree.i" +#include "ace/Utils/Templates/RB_Tree.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/RB_Tree.cpp" +#include "ace/Utils/Templates/RB_Tree.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Utils/Templates/RB_Tree.i b/ace/Utils/Templates/RB_Tree.i index 55deff16026..bcf6e68ddb1 100644 --- a/ace/Utils/Templates/RB_Tree.i +++ b/ace/Utils/Templates/RB_Tree.i @@ -1,8 +1,8 @@ /* -*- C++ -*- */ // $Id$ -#include "ace/Synch.h" -#include "ace/Malloc.h" +#include "ace/Threads/Synch.h" +#include "ace/Memory/Malloc.h" ///////////////////////////////////////////////////// // template class ACE_RB_Tree_Node<EXT_ID, INT_ID> // diff --git a/protocols/ace/RMCast/RMCast.cpp b/protocols/ace/RMCast/RMCast.cpp index 92ea637e481..40e51aeca38 100644 --- a/protocols/ace/RMCast/RMCast.cpp +++ b/protocols/ace/RMCast/RMCast.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "RMCast.h" +#include "ace/RMCast/RMCast.h" #if !defined (__ACE_INLINE__) -#include "RMCast.i" +#include "ace/RMCast/RMCast.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, RMCast, "$Id$") diff --git a/protocols/ace/RMCast/RMCast.h b/protocols/ace/RMCast/RMCast.h index 22afdebe3ce..be0e0bbdfbd 100644 --- a/protocols/ace/RMCast/RMCast.h +++ b/protocols/ace/RMCast/RMCast.h @@ -18,8 +18,8 @@ #define ACE_RMCAST_H #include "ace/pre.h" -#include "ace/OS.h" -#include "RMCast_Export.h" +#include "ace/OS/OS.h" +#include "ace/RMCast/RMCast_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -254,7 +254,7 @@ public: }; #if defined (__ACE_INLINE__) -#include "RMCast.i" +#include "ace/RMCast/RMCast.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_Ack_Worker.cpp b/protocols/ace/RMCast/RMCast_Ack_Worker.cpp index d9843ebe93b..bf4de61d757 100644 --- a/protocols/ace/RMCast/RMCast_Ack_Worker.cpp +++ b/protocols/ace/RMCast/RMCast_Ack_Worker.cpp @@ -2,11 +2,11 @@ // $Id$ // -#include "RMCast_Ack_Worker.h" -#include "ace/Message_Block.h" +#include "ace/RMCast/RMCast_Ack_Worker.h" +#include "ace/Utils/Message_Block.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Ack_Worker.i" +# include "ace/RMCast/RMCast_Ack_Worker.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Ack_Worker, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Ack_Worker.h b/protocols/ace/RMCast/RMCast_Ack_Worker.h index 565ef7feed8..6efd2980823 100644 --- a/protocols/ace/RMCast/RMCast_Ack_Worker.h +++ b/protocols/ace/RMCast/RMCast_Ack_Worker.h @@ -5,7 +5,7 @@ #define ACE_RMCAST_ACK_WORKER_H #include "ace/pre.h" -#include "RMCast_Retransmission.h" +#include "ace/RMCast/RMCast_Retransmission.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -40,7 +40,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Ack_Worker.i" +#include "ace/RMCast/RMCast_Ack_Worker.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_Copy_On_Write.cpp b/protocols/ace/RMCast/RMCast_Copy_On_Write.cpp index 39bf16f88a2..0406ef931e6 100644 --- a/protocols/ace/RMCast/RMCast_Copy_On_Write.cpp +++ b/protocols/ace/RMCast/RMCast_Copy_On_Write.cpp @@ -3,10 +3,10 @@ #ifndef ACE_RMCAST_COPY_ON_WRITE_CPP #define ACE_RMCAST_COPY_ON_WRITE_CPP -#include "RMCast_Copy_On_Write.h" +#include "ace/RMCast/RMCast_Copy_On_Write.h" #if ! defined (__ACE_INLINE__) -#include "RMCast_Copy_On_Write.i" +#include "ace/RMCast/RMCast_Copy_On_Write.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(RMCast, RMCast_Copy_On_Write, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Copy_On_Write.h b/protocols/ace/RMCast/RMCast_Copy_On_Write.h index 5efac63e80f..14ef5ed41b1 100644 --- a/protocols/ace/RMCast/RMCast_Copy_On_Write.h +++ b/protocols/ace/RMCast/RMCast_Copy_On_Write.h @@ -6,8 +6,8 @@ #define ACE_RMCAST_COPY_ON_WRITE_H #include "ace/pre.h" -#include "RMCast_Worker.h" -#include "ace/Synch.h" +#include "ace/RMCast/RMCast_Worker.h" +#include "ace/Threads/Synch.h" //! A wrapper to implement reference counted collections template<class COLLECTION, class ITERATOR> @@ -198,11 +198,11 @@ public: }; #if defined (__ACE_INLINE__) -#include "RMCast_Copy_On_Write.i" +#include "ace/RMCast/RMCast_Copy_On_Write.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "RMCast_Copy_On_Write.cpp" +#include "ace/RMCast/RMCast_Copy_On_Write.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/protocols/ace/RMCast/RMCast_Fork.cpp b/protocols/ace/RMCast/RMCast_Fork.cpp index 928d34cb411..3dca1d49572 100644 --- a/protocols/ace/RMCast/RMCast_Fork.cpp +++ b/protocols/ace/RMCast/RMCast_Fork.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "RMCast_Fork.h" +#include "ace/RMCast/RMCast_Fork.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Fork.i" +# include "ace/RMCast/RMCast_Fork.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Fork, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Fork.h b/protocols/ace/RMCast/RMCast_Fork.h index 5fd216d68f3..fb4554c3930 100644 --- a/protocols/ace/RMCast/RMCast_Fork.h +++ b/protocols/ace/RMCast/RMCast_Fork.h @@ -5,7 +5,7 @@ #define ACE_RMCAST_FORK_H #include "ace/pre.h" -#include "RMCast_Module.h" +#include "ace/RMCast/RMCast_Module.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -48,7 +48,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Fork.i" +#include "ace/RMCast/RMCast_Fork.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_Fragment.cpp b/protocols/ace/RMCast/RMCast_Fragment.cpp index 2d4389c1a92..32202d6df37 100644 --- a/protocols/ace/RMCast/RMCast_Fragment.cpp +++ b/protocols/ace/RMCast/RMCast_Fragment.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "RMCast_Fragment.h" -#include "ace/Message_Block.h" +#include "ace/RMCast/RMCast_Fragment.h" +#include "ace/Utils/Message_Block.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (__ACE_INLINE__) -#include "RMCast_Fragment.i" +#include "ace/RMCast/RMCast_Fragment.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Fragment, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Fragment.h b/protocols/ace/RMCast/RMCast_Fragment.h index eed08c92517..fb171ee27ed 100644 --- a/protocols/ace/RMCast/RMCast_Fragment.h +++ b/protocols/ace/RMCast/RMCast_Fragment.h @@ -4,8 +4,8 @@ #define ACE_RMCAST_FRAGMENT_H #include "ace/pre.h" -#include "RMCast_Module.h" -#include "ace/Synch.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/Threads/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -55,7 +55,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Fragment.i" +#include "ace/RMCast/RMCast_Fragment.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_IO_UDP.cpp b/protocols/ace/RMCast/RMCast_IO_UDP.cpp index 1a2f00c1eca..1b342d10dda 100644 --- a/protocols/ace/RMCast/RMCast_IO_UDP.cpp +++ b/protocols/ace/RMCast/RMCast_IO_UDP.cpp @@ -2,16 +2,16 @@ // $Id$ // -#include "RMCast_IO_UDP.h" -#include "RMCast_UDP_Proxy.h" -#include "RMCast_Module_Factory.h" +#include "ace/RMCast/RMCast_IO_UDP.h" +#include "ace/RMCast/RMCast_UDP_Proxy.h" +#include "ace/RMCast/RMCast_Module_Factory.h" -#include "ace/Handle_Set.h" -#include "ace/Reactor.h" -#include "ace/Message_Block.h" +#include "ace/OS/Handle_Set.h" +#include "ace/Demux/Reactor.h" +#include "ace/Utils/Message_Block.h" #if !defined (__ACE_INLINE__) -# include "RMCast_IO_UDP.i" +# include "ace/RMCast/RMCast_IO_UDP.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_IO_UDP, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_IO_UDP.h b/protocols/ace/RMCast/RMCast_IO_UDP.h index 7b9d2440517..a3ecaaf38ee 100644 --- a/protocols/ace/RMCast/RMCast_IO_UDP.h +++ b/protocols/ace/RMCast/RMCast_IO_UDP.h @@ -14,11 +14,11 @@ #define ACE_RMCAST_IO_UDP_H #include "ace/pre.h" -#include "RMCast_Module.h" -#include "ace/SOCK_Dgram_Mcast.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" -#include "ace/INET_Addr.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/Sockets/SOCK_Dgram_Mcast.h" +#include "ace/Utils/Hash_Map_Manager.h" +#include "ace/Threads/Synch.h" +#include "ace/IPC/INET_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -131,7 +131,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_IO_UDP.i" +#include "ace/RMCast/RMCast_IO_UDP.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_IO_UDP.i b/protocols/ace/RMCast/RMCast_IO_UDP.i index 99c1524d3a6..b203e118a4f 100644 --- a/protocols/ace/RMCast/RMCast_IO_UDP.i +++ b/protocols/ace/RMCast/RMCast_IO_UDP.i @@ -1,7 +1,7 @@ // $Id$ -#include "RMCast_UDP_Proxy.h" -#include "RMCast_Module_Factory.h" +#include "ace/RMCast/RMCast_UDP_Proxy.h" +#include "ace/RMCast/RMCast_Module_Factory.h" ACE_INLINE ACE_RMCast_IO_UDP:: diff --git a/protocols/ace/RMCast/RMCast_Membership.cpp b/protocols/ace/RMCast/RMCast_Membership.cpp index 91c9b1a9cea..b9f45528dc9 100644 --- a/protocols/ace/RMCast/RMCast_Membership.cpp +++ b/protocols/ace/RMCast/RMCast_Membership.cpp @@ -2,11 +2,11 @@ // $Id$ // -#include "RMCast_Membership.h" -#include "RMCast_Proxy.h" +#include "ace/RMCast/RMCast_Membership.h" +#include "ace/RMCast/RMCast_Proxy.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Membership.i" +# include "ace/RMCast/RMCast_Membership.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Membership, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Membership.h b/protocols/ace/RMCast/RMCast_Membership.h index 07f9aab593c..ad84ee7c64c 100644 --- a/protocols/ace/RMCast/RMCast_Membership.h +++ b/protocols/ace/RMCast/RMCast_Membership.h @@ -18,9 +18,9 @@ #define ACE_RMCAST_MEMBERSHIP_H #include "ace/pre.h" -#include "RMCast_Module.h" -#include "ace/Containers.h" -#include "ace/Synch.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/Utils/Containers.h" +#include "ace/Threads/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -96,7 +96,7 @@ protected: }; #if defined (__ACE_INLINE__) -#include "RMCast_Membership.i" +#include "ace/RMCast/RMCast_Membership.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_Module.cpp b/protocols/ace/RMCast/RMCast_Module.cpp index 727ef631d9d..a3d9d8064a2 100644 --- a/protocols/ace/RMCast/RMCast_Module.cpp +++ b/protocols/ace/RMCast/RMCast_Module.cpp @@ -2,10 +2,10 @@ // $Id$ // -#include "RMCast_Module.h" +#include "ace/RMCast/RMCast_Module.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Module.i" +# include "ace/RMCast/RMCast_Module.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Module, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Module.h b/protocols/ace/RMCast/RMCast_Module.h index d362dac2366..e5217d3d525 100644 --- a/protocols/ace/RMCast/RMCast_Module.h +++ b/protocols/ace/RMCast/RMCast_Module.h @@ -18,7 +18,7 @@ #define ACE_RMCAST_MODULE_H #include "ace/pre.h" -#include "RMCast.h" +#include "ace/RMCast/RMCast.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -81,7 +81,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Module.i" +#include "ace/RMCast/RMCast_Module.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_Partial_Message.cpp b/protocols/ace/RMCast/RMCast_Partial_Message.cpp index 5de2e660a11..4e1c9807d5e 100644 --- a/protocols/ace/RMCast/RMCast_Partial_Message.cpp +++ b/protocols/ace/RMCast/RMCast_Partial_Message.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "RMCast_Partial_Message.h" +#include "ace/RMCast/RMCast_Partial_Message.h" #if !defined (__ACE_INLINE__) -#include "RMCast_Partial_Message.i" +#include "ace/RMCast/RMCast_Partial_Message.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Partial_Message, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Partial_Message.h b/protocols/ace/RMCast/RMCast_Partial_Message.h index 88fa9ab2f1a..88343146133 100644 --- a/protocols/ace/RMCast/RMCast_Partial_Message.h +++ b/protocols/ace/RMCast/RMCast_Partial_Message.h @@ -15,8 +15,8 @@ #define ACE_RMCAST_PARTIAL_MESSAGE_H #include "ace/pre.h" -#include "RMCast_Export.h" -#include "ace/Task.h" +#include "ace/RMCast/RMCast_Export.h" +#include "ace/Streams/Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -95,7 +95,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Partial_Message.i" +#include "ace/RMCast/RMCast_Partial_Message.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_Proxy.cpp b/protocols/ace/RMCast/RMCast_Proxy.cpp index 2257f9a2bd7..c2e20ffdd41 100644 --- a/protocols/ace/RMCast/RMCast_Proxy.cpp +++ b/protocols/ace/RMCast/RMCast_Proxy.cpp @@ -2,10 +2,10 @@ // $Id$ // -#include "RMCast_Proxy.h" +#include "ace/RMCast/RMCast_Proxy.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Proxy.i" +# include "ace/RMCast/RMCast_Proxy.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Proxy, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Proxy.h b/protocols/ace/RMCast/RMCast_Proxy.h index d774efe4b2c..eaf5b782944 100644 --- a/protocols/ace/RMCast/RMCast_Proxy.h +++ b/protocols/ace/RMCast/RMCast_Proxy.h @@ -18,7 +18,7 @@ #define ACE_RMCAST_PROXY_H #include "ace/pre.h" -#include "RMCast_Module.h" +#include "ace/RMCast/RMCast_Module.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -95,7 +95,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Proxy.i" +#include "ace/RMCast/RMCast_Proxy.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_Reassembly.cpp b/protocols/ace/RMCast/RMCast_Reassembly.cpp index d20b72d88c5..15eca429349 100644 --- a/protocols/ace/RMCast/RMCast_Reassembly.cpp +++ b/protocols/ace/RMCast/RMCast_Reassembly.cpp @@ -1,15 +1,15 @@ // $Id$ -#include "RMCast_Reassembly.h" -#include "RMCast_Partial_Message.h" -#include "ace/Message_Block.h" +#include "ace/RMCast/RMCast_Reassembly.h" +#include "ace/RMCast/RMCast_Partial_Message.h" +#include "ace/Utils/Message_Block.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (__ACE_INLINE__) -#include "RMCast_Reassembly.i" +#include "ace/RMCast/RMCast_Reassembly.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Reassembly, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Reassembly.h b/protocols/ace/RMCast/RMCast_Reassembly.h index a9ebb480ac3..0ea77a39d54 100644 --- a/protocols/ace/RMCast/RMCast_Reassembly.h +++ b/protocols/ace/RMCast/RMCast_Reassembly.h @@ -14,9 +14,9 @@ #define ACE_RMCAST_REASSEMBLY_H #include "ace/pre.h" -#include "RMCast_Module.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/Utils/Hash_Map_Manager.h" +#include "ace/Threads/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -66,7 +66,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Reassembly.i" +#include "ace/RMCast/RMCast_Reassembly.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_Receiver_Module.cpp b/protocols/ace/RMCast/RMCast_Receiver_Module.cpp index 2d08ca4bb02..177725d915b 100644 --- a/protocols/ace/RMCast/RMCast_Receiver_Module.cpp +++ b/protocols/ace/RMCast/RMCast_Receiver_Module.cpp @@ -2,12 +2,15 @@ // $Id$ // -#include "RMCast_Receiver_Module.h" -#include "RMCast_Proxy.h" -#include "ace/Log_Msg.h" +#include "ace/RMCast/RMCast_Receiver_Module.h" +#include "ace/RMCast/RMCast_Proxy.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if !defined (__ACE_INLINE__) -# include "RMCast_Receiver_Module.i" +# include "ace/RMCast/RMCast_Receiver_Module.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Receiver_Module, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Receiver_Module.h b/protocols/ace/RMCast/RMCast_Receiver_Module.h index 35ae8c642c7..09c7c784c5a 100644 --- a/protocols/ace/RMCast/RMCast_Receiver_Module.h +++ b/protocols/ace/RMCast/RMCast_Receiver_Module.h @@ -15,7 +15,7 @@ #define ACE_RMCAST_RECEIVER_MODULE_H #include "ace/pre.h" -#include "RMCast_Module.h" +#include "ace/RMCast/RMCast_Module.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -101,7 +101,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Receiver_Module.i" +#include "ace/RMCast/RMCast_Receiver_Module.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_Reliable_Factory.cpp b/protocols/ace/RMCast/RMCast_Reliable_Factory.cpp index 6140c685153..ea392928dbc 100644 --- a/protocols/ace/RMCast/RMCast_Reliable_Factory.cpp +++ b/protocols/ace/RMCast/RMCast_Reliable_Factory.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "RMCast_Reliable_Factory.h" -#include "RMCast_Receiver_Module.h" -#include "RMCast_Reassembly.h" -#include "RMCast_Reordering.h" +#include "ace/RMCast/RMCast_Reliable_Factory.h" +#include "ace/RMCast/RMCast_Receiver_Module.h" +#include "ace/RMCast/RMCast_Reassembly.h" +#include "ace/RMCast/RMCast_Reordering.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Reliable_Factory.i" +# include "ace/RMCast/RMCast_Reliable_Factory.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Reliable_Factory, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Reliable_Factory.h b/protocols/ace/RMCast/RMCast_Reliable_Factory.h index e41c7fd9e74..e1c616ff892 100644 --- a/protocols/ace/RMCast/RMCast_Reliable_Factory.h +++ b/protocols/ace/RMCast/RMCast_Reliable_Factory.h @@ -18,7 +18,7 @@ #define ACE_RMCAST_RELIABLE_FACTORY_H #include "ace/pre.h" -#include "RMCast_Module_Factory.h" +#include "ace/RMCast/RMCast_Module_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -53,7 +53,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Reliable_Factory.i" +#include "ace/RMCast/RMCast_Reliable_Factory.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_Reordering.cpp b/protocols/ace/RMCast/RMCast_Reordering.cpp index 5a81a360783..33233669908 100644 --- a/protocols/ace/RMCast/RMCast_Reordering.cpp +++ b/protocols/ace/RMCast/RMCast_Reordering.cpp @@ -2,12 +2,12 @@ // $Id$ // -#include "RMCast_Reordering.h" -#include "RMCast_Proxy.h" -#include "ace/Message_Block.h" +#include "ace/RMCast/RMCast_Reordering.h" +#include "ace/RMCast/RMCast_Proxy.h" +#include "ace/Utils/Message_Block.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Reordering.i" +# include "ace/RMCast/RMCast_Reordering.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Reordering, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Reordering.h b/protocols/ace/RMCast/RMCast_Reordering.h index 5647e35a585..1daf8957775 100644 --- a/protocols/ace/RMCast/RMCast_Reordering.h +++ b/protocols/ace/RMCast/RMCast_Reordering.h @@ -15,9 +15,9 @@ #define ACE_RMCAST_REORDERING_H #include "ace/pre.h" -#include "RMCast_Module.h" -#include "ace/RB_Tree.h" -#include "ace/Synch.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/Utils/Templates/RB_Tree.h" +#include "ace/Threads/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -89,7 +89,7 @@ protected: }; #if defined (__ACE_INLINE__) -#include "RMCast_Reordering.i" +#include "ace/RMCast/RMCast_Reordering.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_Resend_Handler.cpp b/protocols/ace/RMCast/RMCast_Resend_Handler.cpp index c8597b301f0..11ece87106f 100644 --- a/protocols/ace/RMCast/RMCast_Resend_Handler.cpp +++ b/protocols/ace/RMCast/RMCast_Resend_Handler.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "RMCast_Resend_Handler.h" -#include "RMCast_Retransmission.h" +#include "ace/RMCast/RMCast_Resend_Handler.h" +#include "ace/RMCast/RMCast_Retransmission.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Resend_Handler.i" +# include "ace/RMCast/RMCast_Resend_Handler.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Resend_Handler, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Resend_Handler.h b/protocols/ace/RMCast/RMCast_Resend_Handler.h index 0d2ec0fe13c..7cf3ae1e011 100644 --- a/protocols/ace/RMCast/RMCast_Resend_Handler.h +++ b/protocols/ace/RMCast/RMCast_Resend_Handler.h @@ -4,8 +4,8 @@ #define ACE_RMCAST_RESEND_HANDLER_H #include "ace/pre.h" -#include "RMCast_Export.h" -#include "ace/Event_Handler.h" +#include "ace/RMCast/RMCast_Export.h" +#include "ace/Demux/Event_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +37,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Resend_Handler.i" +#include "ace/RMCast/RMCast_Resend_Handler.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_Resend_Worker.cpp b/protocols/ace/RMCast/RMCast_Resend_Worker.cpp index a4acbeff0cd..a50ce7164d9 100644 --- a/protocols/ace/RMCast/RMCast_Resend_Worker.cpp +++ b/protocols/ace/RMCast/RMCast_Resend_Worker.cpp @@ -2,11 +2,11 @@ // $Id$ // -#include "RMCast_Resend_Worker.h" -#include "RMCast_Module.h" +#include "ace/RMCast/RMCast_Resend_Worker.h" +#include "ace/RMCast/RMCast_Module.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Resend_Worker.i" +# include "ace/RMCast/RMCast_Resend_Worker.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Resend_Worker, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Resend_Worker.h b/protocols/ace/RMCast/RMCast_Resend_Worker.h index 03fd81e2a05..14c57eb99ab 100644 --- a/protocols/ace/RMCast/RMCast_Resend_Worker.h +++ b/protocols/ace/RMCast/RMCast_Resend_Worker.h @@ -5,8 +5,8 @@ #define ACE_RMCAST_RESEND_WORKER_H #include "ace/pre.h" -#include "RMCast.h" -#include "RMCast_Copy_On_Write.h" +#include "ace/RMCast/RMCast.h" +#include "ace/RMCast/RMCast_Copy_On_Write.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -42,7 +42,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_Resend_Worker.i" +#include "ace/RMCast/RMCast_Resend_Worker.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_Retransmission.cpp b/protocols/ace/RMCast/RMCast_Retransmission.cpp index 7b626a4ef7d..69a1f8e33ad 100644 --- a/protocols/ace/RMCast/RMCast_Retransmission.cpp +++ b/protocols/ace/RMCast/RMCast_Retransmission.cpp @@ -2,14 +2,14 @@ // $Id$ // -#include "RMCast_Retransmission.h" -#include "RMCast_Proxy.h" -#include "RMCast_Ack_Worker.h" -#include "RMCast_Resend_Worker.h" -#include "ace/Message_Block.h" +#include "ace/RMCast/RMCast_Retransmission.h" +#include "ace/RMCast/RMCast_Proxy.h" +#include "ace/RMCast/RMCast_Ack_Worker.h" +#include "ace/RMCast/RMCast_Resend_Worker.h" +#include "ace/Utils/Message_Block.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Retransmission.i" +# include "ace/RMCast/RMCast_Retransmission.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Retransmission, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Retransmission.h b/protocols/ace/RMCast/RMCast_Retransmission.h index 89b431917b3..3bc6858460a 100644 --- a/protocols/ace/RMCast/RMCast_Retransmission.h +++ b/protocols/ace/RMCast/RMCast_Retransmission.h @@ -18,10 +18,10 @@ #define ACE_RMCAST_RETRANSMISSION_H #include "ace/pre.h" -#include "RMCast_Module.h" -#include "RMCast_Copy_On_Write.h" -#include "ace/RB_Tree.h" -#include "ace/Synch.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/RMCast/RMCast_Copy_On_Write.h" +#include "ace/Utils/Templates/RB_Tree.h" +#include "ace/Threads/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -113,7 +113,7 @@ protected: }; #if defined (__ACE_INLINE__) -#include "RMCast_Retransmission.i" +#include "ace/RMCast/RMCast_Retransmission.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_Sequencer.cpp b/protocols/ace/RMCast/RMCast_Sequencer.cpp index f8bc0e6c57d..82ccbdedb04 100644 --- a/protocols/ace/RMCast/RMCast_Sequencer.cpp +++ b/protocols/ace/RMCast/RMCast_Sequencer.cpp @@ -2,10 +2,10 @@ // $Id$ // -#include "RMCast_Sequencer.h" +#include "ace/RMCast/RMCast_Sequencer.h" #if !defined (__ACE_INLINE__) -# include "RMCast_Sequencer.i" +# include "ace/RMCast/RMCast_Sequencer.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_Sequencer, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_Sequencer.h b/protocols/ace/RMCast/RMCast_Sequencer.h index 321d778853e..88e4d232692 100644 --- a/protocols/ace/RMCast/RMCast_Sequencer.h +++ b/protocols/ace/RMCast/RMCast_Sequencer.h @@ -15,8 +15,8 @@ #define ACE_RMCAST_SEQUENCER_H #include "ace/pre.h" -#include "RMCast_Module.h" -#include "ace/Synch.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/Threads/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -47,7 +47,7 @@ protected: }; #if defined (__ACE_INLINE__) -#include "RMCast_Sequencer.i" +#include "ace/RMCast/RMCast_Sequencer.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_UDP_Event_Handler.cpp b/protocols/ace/RMCast/RMCast_UDP_Event_Handler.cpp index 963928845f7..2c1ca016546 100644 --- a/protocols/ace/RMCast/RMCast_UDP_Event_Handler.cpp +++ b/protocols/ace/RMCast/RMCast_UDP_Event_Handler.cpp @@ -2,11 +2,11 @@ // $Id$ // -#include "RMCast_UDP_Event_Handler.h" -#include "RMCast_IO_UDP.h" +#include "ace/RMCast/RMCast_UDP_Event_Handler.h" +#include "ace/RMCast/RMCast_IO_UDP.h" #if !defined (__ACE_INLINE__) -# include "RMCast_UDP_Event_Handler.i" +# include "ace/RMCast/RMCast_UDP_Event_Handler.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_UDP_Event_Handler, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_UDP_Event_Handler.h b/protocols/ace/RMCast/RMCast_UDP_Event_Handler.h index 2a6e7c45d42..69bdd86606d 100644 --- a/protocols/ace/RMCast/RMCast_UDP_Event_Handler.h +++ b/protocols/ace/RMCast/RMCast_UDP_Event_Handler.h @@ -4,8 +4,8 @@ #define ACE_RMCAST_UDP_EVENT_HANDLER_H #include "ace/pre.h" -#include "RMCast_Export.h" -#include "ace/Event_Handler.h" +#include "ace/RMCast/RMCast_Export.h" +#include "ace/Demux/Event_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -52,7 +52,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_UDP_Event_Handler.i" +#include "ace/RMCast/RMCast_UDP_Event_Handler.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp b/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp index c84b8c0f2ef..75cbe45674d 100644 --- a/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp +++ b/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "RMCast_UDP_Proxy.h" -#include "RMCast_Module.h" -#include "RMCast_IO_UDP.h" -#include "ace/Message_Block.h" +#include "ace/RMCast/RMCast_UDP_Proxy.h" +#include "ace/RMCast/RMCast_Module.h" +#include "ace/RMCast/RMCast_IO_UDP.h" +#include "ace/Utils/Message_Block.h" #if !defined (__ACE_INLINE__) -# include "RMCast_UDP_Proxy.i" +# include "ace/RMCast/RMCast_UDP_Proxy.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_UDP_Proxy, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_UDP_Proxy.h b/protocols/ace/RMCast/RMCast_UDP_Proxy.h index f1a7f77a25a..7f343aded02 100644 --- a/protocols/ace/RMCast/RMCast_UDP_Proxy.h +++ b/protocols/ace/RMCast/RMCast_UDP_Proxy.h @@ -18,13 +18,13 @@ #define ACE_RMCAST_UDP_PROXY_H #include "ace/pre.h" -#include "RMCast_Proxy.h" +#include "ace/RMCast/RMCast_Proxy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/INET_Addr.h" +#include "ace/IPC/INET_Addr.h" class ACE_RMCast_IO_UDP; @@ -81,7 +81,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_UDP_Proxy.i" +#include "ace/RMCast/RMCast_UDP_Proxy.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp b/protocols/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp index 9057281cc52..480d400a8e9 100644 --- a/protocols/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp +++ b/protocols/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "RMCast_UDP_Reliable_Receiver.h" -#include "RMCast_UDP_Event_Handler.h" -#include "ace/Reactor.h" +#include "ace/RMCast/RMCast_UDP_Reliable_Receiver.h" +#include "ace/RMCast/RMCast_UDP_Event_Handler.h" +#include "ace/Demux/Reactor.h" #if !defined (__ACE_INLINE__) -# include "RMCast_UDP_Reliable_Receiver.i" +# include "ace/RMCast/RMCast_UDP_Reliable_Receiver.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_UDP_Reliable_Receiver, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_UDP_Reliable_Receiver.h b/protocols/ace/RMCast/RMCast_UDP_Reliable_Receiver.h index 902da503737..175613eb0df 100644 --- a/protocols/ace/RMCast/RMCast_UDP_Reliable_Receiver.h +++ b/protocols/ace/RMCast/RMCast_UDP_Reliable_Receiver.h @@ -5,9 +5,9 @@ #define ACE_RMCAST_UDP_RELIABLE_RECEIVER_H #include "ace/pre.h" -#include "RMCast_Singleton_Factory.h" -#include "RMCast_Reliable_Factory.h" -#include "RMCast_IO_UDP.h" +#include "ace/RMCast/RMCast_Singleton_Factory.h" +#include "ace/RMCast/RMCast_Reliable_Factory.h" +#include "ace/RMCast/RMCast_IO_UDP.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -42,7 +42,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_UDP_Reliable_Receiver.i" +#include "ace/RMCast/RMCast_UDP_Reliable_Receiver.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp b/protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp index befab142320..2b197692e3e 100644 --- a/protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp +++ b/protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "RMCast_UDP_Reliable_Sender.h" -#include "RMCast_UDP_Event_Handler.h" -#include "RMCast_Resend_Handler.h" -#include "ace/Reactor.h" +#include "ace/RMCast/RMCast_UDP_Reliable_Sender.h" +#include "ace/RMCast/RMCast_UDP_Event_Handler.h" +#include "ace/RMCast/RMCast_Resend_Handler.h" +#include "ace/Demux/Reactor.h" #if !defined (__ACE_INLINE__) -# include "RMCast_UDP_Reliable_Sender.i" +# include "ace/RMCast/RMCast_UDP_Reliable_Sender.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(ace, RMCast_UDP_Reliable_Sender, "$Id$") diff --git a/protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.h b/protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.h index 488859a8e2f..5f510686f22 100644 --- a/protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.h +++ b/protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.h @@ -5,13 +5,13 @@ #define ACE_RMCAST_UDP_RELIABLE_SENDER_H #include "ace/pre.h" -#include "RMCast_Singleton_Factory.h" -#include "RMCast_IO_UDP.h" -#include "RMCast_Sequencer.h" -#include "RMCast_Retransmission.h" -#include "RMCast_Membership.h" -#include "RMCast_Fragment.h" -#include "RMCast_Fork.h" +#include "ace/RMCast/RMCast_Singleton_Factory.h" +#include "ace/RMCast/RMCast_IO_UDP.h" +#include "ace/RMCast/RMCast_Sequencer.h" +#include "ace/RMCast/RMCast_Retransmission.h" +#include "ace/RMCast/RMCast_Membership.h" +#include "ace/RMCast/RMCast_Fragment.h" +#include "ace/RMCast/RMCast_Fork.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -71,7 +71,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "RMCast_UDP_Reliable_Sender.i" +#include "ace/RMCast/RMCast_UDP_Reliable_Sender.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" |