diff options
| author | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-01-09 00:50:35 +0000 |
|---|---|---|
| committer | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-01-09 00:50:35 +0000 |
| commit | 4ede4f6661f2efe25295ff64166515c334abb8ff (patch) | |
| tree | a6ef88a24e977002448d3b38d928842297034c02 | |
| parent | c7e84c695151618165f8c33bfd8fd20e166ef666 (diff) | |
| download | ATCD-4ede4f6661f2efe25295ff64166515c334abb8ff.tar.gz | |
ChangeLogTag: Thu Jan 8 18:40:34 2004 Krishnakumar B <kitty@nospam.invalid.domain>
23 files changed, 918 insertions, 2538 deletions
diff --git a/ACEXML/ChangeLog b/ACEXML/ChangeLog index dc2a61813e1..2f416dc4083 100644 --- a/ACEXML/ChangeLog +++ b/ACEXML/ChangeLog @@ -1,3 +1,56 @@ +Thu Jan 8 18:40:34 2004 Krishnakumar B <kitty@nospam.invalid.domain> + + + * common/CharStream.h: Added a new rewind() method so that we can + reuse the same parser instance to parse the same file multiple + times. + + * common/FileCharStream.cpp: + * common/HttpCharStream.h: + * common/HttpCharStream.cpp: + * common/StrCharStream.cpp: + * common/ZipCharStream.cpp: + + Fixed implementation of rewind(). + + * common/Mem_Map_Stream.cpp: + + Fixed memory leak caused by the Svc_Handler not getting deleted. + + * apps/svcconf/Makefile.ACEXML_XML_Svc_Conf_Parser: + * parser/parser/Makefile.ACEXML_Parser: + * examples/SAXPrint/Makefile.SAXPrint: + * common/Makefile.ACEXML: + * tests/Makefile.ContentHandler_Test: + * tests/Makefile.HttpCharStream_Test: + * tests/Makefile.NamespaceSupport_Test: + * tests/Makefile.Transcoder_Test: + + Updated dependencies. + + * examples/SAXPrint/main.cpp: + + Added code to test the parser to parse the same file multiple + times. This still needs some cleaning. + + * parser/parser/Entity_Manager.h: + * parser/parser/Entity_Manager.i: + * parser/parser/Entity_Manager.cpp: + + Use a pointer to ACE_Hash_Map_Manager_Ex and delete it on every + reset() of the Entity_Manager. This should fix all the problems + with SIGFPE's when we try to recover from a parse error. + + * parser/parser/Parser.cpp: + * parser/parser/ParserContext.h: + * parser/parser/ParserContext.inl: + + Fixed memory leaks reported by Ken Sedgewick <ken@bonsai.com>. + This should fix Bugzill bug 1694. While at it, fix bugs in + handling of entity references in INCLUDE/IGNORE sections, + ATTLIST sections. + + Thu Dec 18 13:13:57 2003 Krishnakumar B <kitty@nospam.invalid.domain> * common/Transcode.h (ACEXML_Transcoder): @@ -59,9 +112,9 @@ Thu Jun 26 01:47:03 UTC 2003 Don Hinton <dhinton@dresystems.com> Tue Jun 24 23:31:44 2003 Nanbor Wang <nanbor@cs.wustl.edu> - * apps/svcconf/Svcconf.cpp: Turned off validation temporarily when - handling svc.conf files. All of the converted svc.conf.xml - files do not have associate doctype at the moment. + * apps/svcconf/Svcconf.cpp: Turned off validation temporarily when + handling svc.conf files. All of the converted svc.conf.xml + files do not have associate doctype at the moment. Tue Jun 24 15:38:49 UTC 2003 Don Hinton <dhinton@dresystems.h> @@ -70,9 +123,9 @@ Tue Jun 24 15:38:49 UTC 2003 Don Hinton <dhinton@dresystems.h> Sun Jun 1 09:09:22 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> - * parser/parser/Parser.cpp: - * parser/parser/Entity_Manager.cpp: Added explicit template - instantiations. + * parser/parser/Parser.cpp: + * parser/parser/Entity_Manager.cpp: Added explicit template + instantiations. Fri May 30 14:16:33 2003 Krishnakumar B <kitty@spam.invalid.domain> diff --git a/ACEXML/apps/svcconf/Makefile.ACEXML_XML_Svc_Conf_Parser b/ACEXML/apps/svcconf/Makefile.ACEXML_XML_Svc_Conf_Parser index f7fcdefb851..7d5f68e2dce 100644 --- a/ACEXML/apps/svcconf/Makefile.ACEXML_XML_Svc_Conf_Parser +++ b/ACEXML/apps/svcconf/Makefile.ACEXML_XML_Svc_Conf_Parser @@ -97,33 +97,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -131,9 +109,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -149,53 +124,33 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ $(ACE_ROOT)/ACEXML/common/Locator.h \ $(ACE_ROOT)/ACEXML/common/Attributes.h \ $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ @@ -204,101 +159,79 @@ endif $(ACE_ROOT)/ACEXML/common/CharStream.h \ $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ $(ACE_ROOT)/ACEXML/common/LocatorImpl.h \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.i \ $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Guard_T.h \ $(ACE_ROOT)/ace/Lock.h \ - $(ACE_ROOT)/ace/Lock.inl \ + $(ACE_ROOT)/ace/Guard_T.cpp \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ $(ACE_ROOT)/ace/RW_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.inl \ - $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \ - $(ACE_ROOT)/ace/Guard_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Null_Mutex.h \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i \ $(ACE_ROOT)/ace/Obstack.h \ $(ACE_ROOT)/ace/Obstack_T.h \ $(ACE_ROOT)/ace/Obchunk.h \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(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/Free_List.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Thread_Mutex.h \ - $(ACE_ROOT)/ace/Thread_Mutex.inl \ $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op_T.i \ $(ACE_ROOT)/ace/Synch_Traits.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/Memory_Pool.i \ - $(ACE_ROOT)/ace/Obchunk.i \ - $(ACE_ROOT)/ace/Obstack_T.i \ $(ACE_ROOT)/ace/Obstack_T.cpp \ + $(ACE_ROOT)/ace/Obstack_T.i \ $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.i \ $(ACE_ROOT)/ACEXML/parser/parser/ParserInternals.h \ $(ACE_ROOT)/ACEXML/parser/parser/ParserContext.h \ $(ACE_ROOT)/ace/Swap.h \ - $(ACE_ROOT)/ace/Swap.inl \ $(ACE_ROOT)/ace/Swap.cpp \ - $(ACE_ROOT)/ACEXML/parser/parser/ParserContext.inl \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser.i \ - Svcconf_Handler.h \ + $(ACE_ROOT)/ace/Swap.inl Svcconf_Handler.h \ $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/os_include/os_dlfcn.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ACEXML/common/FileCharStream.h \ $(ACE_ROOT)/ACEXML/common/Encoding.h \ $(ACE_ROOT)/ACEXML/common/StrCharStream.h @@ -340,33 +273,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -374,9 +285,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -392,53 +300,33 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ $(ACE_ROOT)/ACEXML/common/Locator.h \ $(ACE_ROOT)/ACEXML/common/Attributes.h \ $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ @@ -446,125 +334,100 @@ endif $(ACE_ROOT)/ACEXML/common/InputSource.h \ $(ACE_ROOT)/ACEXML/common/CharStream.h \ $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Thread_Mutex.h \ - $(ACE_ROOT)/ace/Thread_Mutex.inl \ $(ACE_ROOT)/ace/Atomic_Op_T.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Atomic_Op_T.i \ $(ACE_ROOT)/ace/Guard_T.h \ $(ACE_ROOT)/ace/Lock.h \ - $(ACE_ROOT)/ace/Lock.inl \ + $(ACE_ROOT)/ace/Guard_T.cpp \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ $(ACE_ROOT)/ace/RW_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.inl \ - $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \ - $(ACE_ROOT)/ace/Guard_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_Traits.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/os_include/os_dlfcn.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Timer_Queuefwd.h \ $(ACE_ROOT)/ace/Reactor_Timer_Interface.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/ARGV.h \ - $(ACE_ROOT)/ace/ARGV.i \ $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(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 \ + $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/OS_NS_sys_time.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Thread_Exit.h \ $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \ - $(ACE_ROOT)/ace/Condition_Thread_Mutex.inl \ $(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/Array_Base.inl \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/TSS_T.h \ - $(ACE_ROOT)/ace/TSS_T.inl \ $(ACE_ROOT)/ace/TSS_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/TSS_T.inl \ + $(ACE_ROOT)/ace/OS_NS_stdio.h \ $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \ - $(ACE_ROOT)/ace/Recursive_Thread_Mutex.inl \ $(ACE_ROOT)/ace/Static_Object_Lock.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/Managed_Object.i \ $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/os_include/os_assert.h \ + $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Null_Condition.h \ $(ACE_ROOT)/ace/Null_Mutex.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/os_include/os_assert.h \ $(ACE_ROOT)/ace/os_include/os_dirent.h \ - $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/OS_NS_strings.h \ - $(ACE_ROOT)/ace/os_include/os_strings.h \ - $(ACE_ROOT)/ace/OS_NS_strings.inl + $(ACE_ROOT)/ace/os_include/os_strings.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/common/CharStream.h b/ACEXML/common/CharStream.h index 32c967e762e..e0355d4721a 100644 --- a/ACEXML/common/CharStream.h +++ b/ACEXML/common/CharStream.h @@ -65,6 +65,11 @@ public: */ virtual int peek (void) = 0; + /** + * Resets the pointer to the beginning of the stream. + */ + virtual void rewind (void) = 0; + /* * Get the character encoding for a byte stream or URI. */ diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp index 420bf198fbb..59de1436b63 100644 --- a/ACEXML/common/FileCharStream.cpp +++ b/ACEXML/common/FileCharStream.cpp @@ -57,13 +57,15 @@ ACEXML_FileCharStream::determine_encoding (void) return -1; // Rewind the stream - this->rewind(); + ACE_OS::rewind (this->infile_); const ACEXML_Char* temp = ACEXML_Encoding::get_encoding (input); if (!temp) return -1; else { + if (this->encoding_) + delete [] this->encoding_; this->encoding_ = ACE::strnew (temp); // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("File's encoding is %s\n"), // this->encoding_)); @@ -92,6 +94,7 @@ ACEXML_FileCharStream::rewind() if (this->infile_ == 0) return; ACE_OS::rewind (this->infile_); + this->determine_encoding(); } int diff --git a/ACEXML/common/HttpCharStream.cpp b/ACEXML/common/HttpCharStream.cpp index 43ed73342ec..004bbb6fcfe 100644 --- a/ACEXML/common/HttpCharStream.cpp +++ b/ACEXML/common/HttpCharStream.cpp @@ -27,6 +27,7 @@ ACEXML_HttpCharStream::ACEXML_HttpCharStream (void) stream_(0), connector_(0), size_(0), + data_offset_ (0), encoding_ (0) { @@ -79,7 +80,7 @@ ACEXML_HttpCharStream::open (const ACEXML_Char *url) } this->size_ = ACE_static_cast (off_t, len); - return 0; + return this->determine_encoding(); } // The FSM was taken from the implementation of http_get and that falls @@ -239,14 +240,12 @@ ACEXML_HttpCharStream::get_url (size_t& len) // Move the pointer to the beginning of the file store. this->stream_->rewind(); - off_t data_offset = data_beg - this->stream_->recv(); + this->data_offset_ = data_beg - this->stream_->recv(); // Forward to the beginning of data. - if (this->stream_->seek (data_offset, SEEK_SET) == -1) + if (this->stream_->seek (this->data_offset_, SEEK_SET) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%s: %m", "Error in seeking to beginning of data"), -1); - if (this->determine_encoding() == -1) - return -1; return status; } @@ -307,6 +306,7 @@ ACEXML_HttpCharStream::close (void) this->connector_ = 0; this->size_ = 0; + this->data_offset_ = 0; delete[] this->encoding_; this->encoding_ = 0; @@ -331,6 +331,8 @@ ACEXML_HttpCharStream::determine_encoding (void) return -1; else { + if (this->encoding_) + delete [] this->encoding_; this->encoding_ = ACE::strnew (temp); // ACE_DEBUG ((LM_DEBUG, "URI's encoding is %s\n", this->encoding_)); } @@ -354,6 +356,11 @@ ACEXML_HttpCharStream::rewind (void) if (this->stream_ == 0) return; this->stream_->rewind(); + + // Forward to the beginning of data. + if (this->stream_->seek (this->data_offset_, SEEK_SET) == -1) + ACE_ERROR ((LM_ERROR, "%s: %m", "Error in seeking to beginning of data")); + this->determine_encoding(); } const ACEXML_Char* diff --git a/ACEXML/common/HttpCharStream.h b/ACEXML/common/HttpCharStream.h index 4ed10e1cdd7..ba29e756e5b 100644 --- a/ACEXML/common/HttpCharStream.h +++ b/ACEXML/common/HttpCharStream.h @@ -128,6 +128,8 @@ private: off_t size_; + off_t data_offset_; + ACEXML_Char* encoding_; }; diff --git a/ACEXML/common/Makefile.ACEXML b/ACEXML/common/Makefile.ACEXML index 94fca85b314..e9d19fdff60 100644 --- a/ACEXML/common/Makefile.ACEXML +++ b/ACEXML/common/Makefile.ACEXML @@ -115,33 +115,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -149,9 +127,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -167,65 +142,49 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ AttributesImpl.i .obj/Attributes_Def_Builder.o .obj/Attributes_Def_Builder.so .shobj/Attributes_Def_Builder.o .shobj/Attributes_Def_Builder.so: Attributes_Def_Builder.cpp \ @@ -260,33 +219,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -294,9 +231,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -312,57 +246,37 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ Env.h \ XML_Macros.h \ $(ACE_ROOT)/ace/Exception_Macros.h \ Exception.h \ - Exception.i \ - Env.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - SAXExceptions.h \ - SAXExceptions.i + SAXExceptions.h .obj/CharStream.o .obj/CharStream.so .shobj/CharStream.o .shobj/CharStream.so: CharStream.cpp \ CharStream.h \ @@ -396,33 +310,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -430,9 +322,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -448,47 +337,32 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h .obj/DefaultHandler.o .obj/DefaultHandler.so .shobj/DefaultHandler.o .shobj/DefaultHandler.so: DefaultHandler.cpp \ DefaultHandler.h \ @@ -527,33 +401,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -561,9 +413,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -579,53 +428,33 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - Exception.i \ - Env.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ SAXExceptions.h \ - SAXExceptions.i \ Locator.h \ Attributes.h \ DTDHandler.h \ @@ -668,33 +497,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -702,9 +509,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -720,57 +524,37 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ Env.h \ XML_Macros.h \ $(ACE_ROOT)/ace/Exception_Macros.h \ Exception.h \ - Exception.i \ - Env.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ SAXExceptions.h \ - SAXExceptions.i \ Element_Def_Builder.h \ Validator.h \ Attributes.h @@ -788,12 +572,11 @@ endif $(ACE_ROOT)/ace/OS_main.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ XML_Types.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SStringfwd.h \ @@ -814,29 +597,8 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(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/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -844,9 +606,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -862,54 +621,34 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ - $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ Env.h \ XML_Macros.h \ $(ACE_ROOT)/ace/Exception_Macros.h \ Exception.h \ - Exception.i \ - Env.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - SAXExceptions.h \ - SAXExceptions.i + SAXExceptions.h .obj/Encoding.o .obj/Encoding.so .shobj/Encoding.o .shobj/Encoding.so: Encoding.cpp \ Encoding.h \ @@ -943,33 +682,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -977,9 +694,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -995,50 +709,34 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h -.obj/Env.o .obj/Env.so .shobj/Env.o .shobj/Env.so: Env.cpp \ - Env.h \ +.obj/Env.o .obj/Env.so .shobj/Env.o .shobj/Env.so: Env.cpp Env.h \ $(ACE_ROOT)/ace/pre.h \ ACEXML_Export.h \ $(ACE_ROOT)/ace/config-all.h \ @@ -1072,33 +770,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -1106,9 +782,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -1124,48 +797,32 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - Exception.i \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ Env.i \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h @@ -1202,33 +859,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -1236,9 +871,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -1254,52 +886,37 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ XML_Macros.h \ $(ACE_ROOT)/ace/Exception_Macros.h \ - Exception.i \ $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h + $(ACE_ROOT)/ace/Log_Priority.h \ + Exception.i .obj/FileCharStream.o .obj/FileCharStream.so .shobj/FileCharStream.o .shobj/FileCharStream.so: FileCharStream.cpp \ FileCharStream.h \ @@ -1334,33 +951,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -1368,9 +963,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -1386,52 +978,37 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ Encoding.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_NS_sys_stat.h \ - $(ACE_ROOT)/ace/OS_NS_sys_stat.inl + $(ACE_ROOT)/ace/OS_NS_stdio.h \ + $(ACE_ROOT)/ace/OS_NS_sys_stat.h .obj/HttpCharStream.o .obj/HttpCharStream.so .shobj/HttpCharStream.o .shobj/HttpCharStream.so: HttpCharStream.cpp \ $(ACE_ROOT)/ace/ACE.h \ @@ -1448,16 +1025,12 @@ endif $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ $(ACE_ROOT)/ace/os_include/sys/os_types.h \ $(ACE_ROOT)/ace/os_include/os_stddef.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -1480,7 +1053,6 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/os_include/netinet/os_in.h \ $(ACE_ROOT)/ace/os_include/sys/os_socket.h \ $(ACE_ROOT)/ace/os_include/sys/os_uio.h \ @@ -1489,63 +1061,29 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_stdio.h \ + $(ACE_ROOT)/ace/OS_NS_string.h \ HttpCharStream.h \ ACEXML_Export.h \ CharStream.h \ @@ -1554,22 +1092,14 @@ endif $(ACE_ROOT)/ace/SStringfwd.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ + $(ACE_ROOT)/ace/String_Base.i \ $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/SString.i \ URL_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/OS_NS_arpa_inet.h \ - $(ACE_ROOT)/ace/os_include/arpa/os_inet.h \ - $(ACE_ROOT)/ace/OS_NS_arpa_inet.inl \ - URL_Addr.inl \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ Mem_Map_Stream.h \ $(ACE_ROOT)/ace/SOCK_Stream.h \ $(ACE_ROOT)/ace/SOCK_IO.h \ @@ -1580,157 +1110,126 @@ endif $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Thread_Mutex.h \ - $(ACE_ROOT)/ace/Thread_Mutex.inl \ $(ACE_ROOT)/ace/Atomic_Op_T.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Atomic_Op_T.i \ $(ACE_ROOT)/ace/Guard_T.h \ $(ACE_ROOT)/ace/Lock.h \ - $(ACE_ROOT)/ace/Lock.inl \ + $(ACE_ROOT)/ace/Guard_T.cpp \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ $(ACE_ROOT)/ace/RW_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.inl \ - $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \ - $(ACE_ROOT)/ace/Guard_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_Traits.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/os_include/os_dlfcn.h \ - $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Timer_Queuefwd.h \ $(ACE_ROOT)/ace/Reactor_Timer_Interface.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Thread_Exit.h \ $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \ - $(ACE_ROOT)/ace/Condition_Thread_Mutex.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(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/Array_Base.inl \ $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/TSS_T.h \ - $(ACE_ROOT)/ace/TSS_T.inl \ $(ACE_ROOT)/ace/TSS_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/TSS_T.inl \ $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \ - $(ACE_ROOT)/ace/Recursive_Thread_Mutex.inl \ $(ACE_ROOT)/ace/Static_Object_Lock.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/Managed_Object.i \ $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ $(ACE_ROOT)/ace/Reverse_Lock_T.h \ - $(ACE_ROOT)/ace/Reverse_Lock_T.inl \ $(ACE_ROOT)/ace/Reverse_Lock_T.cpp \ + $(ACE_ROOT)/ace/Reverse_Lock_T.inl \ + $(ACE_ROOT)/ace/OS_NS_errno.h \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/os_include/sys/os_select.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/os_include/os_strings.h \ $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(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 \ + $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/OS_NS_sys_time.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/os_include/os_assert.h \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/os_include/os_dirent.h \ - $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Null_Condition.h \ $(ACE_ROOT)/ace/Null_Mutex.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/os_include/os_assert.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ Encoding.h .obj/InputSource.o .obj/InputSource.so .shobj/InputSource.o .shobj/InputSource.so: InputSource.cpp \ @@ -1766,33 +1265,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -1800,9 +1277,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -1818,51 +1292,36 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ StreamFactory.h \ $(ACE_ROOT)/ace/Swap.h \ - $(ACE_ROOT)/ace/Swap.inl \ - $(ACE_ROOT)/ace/Swap.cpp + $(ACE_ROOT)/ace/Swap.cpp \ + $(ACE_ROOT)/ace/Swap.inl .obj/LocatorImpl.o .obj/LocatorImpl.so .shobj/LocatorImpl.o .shobj/LocatorImpl.so: LocatorImpl.cpp \ LocatorImpl.h \ @@ -1897,33 +1356,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -1931,9 +1368,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -1949,47 +1383,32 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ LocatorImpl.i .obj/Mem_Map_Stream.o .obj/Mem_Map_Stream.so .shobj/Mem_Map_Stream.o .shobj/Mem_Map_Stream.so: Mem_Map_Stream.cpp \ @@ -2002,23 +1421,18 @@ endif $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Addr.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ $(ACE_ROOT)/ace/config-all.h \ $(ACE_ROOT)/ace/OS_main.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ $(ACE_ROOT)/ace/os_include/sys/os_types.h \ $(ACE_ROOT)/ace/os_include/os_stddef.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/os_include/os_dirent.h \ $(ACE_ROOT)/ace/os_include/os_limits.h \ $(ACE_ROOT)/ace/os_include/os_unistd.h \ @@ -2026,9 +1440,28 @@ endif $(ACE_ROOT)/ace/os_include/os_stdint.h \ $(ACE_ROOT)/ace/os_include/os_stdio.h \ $(ACE_ROOT)/ace/os_include/os_stdarg.h \ - $(ACE_ROOT)/ace/FILE_Addr.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SStringfwd.h \ + Mem_Map_Stream.h \ + ACEXML_Export.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/OS_NS_stropts.h \ + $(ACE_ROOT)/ace/os_include/os_stropts.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ + $(ACE_ROOT)/ace/os_include/sys/os_socket.h \ + $(ACE_ROOT)/ace/os_include/sys/os_uio.h \ + $(ACE_ROOT)/ace/os_include/net/os_if.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(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/Basic_Types.h \ $(ACE_ROOT)/ace/os_include/os_float.h \ $(ACE_ROOT)/ace/os_include/os_stdlib.h \ @@ -2038,255 +1471,163 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(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/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/ACE.h \ - $(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/os_include/netinet/os_in.h \ - $(ACE_ROOT)/ace/os_include/sys/os_socket.h \ - $(ACE_ROOT)/ace/os_include/sys/os_uio.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/Default_Constants.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ - $(ACE_ROOT)/ace/os_include/net/os_if.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.h \ - $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - Mem_Map_Stream.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/OS_NS_arpa_inet.h \ - $(ACE_ROOT)/ace/os_include/arpa/os_inet.h \ - $(ACE_ROOT)/ace/OS_NS_arpa_inet.inl \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Thread_Mutex.h \ - $(ACE_ROOT)/ace/Thread_Mutex.inl \ $(ACE_ROOT)/ace/Atomic_Op_T.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Atomic_Op_T.i \ $(ACE_ROOT)/ace/Guard_T.h \ $(ACE_ROOT)/ace/Lock.h \ - $(ACE_ROOT)/ace/Lock.inl \ + $(ACE_ROOT)/ace/Guard_T.cpp \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ $(ACE_ROOT)/ace/RW_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.inl \ - $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \ - $(ACE_ROOT)/ace/Guard_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_Traits.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/os_include/os_dlfcn.h \ - $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Timer_Queuefwd.h \ $(ACE_ROOT)/ace/Reactor_Timer_Interface.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Thread_Exit.h \ $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \ - $(ACE_ROOT)/ace/Condition_Thread_Mutex.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(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/Array_Base.inl \ $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/TSS_T.h \ - $(ACE_ROOT)/ace/TSS_T.inl \ $(ACE_ROOT)/ace/TSS_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/TSS_T.inl \ + $(ACE_ROOT)/ace/OS_NS_stdio.h \ $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \ - $(ACE_ROOT)/ace/Recursive_Thread_Mutex.inl \ $(ACE_ROOT)/ace/Static_Object_Lock.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/Managed_Object.i \ $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ $(ACE_ROOT)/ace/Reverse_Lock_T.h \ - $(ACE_ROOT)/ace/Reverse_Lock_T.inl \ $(ACE_ROOT)/ace/Reverse_Lock_T.cpp \ + $(ACE_ROOT)/ace/Reverse_Lock_T.inl \ + $(ACE_ROOT)/ace/OS_NS_errno.h \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/os_include/sys/os_select.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/os_include/os_strings.h \ $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/OS_NS_string.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(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 \ + $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/OS_NS_sys_time.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/os_include/os_assert.h \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Null_Condition.h \ $(ACE_ROOT)/ace/Null_Mutex.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/os_include/os_assert.h \ $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SStringfwd.h \ + $(ACE_ROOT)/ace/String_Base.h \ + $(ACE_ROOT)/ace/String_Base_Const.h \ + $(ACE_ROOT)/ace/String_Base.cpp \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ XML_Types.h .obj/NamespaceSupport.o .obj/NamespaceSupport.so .shobj/NamespaceSupport.o .shobj/NamespaceSupport.so: NamespaceSupport.cpp \ @@ -2321,33 +1662,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -2355,9 +1674,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -2373,83 +1689,63 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Guard_T.h \ $(ACE_ROOT)/ace/Lock.h \ - $(ACE_ROOT)/ace/Lock.inl \ + $(ACE_ROOT)/ace/Guard_T.cpp \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ $(ACE_ROOT)/ace/RW_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.inl \ - $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \ - $(ACE_ROOT)/ace/Guard_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Null_Mutex.h \ NamespaceSupport.i @@ -2486,33 +1782,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -2520,9 +1794,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -2538,53 +1809,37 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ XML_Macros.h \ $(ACE_ROOT)/ace/Exception_Macros.h \ - Exception.i \ - SAXExceptions.i \ $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h + $(ACE_ROOT)/ace/Log_Priority.h \ + SAXExceptions.i .obj/StrCharStream.o .obj/StrCharStream.so .shobj/StrCharStream.o .shobj/StrCharStream.so: StrCharStream.cpp \ StrCharStream.h \ @@ -2619,33 +1874,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -2653,9 +1886,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -2671,47 +1901,32 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ Encoding.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h @@ -2744,13 +1959,6 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ StreamFactory.h \ ACEXML_Export.h \ XML_Types.h \ @@ -2761,20 +1969,6 @@ endif $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -2782,9 +1976,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -2800,47 +1991,31 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ FileCharStream.h \ CharStream.h \ Encoding.h \ @@ -2848,14 +2023,6 @@ endif URL_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/OS_NS_arpa_inet.h \ - $(ACE_ROOT)/ace/os_include/arpa/os_inet.h \ - $(ACE_ROOT)/ace/OS_NS_arpa_inet.inl \ - URL_Addr.inl \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ Mem_Map_Stream.h \ $(ACE_ROOT)/ace/SOCK_Stream.h \ $(ACE_ROOT)/ace/SOCK_IO.h \ @@ -2866,157 +2033,127 @@ endif $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Thread_Mutex.h \ - $(ACE_ROOT)/ace/Thread_Mutex.inl \ $(ACE_ROOT)/ace/Atomic_Op_T.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Atomic_Op_T.i \ $(ACE_ROOT)/ace/Guard_T.h \ $(ACE_ROOT)/ace/Lock.h \ - $(ACE_ROOT)/ace/Lock.inl \ + $(ACE_ROOT)/ace/Guard_T.cpp \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ $(ACE_ROOT)/ace/RW_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.inl \ - $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \ - $(ACE_ROOT)/ace/Guard_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_Traits.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/os_include/os_dlfcn.h \ - $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Timer_Queuefwd.h \ $(ACE_ROOT)/ace/Reactor_Timer_Interface.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Thread_Exit.h \ $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \ - $(ACE_ROOT)/ace/Condition_Thread_Mutex.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(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/Array_Base.inl \ $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/TSS_T.h \ - $(ACE_ROOT)/ace/TSS_T.inl \ $(ACE_ROOT)/ace/TSS_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/TSS_T.inl \ + $(ACE_ROOT)/ace/OS_NS_stdio.h \ $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \ - $(ACE_ROOT)/ace/Recursive_Thread_Mutex.inl \ $(ACE_ROOT)/ace/Static_Object_Lock.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/Managed_Object.i \ $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ $(ACE_ROOT)/ace/Reverse_Lock_T.h \ - $(ACE_ROOT)/ace/Reverse_Lock_T.inl \ $(ACE_ROOT)/ace/Reverse_Lock_T.cpp \ + $(ACE_ROOT)/ace/Reverse_Lock_T.inl \ + $(ACE_ROOT)/ace/OS_NS_errno.h \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/os_include/sys/os_select.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/os_include/os_strings.h \ $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(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 \ + $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/OS_NS_sys_time.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/os_include/os_assert.h \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/os_include/os_dirent.h \ - $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Null_Condition.h \ $(ACE_ROOT)/ace/Null_Mutex.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/os_include/os_assert.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i + $(ACE_ROOT)/ace/Dynamic.h .obj/Transcode.o .obj/Transcode.so .shobj/Transcode.o .shobj/Transcode.so: Transcode.cpp \ Transcode.h \ @@ -3050,33 +2187,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -3084,9 +2199,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -3102,47 +2214,32 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ Transcode.i .obj/URL_Addr.o .obj/URL_Addr.so .shobj/URL_Addr.o .shobj/URL_Addr.so: URL_Addr.cpp \ @@ -3177,71 +2274,26 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/os_include/netinet/os_in.h \ $(ACE_ROOT)/ace/os_include/sys/os_socket.h \ $(ACE_ROOT)/ace/os_include/sys/os_uio.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_NS_arpa_inet.h \ - $(ACE_ROOT)/ace/os_include/arpa/os_inet.h \ - $(ACE_ROOT)/ace/OS_NS_arpa_inet.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/os_include/os_fcntl.h \ - $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ XML_Types.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SStringfwd.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/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/Global_Macros.h \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/os_include/os_errno.h \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/OS_NS_fcntl.h \ + $(ACE_ROOT)/ace/os_include/os_fcntl.h \ + $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -3249,37 +2301,38 @@ endif $(ACE_ROOT)/ace/Init_ACE.h \ $(ACE_ROOT)/ace/Init_ACE.i \ $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/OS_NS_unistd.h \ + $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ URL_Addr.inl \ $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/OS_NS_stdio.h .obj/Validator.o .obj/Validator.so .shobj/Validator.o .shobj/Validator.so: Validator.cpp \ Validator.h \ @@ -3314,33 +2367,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -3348,9 +2379,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -3366,57 +2394,37 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ Env.h \ XML_Macros.h \ $(ACE_ROOT)/ace/Exception_Macros.h \ Exception.h \ - Exception.i \ - Env.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - SAXExceptions.h \ - SAXExceptions.i + SAXExceptions.h .obj/XMLFilterImpl.o .obj/XMLFilterImpl.so .shobj/XMLFilterImpl.o .shobj/XMLFilterImpl.so: XMLFilterImpl.cpp \ XMLFilterImpl.h \ @@ -3457,33 +2465,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -3491,9 +2477,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -3509,53 +2492,33 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - Exception.i \ - Env.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ SAXExceptions.h \ - SAXExceptions.i \ Locator.h \ Attributes.h \ DTDHandler.h \ @@ -3576,12 +2539,11 @@ endif $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_main.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/OS_Memory.h \ $(ACE_ROOT)/ace/os_include/os_stddef.h \ $(ACE_ROOT)/ace/OS_NS_stdlib.h \ @@ -3593,11 +2555,6 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ $(ACE_ROOT)/ace/OS_NS_string.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/os_include/os_limits.h \ @@ -3607,15 +2564,6 @@ endif $(ACE_ROOT)/ace/os_include/os_stdio.h \ $(ACE_ROOT)/ace/os_include/os_stdarg.h \ $(ACE_ROOT)/ace/os_include/os_float.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ XML_Codecs.h \ ACEXML_Export.h \ XML_Types.h \ @@ -3623,10 +2571,6 @@ endif $(ACE_ROOT)/ace/SStringfwd.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/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -3634,9 +2578,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -3652,44 +2593,26 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ - $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/Codecs.h .obj/ZipCharStream.o .obj/ZipCharStream.so .shobj/ZipCharStream.o .shobj/ZipCharStream.so: ZipCharStream.cpp diff --git a/ACEXML/common/Mem_Map_Stream.cpp b/ACEXML/common/Mem_Map_Stream.cpp index 177919da995..14d69cc4199 100644 --- a/ACEXML/common/Mem_Map_Stream.cpp +++ b/ACEXML/common/Mem_Map_Stream.cpp @@ -6,6 +6,7 @@ ACE_RCSID(common, Mem_Map_Stream, "$Id$") ACEXML_Mem_Map_Stream::ACEXML_Mem_Map_Stream (void) + : svc_handler_ (0) { } @@ -260,6 +261,7 @@ ACEXML_Mem_Map_Stream::~ACEXML_Mem_Map_Stream (void) { // Remove the mapping and the file. this->mem_map_.remove (); + delete this->svc_handler_; } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/ACEXML/common/StrCharStream.cpp b/ACEXML/common/StrCharStream.cpp index 93528e452e0..fe566e8bd0e 100644 --- a/ACEXML/common/StrCharStream.cpp +++ b/ACEXML/common/StrCharStream.cpp @@ -67,6 +67,8 @@ ACEXML_StrCharStream::determine_encoding (void) return -1; else { + if (this->encoding_) + delete [] this->encoding_; this->encoding_ = ACE::strnew (temp); // ACE_DEBUG ((LM_DEBUG, "String's encoding is %s\n", this->encoding_)); } @@ -77,6 +79,7 @@ void ACEXML_StrCharStream::rewind (void) { this->ptr_ = this->start_; + this->determine_encoding(); } int diff --git a/ACEXML/common/ZipCharStream.cpp b/ACEXML/common/ZipCharStream.cpp index 296f78a385e..3303451c1eb 100644 --- a/ACEXML/common/ZipCharStream.cpp +++ b/ACEXML/common/ZipCharStream.cpp @@ -50,6 +50,8 @@ ACEXML_ZipCharStream::determine_encoding (void) return -1; else { + if (this->encoding_) + delete [] this->encoding_; this->encoding_ = ACE::strnew (temp); // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("File's encoding is %s\n"), // this->encoding_)); @@ -75,6 +77,7 @@ ACEXML_ZipCharStream::rewind() if (this->infile_ == 0) return; zzip_rewind (this->infile_); + this->determine_encoding(); } int diff --git a/ACEXML/examples/SAXPrint/Makefile.SAXPrint b/ACEXML/examples/SAXPrint/Makefile.SAXPrint index b2c567fc415..e2daa138d07 100644 --- a/ACEXML/examples/SAXPrint/Makefile.SAXPrint +++ b/ACEXML/examples/SAXPrint/Makefile.SAXPrint @@ -93,33 +93,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -127,9 +105,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -145,60 +120,37 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ACEXML/common/Encoding.h \ $(ACE_ROOT)/ACEXML/common/HttpCharStream.h \ $(ACE_ROOT)/ACEXML/common/URL_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/OS_NS_arpa_inet.h \ - $(ACE_ROOT)/ace/os_include/arpa/os_inet.h \ - $(ACE_ROOT)/ace/OS_NS_arpa_inet.inl \ - $(ACE_ROOT)/ACEXML/common/URL_Addr.inl \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ACEXML/common/Mem_Map_Stream.h \ $(ACE_ROOT)/ace/SOCK_Stream.h \ $(ACE_ROOT)/ace/SOCK_IO.h \ @@ -209,157 +161,127 @@ endif $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Thread_Mutex.h \ - $(ACE_ROOT)/ace/Thread_Mutex.inl \ $(ACE_ROOT)/ace/Atomic_Op_T.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Atomic_Op_T.i \ $(ACE_ROOT)/ace/Guard_T.h \ $(ACE_ROOT)/ace/Lock.h \ - $(ACE_ROOT)/ace/Lock.inl \ + $(ACE_ROOT)/ace/Guard_T.cpp \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ $(ACE_ROOT)/ace/RW_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.inl \ - $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \ - $(ACE_ROOT)/ace/Guard_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_Traits.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/os_include/os_dlfcn.h \ - $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Timer_Queuefwd.h \ $(ACE_ROOT)/ace/Reactor_Timer_Interface.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Thread_Exit.h \ $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \ - $(ACE_ROOT)/ace/Condition_Thread_Mutex.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(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/Array_Base.inl \ $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/TSS_T.h \ - $(ACE_ROOT)/ace/TSS_T.inl \ $(ACE_ROOT)/ace/TSS_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/TSS_T.inl \ + $(ACE_ROOT)/ace/OS_NS_stdio.h \ $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \ - $(ACE_ROOT)/ace/Recursive_Thread_Mutex.inl \ $(ACE_ROOT)/ace/Static_Object_Lock.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/Managed_Object.i \ $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ $(ACE_ROOT)/ace/Reverse_Lock_T.h \ - $(ACE_ROOT)/ace/Reverse_Lock_T.inl \ $(ACE_ROOT)/ace/Reverse_Lock_T.cpp \ + $(ACE_ROOT)/ace/Reverse_Lock_T.inl \ + $(ACE_ROOT)/ace/OS_NS_errno.h \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/os_include/sys/os_select.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/os_include/os_strings.h \ $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(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 \ + $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/OS_NS_sys_time.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/os_include/os_assert.h \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/os_include/os_dirent.h \ - $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Null_Condition.h \ $(ACE_ROOT)/ace/Null_Mutex.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/os_include/os_assert.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ACEXML/common/StrCharStream.h \ $(ACE_ROOT)/ACEXML/common/ZipCharStream.h \ $(ACE_ROOT)/ACEXML/parser/parser/Parser.h \ @@ -370,10 +292,7 @@ endif $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ $(ACE_ROOT)/ace/Exception_Macros.h \ $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ $(ACE_ROOT)/ACEXML/common/Locator.h \ $(ACE_ROOT)/ACEXML/common/Attributes.h \ $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ @@ -381,46 +300,32 @@ endif $(ACE_ROOT)/ACEXML/common/InputSource.h \ $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ $(ACE_ROOT)/ACEXML/common/LocatorImpl.h \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.i \ $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i \ $(ACE_ROOT)/ace/Obstack.h \ $(ACE_ROOT)/ace/Obstack_T.h \ $(ACE_ROOT)/ace/Obchunk.h \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.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/Memory_Pool.i \ - $(ACE_ROOT)/ace/Obchunk.i \ - $(ACE_ROOT)/ace/Obstack_T.i \ $(ACE_ROOT)/ace/Obstack_T.cpp \ + $(ACE_ROOT)/ace/Obstack_T.i \ $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.i \ $(ACE_ROOT)/ACEXML/parser/parser/ParserInternals.h \ $(ACE_ROOT)/ACEXML/parser/parser/ParserContext.h \ $(ACE_ROOT)/ace/Swap.h \ - $(ACE_ROOT)/ace/Swap.inl \ $(ACE_ROOT)/ace/Swap.cpp \ - $(ACE_ROOT)/ACEXML/parser/parser/ParserContext.inl \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser.i \ - Print_Handler.h \ + $(ACE_ROOT)/ace/Swap.inl Print_Handler.h \ $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \ - SAXPrint_Handler.h SAXPrint_Handler.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i + SAXPrint_Handler.h $(ACE_ROOT)/ace/Get_Opt.h .obj/Print_Handler.o .obj/Print_Handler.so .shobj/Print_Handler.o .shobj/Print_Handler.so: Print_Handler.cpp Print_Handler.h \ $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ @@ -459,33 +364,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -493,9 +376,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -511,53 +391,33 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ $(ACE_ROOT)/ACEXML/common/Locator.h \ $(ACE_ROOT)/ACEXML/common/Attributes.h \ $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ @@ -565,7 +425,8 @@ endif $(ACE_ROOT)/ACEXML/common/InputSource.h \ $(ACE_ROOT)/ACEXML/common/CharStream.h \ $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h Print_Handler.i .obj/SAXPrint_Handler.o .obj/SAXPrint_Handler.so .shobj/SAXPrint_Handler.o .shobj/SAXPrint_Handler.so: SAXPrint_Handler.cpp SAXPrint_Handler.h \ $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ @@ -604,33 +465,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -638,9 +477,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -656,53 +492,33 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ $(ACE_ROOT)/ACEXML/common/Locator.h \ $(ACE_ROOT)/ACEXML/common/Attributes.h \ $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ @@ -710,7 +526,8 @@ endif $(ACE_ROOT)/ACEXML/common/InputSource.h \ $(ACE_ROOT)/ACEXML/common/CharStream.h \ $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ SAXPrint_Handler.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/examples/SAXPrint/main.cpp b/ACEXML/examples/SAXPrint/main.cpp index 9a7b7930acd..ad0e2e56c68 100644 --- a/ACEXML/examples/SAXPrint/main.cpp +++ b/ACEXML/examples/SAXPrint/main.cpp @@ -157,11 +157,48 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) parser.parse (&input ACEXML_ENV_ARG_PARAMETER); ACEXML_TRY_CHECK; } - ACEXML_CATCH (ACEXML_SAXException, ex) + ACEXML_CATCH (ACEXML_Exception, ex) { ex.print(); ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Exception occurred. Exiting...\n"))); + return 1; } ACEXML_ENDTRY; +// ACEXML_TRY_EX (SECOND) +// { +// parser.parse (&input ACEXML_ENV_ARG_PARAMETER); +// ACEXML_TRY_CHECK_EX (SECOND); +// } +// ACEXML_CATCH (ACEXML_SAXException, ex) +// { +// ex.print(); +// ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Exception occurred. Exiting...\n"))); +// return 1; +// } +// ACEXML_ENDTRY; +// ACEXML_TRY_EX (THIRD) +// { +// parser.parse (&input ACEXML_ENV_ARG_PARAMETER); +// ACEXML_TRY_CHECK_EX (THIRD); +// } +// ACEXML_CATCH (ACEXML_SAXException, ex) +// { +// ex.print(); +// ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Exception occurred. Exiting...\n"))); +// return 1; +// } +// ACEXML_ENDTRY; +// ACEXML_TRY_EX (FOURTH) +// { +// parser.parse (&input ACEXML_ENV_ARG_PARAMETER); +// ACEXML_TRY_CHECK_EX (FOURTH); +// } +// ACEXML_CATCH (ACEXML_SAXException, ex) +// { +// ex.print(); +// ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Exception occurred. Exiting...\n"))); +// return 1; +// } +// ACEXML_ENDTRY; return 0; } diff --git a/ACEXML/parser/parser/Entity_Manager.cpp b/ACEXML/parser/parser/Entity_Manager.cpp index 2d1e0201b92..a6c7dec62c0 100644 --- a/ACEXML/parser/parser/Entity_Manager.cpp +++ b/ACEXML/parser/parser/Entity_Manager.cpp @@ -10,13 +10,14 @@ static const ACEXML_Char empty_string[] = { 0 }; ACEXML_Entity_Manager::ACEXML_Entity_Manager (void) - : entities_ () + : entities_ (0) { } ACEXML_Entity_Manager::~ACEXML_Entity_Manager (void) { + this->reset(); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/ACEXML/parser/parser/Entity_Manager.h b/ACEXML/parser/parser/Entity_Manager.h index 5eec188a184..9e264bf8d5e 100644 --- a/ACEXML/parser/parser/Entity_Manager.h +++ b/ACEXML/parser/parser/Entity_Manager.h @@ -86,7 +86,9 @@ public: int reset (void); private: - ACEXML_ENTITIES_MANAGER entities_; + ACEXML_ENTITIES_MANAGER* entities_; + bool init_; + }; #if defined (__ACEXML_INLINE__) diff --git a/ACEXML/parser/parser/Entity_Manager.i b/ACEXML/parser/parser/Entity_Manager.i index cb3d004e98d..05b3859724b 100644 --- a/ACEXML/parser/parser/Entity_Manager.i +++ b/ACEXML/parser/parser/Entity_Manager.i @@ -4,17 +4,22 @@ ACEXML_INLINE int ACEXML_Entity_Manager::add_entity (const ACEXML_Char *ref, const ACEXML_Char *v) { + if (!this->entities_ ) + ACE_NEW_RETURN (this->entities_, ACEXML_ENTITIES_MANAGER, -1); ACEXML_String name (ref, 0, 0); ACEXML_String value (v, 0, 0); - return this->entities_.bind (name, value); + return this->entities_->bind (name, value); } ACEXML_INLINE const ACEXML_Char* ACEXML_Entity_Manager::resolve_entity (const ACEXML_Char *ref) { + if (!this->entities_) + return 0; + ACEXML_ENTITY_ENTRY *entry; - if (this->entities_.find (ACEXML_String (ref, 0, 0), + if (this->entities_->find (ACEXML_String (ref, 0, 0), entry) == 0) return entry->int_id_.c_str(); return 0; @@ -25,9 +30,12 @@ ACEXML_Entity_Manager::resolve_entity (const ACEXML_Char* ref, ACEXML_Char*& systemId, ACEXML_Char*& publicId) { + if (!this->entities_) + return 0; + publicId = systemId = 0; - ACEXML_ENTITY_ENTRY_ITERATOR iter (this->entities_, ref); - ACEXML_ENTITY_ENTRY_ITERATOR end (this->entities_, ref, 1); + ACEXML_ENTITY_ENTRY_ITERATOR iter (*this->entities_, ref); + ACEXML_ENTITY_ENTRY_ITERATOR end (*this->entities_, ref, 1); if (iter != end) { @@ -43,8 +51,8 @@ ACEXML_Entity_Manager::resolve_entity (const ACEXML_Char* ref, ACEXML_INLINE int ACEXML_Entity_Manager::reset (void) { - if (this->entities_.close() < 0 || this->entities_.open() < 0) - return -1; + delete this->entities_; + this->entities_ = 0; return 0; } @@ -52,5 +60,7 @@ ACEXML_Entity_Manager::reset (void) ACEXML_INLINE size_t ACEXML_Entity_Manager::size (void) const { - return this->entities_.current_size(); + if (!this->entities_) + return 0; + return this->entities_->current_size(); } diff --git a/ACEXML/parser/parser/Makefile.ACEXML_Parser b/ACEXML/parser/parser/Makefile.ACEXML_Parser index 7051246cb21..64aba6a3c64 100644 --- a/ACEXML/parser/parser/Makefile.ACEXML_Parser +++ b/ACEXML/parser/parser/Makefile.ACEXML_Parser @@ -96,33 +96,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -130,9 +108,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -148,67 +123,48 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Guard_T.h \ $(ACE_ROOT)/ace/Lock.h \ - $(ACE_ROOT)/ace/Lock.inl \ + $(ACE_ROOT)/ace/Guard_T.cpp \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ $(ACE_ROOT)/ace/RW_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.inl \ - $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \ - $(ACE_ROOT)/ace/Guard_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Null_Mutex.h \ Entity_Manager.i @@ -251,33 +207,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -285,9 +219,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -303,53 +234,33 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ $(ACE_ROOT)/ACEXML/common/Locator.h \ $(ACE_ROOT)/ACEXML/common/Attributes.h \ $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ @@ -358,98 +269,79 @@ endif $(ACE_ROOT)/ACEXML/common/CharStream.h \ $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ $(ACE_ROOT)/ACEXML/common/LocatorImpl.h \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.i \ $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Guard_T.h \ $(ACE_ROOT)/ace/Lock.h \ - $(ACE_ROOT)/ace/Lock.inl \ + $(ACE_ROOT)/ace/Guard_T.cpp \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ $(ACE_ROOT)/ace/RW_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.inl \ - $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \ - $(ACE_ROOT)/ace/Guard_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Null_Mutex.h \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i \ $(ACE_ROOT)/ace/Obstack.h \ $(ACE_ROOT)/ace/Obstack_T.h \ $(ACE_ROOT)/ace/Obchunk.h \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(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/Free_List.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Thread_Mutex.h \ - $(ACE_ROOT)/ace/Thread_Mutex.inl \ $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op_T.i \ $(ACE_ROOT)/ace/Synch_Traits.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/Memory_Pool.i \ - $(ACE_ROOT)/ace/Obchunk.i \ - $(ACE_ROOT)/ace/Obstack_T.i \ $(ACE_ROOT)/ace/Obstack_T.cpp \ + $(ACE_ROOT)/ace/Obstack_T.i \ Entity_Manager.h \ - Entity_Manager.i \ ParserInternals.h \ ParserContext.h \ $(ACE_ROOT)/ace/Swap.h \ - $(ACE_ROOT)/ace/Swap.inl \ $(ACE_ROOT)/ace/Swap.cpp \ - ParserContext.inl \ + $(ACE_ROOT)/ace/Swap.inl \ Parser.i \ $(ACE_ROOT)/ACEXML/common/Transcode.h \ - $(ACE_ROOT)/ACEXML/common/Transcode.i \ $(ACE_ROOT)/ACEXML/common/AttributesImpl.h \ - $(ACE_ROOT)/ACEXML/common/AttributesImpl.i \ $(ACE_ROOT)/ACEXML/common/StrCharStream.h \ $(ACE_ROOT)/ACEXML/common/StreamFactory.h \ $(ACE_ROOT)/ace/OS_NS_strings.h \ - $(ACE_ROOT)/ace/os_include/os_strings.h \ - $(ACE_ROOT)/ace/OS_NS_strings.inl + $(ACE_ROOT)/ace/os_include/os_strings.h .obj/ParserContext.o .obj/ParserContext.so .shobj/ParserContext.o .shobj/ParserContext.so: ParserContext.cpp \ ParserContext.h \ @@ -483,33 +375,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -517,9 +387,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -535,79 +402,61 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ACEXML/common/InputSource.h \ $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ $(ACE_ROOT)/ACEXML/common/CharStream.h \ $(ACE_ROOT)/ACEXML/common/Locator.h \ $(ACE_ROOT)/ACEXML/common/LocatorImpl.h \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.i \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Swap.h \ - $(ACE_ROOT)/ace/Swap.inl \ $(ACE_ROOT)/ace/Swap.cpp \ + $(ACE_ROOT)/ace/Swap.inl \ ParserContext.inl .obj/ParserInternals.o .obj/ParserInternals.so .shobj/ParserInternals.o .shobj/ParserInternals.so: ParserInternals.cpp \ @@ -642,33 +491,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -676,9 +503,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -694,46 +518,31 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp index 78b03be23ab..ad4066ce522 100644 --- a/ACEXML/parser/parser/Parser.cpp +++ b/ACEXML/parser/parser/Parser.cpp @@ -55,6 +55,7 @@ ACEXML_Parser::ACEXML_Parser (void) ACEXML_Parser::~ACEXML_Parser (void) { + } int @@ -73,7 +74,8 @@ ACEXML_Parser::initialize(ACEXML_InputSource* input) ACEXML_ParserInt::predef_val_[i]) != 0) { - ACE_ERROR ((LM_DEBUG, ACE_TEXT ("Error adding entity %s to Manager"), + ACE_ERROR ((LM_DEBUG, + ACE_TEXT ("Error adding entity %s to Manager\n"), ACEXML_ParserInt::predef_ent_[i])); return -1; } @@ -474,45 +476,64 @@ ACEXML_Parser::parse_conditional_section (ACEXML_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Char ch = this->get (); + int include = 0; if (ch != '[') { this->fatal_error(ACE_TEXT ("Internal Parser Error") ACEXML_ENV_ARG_PARAMETER); ACEXML_CHECK_RETURN (-1); } - if (this->skip_whitespace() != 'I') + ch = this->skip_whitespace(); + if (ch == '%') { - this->fatal_error (ACE_TEXT ("Invalid conditionalSect") - ACEXML_ENV_ARG_PARAMETER); + this->parse_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); ACEXML_CHECK_RETURN (-1); + ch = this->skip_whitespace(); } - ch = this->get(); - int include = 0; - switch (ch) + if (ch == 'I') { - case 'N': - if (this->parse_token (ACE_TEXT ("CLUDE")) < 0) - { - this->fatal_error (ACE_TEXT ("Expecting keyword INCLUDE in ") - ACE_TEXT ("conditionalSect") ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - } - include = 1; - break; - case 'G': - if (this->parse_token (ACE_TEXT ("GNORE")) < 0) - { - this->fatal_error (ACE_TEXT ("Expecting keyword IGNORE in ") - ACE_TEXT ("conditionalSect") + ch = this->get(); + switch (ch) + { + case 'N': + if (this->parse_token (ACE_TEXT ("CLUDE")) < 0) + { + this->fatal_error (ACE_TEXT ("Expecting keyword INCLUDE in ") + ACE_TEXT ("conditionalSect") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + include = 1; + break; + case 'G': + if (this->parse_token (ACE_TEXT ("GNORE")) < 0) + { + this->fatal_error (ACE_TEXT ("Expecting keyword IGNORE in ") + ACE_TEXT ("conditionalSect") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + include = 0; + break; + default: + this->fatal_error (ACE_TEXT ("Invalid conditionalSect") ACEXML_ENV_ARG_PARAMETER); ACEXML_CHECK_RETURN (-1); - } - include = 0; - break; - default: - this->fatal_error (ACE_TEXT ("Invalid conditionalSect") - ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); + } + ACEXML_Char fwd = '\xFF'; + this->skip_whitespace_count (&fwd); + if (fwd == 0) + { + this->get(); // Consume the 0 + this->pop_context (0 ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + } + else + { + this->fatal_error (ACE_TEXT ("Invalid conditionalSect") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } if (this->skip_whitespace() != '[') { @@ -1386,6 +1407,10 @@ ACEXML_Parser::parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_DECL) this->skip_whitespace_count (&fwd); if (fwd == '>') break; + + count = this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + attname = this->parse_attname (ACEXML_ENV_SINGLE_ARG_PARAMETER); ACEXML_CHECK_RETURN (-1); @@ -2006,6 +2031,26 @@ ACEXML_Parser::parse_children_definition (ACEXML_ENV_SINGLE_ARG_DECL) return -1; } + // Check for trailing '?', '*', '+' + nextch = this->peek (); + switch (nextch) + { + case '?': + // @@ Consume the character and inform validator as such, + this->get (); + break; + case '*': + // @@ Consume the character and inform validator as such, + this->get (); + break; + case '+': + // @@ Consume the character and inform validator as such, + this->get (); + break; + default: + break; // not much to do. + } + return 0; } @@ -2123,7 +2168,6 @@ ACEXML_Parser::parse_child (int skip_open_paren ACEXML_ENV_ARG_DECL) this->skip_whitespace_count (&nextch); } while (nextch != ')'); - // Check for trailing '?', '*', '+' nextch = this->peek (); switch (nextch) @@ -2143,6 +2187,8 @@ ACEXML_Parser::parse_child (int skip_open_paren ACEXML_ENV_ARG_DECL) default: break; // not much to do. } + + return 0; } @@ -3069,6 +3115,7 @@ ACEXML_Parser::fatal_error (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) ACE_NEW_NORETURN (exception, ACEXML_SAXParseException (msg)); if (this->error_handler_) this->error_handler_->fatalError (*exception ACEXML_ENV_ARG_PARAMETER); + this->reset(); ACEXML_ENV_RAISE (exception); return; } @@ -3298,7 +3345,10 @@ ACEXML_Parser::reset (void) if (this->ctx_stack_.pop (this->current_) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("Mismatched push/pop of Context stack"))); - delete this->current_->getLocator(); + this->current_->getInputSource()->getCharStream()->rewind(); + + this->current_->setInputSource (0); + delete this->current_; this->current_ = 0; ACEXML_Char* temp = 0; diff --git a/ACEXML/parser/parser/ParserContext.h b/ACEXML/parser/parser/ParserContext.h index 13d92e89f56..aa2eae60e09 100644 --- a/ACEXML/parser/parser/ParserContext.h +++ b/ACEXML/parser/parser/ParserContext.h @@ -38,12 +38,6 @@ public: ACEXML_Parser_Context (ACEXML_InputSource* instream, ACEXML_LocatorImpl* locator); - /// Copy constructor - ACEXML_Parser_Context (const ACEXML_Parser_Context& src); - - /// Assignment operator - ACEXML_Parser_Context& operator= (const ACEXML_Parser_Context& src); - /// Comparison operator int operator!= (const ACEXML_Parser_Context& src); @@ -61,8 +55,20 @@ public: /// Get the underlying locator. virtual ACEXML_LocatorImpl* getLocator(void); + /// Set the underlying input source. + virtual void setInputSource(ACEXML_InputSource* ip); + + /// Set the underlying locator. + virtual void setLocator(ACEXML_LocatorImpl* locator); + private: + /// Copy constructor + ACEXML_Parser_Context (const ACEXML_Parser_Context& src); + + /// Assignment operator + ACEXML_Parser_Context& operator= (const ACEXML_Parser_Context& src); + /// Current input char stream. ACEXML_InputSource *instream_; diff --git a/ACEXML/parser/parser/ParserContext.inl b/ACEXML/parser/parser/ParserContext.inl index 1c6da6a65b5..5e64c7ddeac 100644 --- a/ACEXML/parser/parser/ParserContext.inl +++ b/ACEXML/parser/parser/ParserContext.inl @@ -55,6 +55,18 @@ ACEXML_Parser_Context::getLocator (void) } ACEXML_INLINE void +ACEXML_Parser_Context::setInputSource (ACEXML_InputSource* ip) +{ + this->instream_ = ip; +} + +ACEXML_INLINE void +ACEXML_Parser_Context::setLocator (ACEXML_LocatorImpl* locator) +{ + this->locator_ = locator; +} + +ACEXML_INLINE void ACEXML_Parser_Context::reset (void) { this->instream_ = 0; diff --git a/ACEXML/tests/Makefile.ContentHandler_Test b/ACEXML/tests/Makefile.ContentHandler_Test index 4995f6557be..14c2b5b1be5 100644 --- a/ACEXML/tests/Makefile.ContentHandler_Test +++ b/ACEXML/tests/Makefile.ContentHandler_Test @@ -95,33 +95,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -129,9 +107,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -147,53 +122,33 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ $(ACE_ROOT)/ACEXML/common/Locator.h \ $(ACE_ROOT)/ACEXML/common/Attributes.h \ $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ @@ -201,94 +156,76 @@ endif $(ACE_ROOT)/ACEXML/common/InputSource.h \ $(ACE_ROOT)/ACEXML/common/CharStream.h \ $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \ $(ACE_ROOT)/ACEXML/common/StrCharStream.h \ $(ACE_ROOT)/ACEXML/parser/parser/Parser.h \ $(ACE_ROOT)/ACEXML/parser/parser/Parser_export.h \ $(ACE_ROOT)/ACEXML/common/XMLReader.h \ $(ACE_ROOT)/ACEXML/common/LocatorImpl.h \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.i \ $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Guard_T.h \ $(ACE_ROOT)/ace/Lock.h \ - $(ACE_ROOT)/ace/Lock.inl \ + $(ACE_ROOT)/ace/Guard_T.cpp \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ $(ACE_ROOT)/ace/RW_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.inl \ - $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \ - $(ACE_ROOT)/ace/Guard_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Null_Mutex.h \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i \ $(ACE_ROOT)/ace/Obstack.h \ $(ACE_ROOT)/ace/Obstack_T.h \ $(ACE_ROOT)/ace/Obchunk.h \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(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/Free_List.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Thread_Mutex.h \ - $(ACE_ROOT)/ace/Thread_Mutex.inl \ $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op_T.i \ $(ACE_ROOT)/ace/Synch_Traits.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/Memory_Pool.i \ - $(ACE_ROOT)/ace/Obchunk.i \ - $(ACE_ROOT)/ace/Obstack_T.i \ $(ACE_ROOT)/ace/Obstack_T.cpp \ + $(ACE_ROOT)/ace/Obstack_T.i \ $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.i \ $(ACE_ROOT)/ACEXML/parser/parser/ParserInternals.h \ $(ACE_ROOT)/ACEXML/parser/parser/ParserContext.h \ $(ACE_ROOT)/ace/Swap.h \ - $(ACE_ROOT)/ace/Swap.inl \ $(ACE_ROOT)/ace/Swap.cpp \ - $(ACE_ROOT)/ACEXML/parser/parser/ParserContext.inl \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser.i + $(ACE_ROOT)/ace/Swap.inl # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/tests/Makefile.HttpCharStream_Test b/ACEXML/tests/Makefile.HttpCharStream_Test index 455038992b8..36f0e8e6a09 100644 --- a/ACEXML/tests/Makefile.HttpCharStream_Test +++ b/ACEXML/tests/Makefile.HttpCharStream_Test @@ -91,33 +91,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -125,9 +103,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -143,58 +118,35 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ACEXML/common/URL_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/OS_NS_arpa_inet.h \ - $(ACE_ROOT)/ace/os_include/arpa/os_inet.h \ - $(ACE_ROOT)/ace/OS_NS_arpa_inet.inl \ - $(ACE_ROOT)/ACEXML/common/URL_Addr.inl \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ACEXML/common/Mem_Map_Stream.h \ $(ACE_ROOT)/ace/SOCK_Stream.h \ $(ACE_ROOT)/ace/SOCK_IO.h \ @@ -205,156 +157,126 @@ endif $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Thread_Mutex.h \ - $(ACE_ROOT)/ace/Thread_Mutex.inl \ $(ACE_ROOT)/ace/Atomic_Op_T.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Atomic_Op_T.i \ $(ACE_ROOT)/ace/Guard_T.h \ $(ACE_ROOT)/ace/Lock.h \ - $(ACE_ROOT)/ace/Lock.inl \ + $(ACE_ROOT)/ace/Guard_T.cpp \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ $(ACE_ROOT)/ace/RW_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.inl \ - $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \ - $(ACE_ROOT)/ace/Guard_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_Traits.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/os_include/os_dlfcn.h \ - $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Timer_Queuefwd.h \ $(ACE_ROOT)/ace/Reactor_Timer_Interface.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Thread_Exit.h \ $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \ - $(ACE_ROOT)/ace/Condition_Thread_Mutex.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(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/Array_Base.inl \ $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/TSS_T.h \ - $(ACE_ROOT)/ace/TSS_T.inl \ $(ACE_ROOT)/ace/TSS_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/TSS_T.inl \ + $(ACE_ROOT)/ace/OS_NS_stdio.h \ $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \ - $(ACE_ROOT)/ace/Recursive_Thread_Mutex.inl \ $(ACE_ROOT)/ace/Static_Object_Lock.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/Managed_Object.i \ $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ $(ACE_ROOT)/ace/Reverse_Lock_T.h \ - $(ACE_ROOT)/ace/Reverse_Lock_T.inl \ $(ACE_ROOT)/ace/Reverse_Lock_T.cpp \ + $(ACE_ROOT)/ace/Reverse_Lock_T.inl \ + $(ACE_ROOT)/ace/OS_NS_errno.h \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/os_include/sys/os_select.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/os_include/os_strings.h \ $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(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 \ + $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/OS_NS_sys_time.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/os_include/os_assert.h \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/os_include/os_dirent.h \ - $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Null_Condition.h \ $(ACE_ROOT)/ace/Null_Mutex.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/os_include/os_assert.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i + $(ACE_ROOT)/ace/Dynamic.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/tests/Makefile.NamespaceSupport_Test b/ACEXML/tests/Makefile.NamespaceSupport_Test index 2e6a60ea0c2..ebce2b91af8 100644 --- a/ACEXML/tests/Makefile.NamespaceSupport_Test +++ b/ACEXML/tests/Makefile.NamespaceSupport_Test @@ -90,33 +90,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -124,9 +102,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -142,84 +117,63 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Guard_T.h \ $(ACE_ROOT)/ace/Lock.h \ - $(ACE_ROOT)/ace/Lock.inl \ + $(ACE_ROOT)/ace/Guard_T.cpp \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ $(ACE_ROOT)/ace/RW_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.inl \ - $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \ - $(ACE_ROOT)/ace/Guard_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Null_Mutex.h \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Null_Mutex.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/tests/Makefile.Transcoder_Test b/ACEXML/tests/Makefile.Transcoder_Test index fab65f4eb2d..d6f8d8281f5 100644 --- a/ACEXML/tests/Makefile.Transcoder_Test +++ b/ACEXML/tests/Makefile.Transcoder_Test @@ -90,33 +90,11 @@ endif $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/OS_NS_string.h \ - $(ACE_ROOT)/ace/OS_NS_string.inl \ - $(ACE_ROOT)/ace/OS_NS_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_wchar.h \ - $(ACE_ROOT)/ace/os_include/os_string.h \ - $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_NS_wchar.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.h \ - $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ - $(ACE_ROOT)/ace/Object_Manager_Base.inl \ - $(ACE_ROOT)/ace/os_include/os_search.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -124,9 +102,6 @@ endif $(ACE_ROOT)/ace/OS_NS_fcntl.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_errno.h \ - $(ACE_ROOT)/ace/OS_NS_errno.inl \ $(ACE_ROOT)/ace/Handle_Ops.h \ $(ACE_ROOT)/ace/Handle_Ops.i \ $(ACE_ROOT)/ace/Lib_Find.h \ @@ -142,48 +117,32 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_unistd.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_time.h \ - $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/OS_NS_unistd.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ - $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ - $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ - $(ACE_ROOT)/ace/OS_NS_macros.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/iosfwd.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_signal.h \ - $(ACE_ROOT)/ace/OS_NS_signal.inl \ - $(ACE_ROOT)/ace/OS_NS_Thread.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ - $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ + $(ACE_ROOT)/ace/Object_Manager_Base.h \ + $(ACE_ROOT)/ace/Cleanup.h \ + $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/os_include/net/os_if.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ - $(ACE_ROOT)/ace/OS_NS_stropts.inl \ - $(ACE_ROOT)/ace/OS_QoS.h \ - $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ - $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(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)/ACEXML/common/Transcode.i \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/OS_NS_string.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h |