From b8d773091a2010fbf90bfcacd56dce9d0d7564c1 Mon Sep 17 00:00:00 2001 From: zerg Date: Tue, 14 Dec 2010 17:14:34 +0300 Subject: [PATCH] [10874] Update ACE to v5.8.3 (based on zergtmn's repo commit 3a8c259) (based on zergtmn's repo commit 946c1a8) Signed-off-by: VladimirMangos --- dep/ACE_wrappers/ACE-INSTALL.html | 30 +- dep/ACE_wrappers/COPYING | 101 +- dep/ACE_wrappers/ChangeLog | 1598 ++++++++++++++++- dep/ACE_wrappers/NEWS | 36 +- dep/ACE_wrappers/PROBLEM-REPORT-FORM | 17 +- dep/ACE_wrappers/THANKS | 7 + dep/ACE_wrappers/VERSION | 13 +- dep/ACE_wrappers/ace/ACE.cpp | 107 +- dep/ACE_wrappers/ace/ACE.h | 12 +- dep/ACE_wrappers/ace/ACE.inl | 33 +- dep/ACE_wrappers/ace/ACE_export.h | 6 +- dep/ACE_wrappers/ace/Acceptor.cpp | 65 +- dep/ACE_wrappers/ace/Arg_Shifter.cpp | 2 +- dep/ACE_wrappers/ace/Array.h | 29 - dep/ACE_wrappers/ace/Asynch_Acceptor.cpp | 9 +- dep/ACE_wrappers/ace/Asynch_Acceptor.h | 7 +- dep/ACE_wrappers/ace/Asynch_Connector.cpp | 28 +- dep/ACE_wrappers/ace/Atomic_Op.inl | 4 +- dep/ACE_wrappers/ace/Atomic_Op_T.cpp | 4 +- dep/ACE_wrappers/ace/Atomic_Op_T.h | 41 +- dep/ACE_wrappers/ace/Atomic_Op_T.inl | 10 +- dep/ACE_wrappers/ace/Auto_Event.h | 4 +- dep/ACE_wrappers/ace/Auto_IncDec_T.h | 24 +- dep/ACE_wrappers/ace/Barrier.cpp | 22 +- dep/ACE_wrappers/ace/Barrier.h | 25 +- dep/ACE_wrappers/ace/Bound_Ptr.inl | 6 +- dep/ACE_wrappers/ace/CDR_Base.cpp | 25 +- dep/ACE_wrappers/ace/CDR_Base.h | 10 +- dep/ACE_wrappers/ace/CDR_Size.cpp | 14 +- dep/ACE_wrappers/ace/CORBA_macros.h | 367 +--- dep/ACE_wrappers/ace/Cache_Map_Manager_T.cpp | 10 +- dep/ACE_wrappers/ace/Cache_Map_Manager_T.h | 16 +- dep/ACE_wrappers/ace/Cache_Map_Manager_T.inl | 6 +- .../ace/Cached_Connect_Strategy_T.cpp | 27 +- .../ace/Cached_Connect_Strategy_T.h | 14 +- dep/ACE_wrappers/ace/Caching_Strategies_T.h | 8 +- dep/ACE_wrappers/ace/Caching_Utility_T.cpp | 45 +- dep/ACE_wrappers/ace/Caching_Utility_T.h | 70 +- dep/ACE_wrappers/ace/Cleanup_Strategies_T.cpp | 6 +- dep/ACE_wrappers/ace/Codecs.cpp | 4 +- dep/ACE_wrappers/ace/Condition_Thread_Mutex.h | 26 +- .../ace/Condition_Thread_Mutex.inl | 23 +- dep/ACE_wrappers/ace/Configuration.cpp | 22 +- dep/ACE_wrappers/ace/Configuration.h | 21 +- dep/ACE_wrappers/ace/Containers_T.cpp | 35 +- dep/ACE_wrappers/ace/Containers_T.h | 6 +- dep/ACE_wrappers/ace/DEV.h | 15 +- dep/ACE_wrappers/ace/Default_Constants.h | 17 +- dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp | 4 +- dep/ACE_wrappers/ace/Dump_T.h | 4 +- dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp | 6 +- dep/ACE_wrappers/ace/Env_Value_T.h | 14 +- dep/ACE_wrappers/ace/Event_Handler.h | 13 +- dep/ACE_wrappers/ace/Event_Handler_T.cpp | 6 +- dep/ACE_wrappers/ace/Event_Handler_T.h | 5 +- dep/ACE_wrappers/ace/Event_Handler_T.inl | 3 +- dep/ACE_wrappers/ace/FIFO_Recv_Msg.inl | 16 +- dep/ACE_wrappers/ace/FILE.h | 23 +- dep/ACE_wrappers/ace/FILE_IO.h | 6 +- dep/ACE_wrappers/ace/Framework_Component.cpp | 13 +- dep/ACE_wrappers/ace/Framework_Component.h | 24 +- dep/ACE_wrappers/ace/Framework_Component.inl | 7 +- dep/ACE_wrappers/ace/Framework_Component_T.h | 8 +- dep/ACE_wrappers/ace/Free_List.h | 4 +- dep/ACE_wrappers/ace/Functor.h | 63 +- dep/ACE_wrappers/ace/Functor.inl | 38 +- dep/ACE_wrappers/ace/Future.cpp | 28 +- dep/ACE_wrappers/ace/Future.h | 14 +- dep/ACE_wrappers/ace/Future_Set.cpp | 4 +- dep/ACE_wrappers/ace/Future_Set.h | 9 +- dep/ACE_wrappers/ace/Global_Macros.h | 126 +- dep/ACE_wrappers/ace/Guard_T.cpp | 6 +- dep/ACE_wrappers/ace/Guard_T.h | 28 +- dep/ACE_wrappers/ace/Guard_T.inl | 4 +- dep/ACE_wrappers/ace/Handle_Set.h | 6 +- .../ace/Hash_Cache_Map_Manager_T.cpp | 10 +- .../ace/Hash_Cache_Map_Manager_T.h | 10 +- dep/ACE_wrappers/ace/Hash_Map_Manager_T.h | 22 +- .../ace/Hash_Map_With_Allocator_T.h | 4 +- .../ace/Hash_Multi_Map_Manager_T.cpp | 4 +- .../ace/Hash_Multi_Map_Manager_T.h | 21 +- dep/ACE_wrappers/ace/INET_Addr.cpp | 7 +- dep/ACE_wrappers/ace/INET_Addr.h | 12 +- dep/ACE_wrappers/ace/INET_Addr.inl | 9 +- dep/ACE_wrappers/ace/IOStream.h | 10 +- dep/ACE_wrappers/ace/IO_Cntl_Msg.cpp | 46 +- dep/ACE_wrappers/ace/Intrusive_List.cpp | 37 +- dep/ACE_wrappers/ace/Intrusive_List.h | 6 +- dep/ACE_wrappers/ace/Intrusive_List.inl | 8 +- dep/ACE_wrappers/ace/LSOCK_Stream.h | 8 +- dep/ACE_wrappers/ace/Local_Name_Space_T.h | 15 +- dep/ACE_wrappers/ace/Local_Tokens.h | 6 +- dep/ACE_wrappers/ace/Local_Tokens.inl | 16 +- dep/ACE_wrappers/ace/Log_Msg.cpp | 46 +- dep/ACE_wrappers/ace/Log_Msg.h | 40 +- dep/ACE_wrappers/ace/Log_Record.cpp | 4 +- dep/ACE_wrappers/ace/Log_Record.h | 23 +- dep/ACE_wrappers/ace/Log_Record.inl | 33 +- dep/ACE_wrappers/ace/MEM_Acceptor.h | 6 +- dep/ACE_wrappers/ace/MEM_Acceptor.inl | 11 +- dep/ACE_wrappers/ace/MEM_Connector.h | 6 +- dep/ACE_wrappers/ace/MEM_Connector.inl | 11 +- dep/ACE_wrappers/ace/MEM_IO.cpp | 140 +- dep/ACE_wrappers/ace/MEM_IO.inl | 14 +- dep/ACE_wrappers/ace/MEM_SAP.h | 7 +- dep/ACE_wrappers/ace/MEM_Stream.h | 44 +- dep/ACE_wrappers/ace/MEM_Stream.inl | 106 +- dep/ACE_wrappers/ace/Makefile.am | 13 +- dep/ACE_wrappers/ace/Malloc_Base.h | 4 +- dep/ACE_wrappers/ace/Malloc_T.cpp | 52 +- dep/ACE_wrappers/ace/Malloc_T.h | 64 +- dep/ACE_wrappers/ace/Malloc_T.inl | 29 +- dep/ACE_wrappers/ace/Map.h | 32 - dep/ACE_wrappers/ace/Map_Manager.cpp | 34 +- dep/ACE_wrappers/ace/Map_Manager.h | 14 +- dep/ACE_wrappers/ace/Map_Manager.inl | 29 +- dep/ACE_wrappers/ace/Map_T.cpp | 46 +- dep/ACE_wrappers/ace/Map_T.h | 10 +- dep/ACE_wrappers/ace/Map_T.inl | 4 +- dep/ACE_wrappers/ace/Message_Queue.h | 6 +- dep/ACE_wrappers/ace/Message_Queue_T.cpp | 28 +- dep/ACE_wrappers/ace/Message_Queue_T.h | 8 +- dep/ACE_wrappers/ace/Message_Queue_Vx.cpp | 14 +- dep/ACE_wrappers/ace/Message_Queue_Vx.h | 13 +- dep/ACE_wrappers/ace/Method_Object.h | 38 - dep/ACE_wrappers/ace/Metrics_Cache_T.cpp | 9 +- dep/ACE_wrappers/ace/Metrics_Cache_T.h | 80 +- dep/ACE_wrappers/ace/Metrics_Cache_T.inl | 6 +- dep/ACE_wrappers/ace/Module.h | 12 +- .../ace/Monitor_Point_Registry.cpp | 6 +- dep/ACE_wrappers/ace/Multihomed_INET_Addr.h | 14 +- dep/ACE_wrappers/ace/Mutex.h | 3 +- dep/ACE_wrappers/ace/Mutex.inl | 13 +- dep/ACE_wrappers/ace/Null_Barrier.h | 5 +- dep/ACE_wrappers/ace/Null_Condition.h | 4 +- dep/ACE_wrappers/ace/Null_Mutex.h | 40 +- dep/ACE_wrappers/ace/Null_Semaphore.h | 4 +- dep/ACE_wrappers/ace/OS.cpp | 53 - dep/ACE_wrappers/ace/OS.h | 329 ---- dep/ACE_wrappers/ace/OS.inl | 80 - dep/ACE_wrappers/ace/OS_Dirent.h | 32 - dep/ACE_wrappers/ace/OS_Errno.cpp | 4 +- dep/ACE_wrappers/ace/OS_Memory.h | 6 +- dep/ACE_wrappers/ace/OS_NS_Thread.cpp | 71 +- dep/ACE_wrappers/ace/OS_NS_Thread.h | 32 +- dep/ACE_wrappers/ace/OS_NS_Thread.inl | 42 +- dep/ACE_wrappers/ace/OS_NS_arpa_inet.cpp | 4 +- dep/ACE_wrappers/ace/OS_NS_arpa_inet.inl | 6 +- dep/ACE_wrappers/ace/OS_NS_ctype.cpp | 4 +- dep/ACE_wrappers/ace/OS_NS_errno.cpp | 4 +- dep/ACE_wrappers/ace/OS_NS_fcntl.cpp | 4 +- dep/ACE_wrappers/ace/OS_NS_math.cpp | 4 +- dep/ACE_wrappers/ace/OS_NS_netdb.inl | 41 +- dep/ACE_wrappers/ace/OS_NS_poll.cpp | 4 +- dep/ACE_wrappers/ace/OS_NS_pwd.cpp | 4 +- dep/ACE_wrappers/ace/OS_NS_pwd.inl | 11 +- dep/ACE_wrappers/ace/OS_NS_regex.cpp | 4 +- dep/ACE_wrappers/ace/OS_NS_regex.inl | 3 +- dep/ACE_wrappers/ace/OS_NS_signal.cpp | 4 +- dep/ACE_wrappers/ace/OS_NS_stdio.h | 16 +- dep/ACE_wrappers/ace/OS_NS_stdio.inl | 26 +- dep/ACE_wrappers/ace/OS_NS_stdlib.inl | 8 +- dep/ACE_wrappers/ace/OS_NS_string.h | 48 +- dep/ACE_wrappers/ace/OS_NS_string.inl | 7 +- dep/ACE_wrappers/ace/OS_NS_sys_resource.cpp | 4 +- dep/ACE_wrappers/ace/OS_NS_sys_select.cpp | 4 +- dep/ACE_wrappers/ace/OS_NS_sys_socket.inl | 4 +- dep/ACE_wrappers/ace/OS_NS_sys_wait.inl | 8 +- dep/ACE_wrappers/ace/OS_NS_time.cpp | 6 +- dep/ACE_wrappers/ace/OS_NS_time.inl | 16 +- dep/ACE_wrappers/ace/OS_NS_wchar.h | 6 +- dep/ACE_wrappers/ace/OS_NS_wctype.cpp | 4 +- dep/ACE_wrappers/ace/OS_NS_wctype.inl | 3 +- dep/ACE_wrappers/ace/OS_String.h | 32 - dep/ACE_wrappers/ace/OS_TLI.h | 8 +- dep/ACE_wrappers/ace/Object_Manager_Base.cpp | 6 +- dep/ACE_wrappers/ace/Obstack_T.h | 9 +- dep/ACE_wrappers/ace/Obstack_T.inl | 9 +- dep/ACE_wrappers/ace/POSIX_Asynch_IO.h | 6 +- dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp | 7 +- dep/ACE_wrappers/ace/POSIX_Proactor.cpp | 41 +- dep/ACE_wrappers/ace/Pair.h | 32 - dep/ACE_wrappers/ace/Pair_T.h | 51 +- dep/ACE_wrappers/ace/Pair_T.inl | 58 +- dep/ACE_wrappers/ace/Ping_Socket.cpp | 6 +- dep/ACE_wrappers/ace/Pipe.cpp | 29 +- dep/ACE_wrappers/ace/Pipe.h | 5 +- dep/ACE_wrappers/ace/Pipe.inl | 17 +- dep/ACE_wrappers/ace/Process.cpp | 14 +- dep/ACE_wrappers/ace/Process.h | 17 +- dep/ACE_wrappers/ace/Process_Manager.cpp | 18 +- dep/ACE_wrappers/ace/Process_Manager.h | 13 +- dep/ACE_wrappers/ace/RB_Tree.cpp | 4 +- dep/ACE_wrappers/ace/README | 7 +- dep/ACE_wrappers/ace/Reactor.h | 56 +- .../ace/Reactor_Notification_Strategy.h | 6 +- dep/ACE_wrappers/ace/Read_Buffer.h | 8 +- .../ace/Recursive_Thread_Mutex.cpp | 4 +- dep/ACE_wrappers/ace/Recursive_Thread_Mutex.h | 5 +- dep/ACE_wrappers/ace/Refcountable.h | 32 - dep/ACE_wrappers/ace/Refcountable_T.h | 9 +- dep/ACE_wrappers/ace/Registry_Name_Space.h | 4 +- dep/ACE_wrappers/ace/Remote_Tokens.h | 19 +- dep/ACE_wrappers/ace/SOCK.h | 6 +- dep/ACE_wrappers/ace/SOCK_Connector.cpp | 27 +- dep/ACE_wrappers/ace/SOCK_Connector.h | 5 +- dep/ACE_wrappers/ace/SOCK_Dgram.cpp | 90 +- dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp | 11 +- dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h | 13 +- dep/ACE_wrappers/ace/SOCK_IO.cpp | 31 +- dep/ACE_wrappers/ace/Select_Reactor.h | 4 +- dep/ACE_wrappers/ace/Select_Reactor_T.cpp | 6 +- dep/ACE_wrappers/ace/Service_Config.cpp | 10 +- dep/ACE_wrappers/ace/Service_Config.inl | 4 +- dep/ACE_wrappers/ace/Service_Gestalt.cpp | 14 +- dep/ACE_wrappers/ace/Service_Gestalt.h | 15 +- dep/ACE_wrappers/ace/Service_Templates.h | 29 - dep/ACE_wrappers/ace/Service_Types.cpp | 4 +- dep/ACE_wrappers/ace/Shared_Memory_Pool.cpp | 16 +- dep/ACE_wrappers/ace/Sig_Handler.cpp | 23 +- dep/ACE_wrappers/ace/Signal.inl | 18 +- dep/ACE_wrappers/ace/Sock_Connect.cpp | 33 +- dep/ACE_wrappers/ace/Stack_Trace.h | 24 +- dep/ACE_wrappers/ace/Strategies_T.h | 6 +- dep/ACE_wrappers/ace/Strategies_T.inl | 6 +- dep/ACE_wrappers/ace/String_Base.h | 20 +- dep/ACE_wrappers/ace/Svc_Conf_Lexer.cpp | 6 +- dep/ACE_wrappers/ace/Synch.h | 14 +- dep/ACE_wrappers/ace/Synch_T.cpp | 22 - dep/ACE_wrappers/ace/Synch_T.h | 42 - dep/ACE_wrappers/ace/Synch_Traits.h | 39 +- dep/ACE_wrappers/ace/TSS_T.cpp | 131 +- dep/ACE_wrappers/ace/TSS_T.h | 8 +- dep/ACE_wrappers/ace/Task.h | 3 +- dep/ACE_wrappers/ace/Task_Ex_T.h | 17 +- dep/ACE_wrappers/ace/Task_Ex_T.inl | 9 +- dep/ACE_wrappers/ace/Task_T.h | 9 +- dep/ACE_wrappers/ace/Task_T.inl | 9 +- dep/ACE_wrappers/ace/Thread.h | 24 +- dep/ACE_wrappers/ace/Thread.inl | 10 +- dep/ACE_wrappers/ace/Thread_Adapter.h | 6 +- dep/ACE_wrappers/ace/Thread_Control.cpp | 13 +- dep/ACE_wrappers/ace/Thread_Control.inl | 5 +- dep/ACE_wrappers/ace/Thread_Mutex.h | 4 +- dep/ACE_wrappers/ace/Thread_Mutex.inl | 4 +- dep/ACE_wrappers/ace/Throughput_Stats.cpp | 101 +- dep/ACE_wrappers/ace/Throughput_Stats.h | 14 +- dep/ACE_wrappers/ace/Time_Value.cpp | 11 +- dep/ACE_wrappers/ace/Timer_Hash_T.cpp | 26 +- dep/ACE_wrappers/ace/Timer_Heap_T.cpp | 18 +- dep/ACE_wrappers/ace/Timer_Queue_Adapters.cpp | 14 +- dep/ACE_wrappers/ace/Timer_Queue_T.cpp | 6 +- dep/ACE_wrappers/ace/Token_Collection.h | 14 +- dep/ACE_wrappers/ace/Token_Invariants.h | 30 +- dep/ACE_wrappers/ace/Token_Manager.h | 16 +- dep/ACE_wrappers/ace/Tokenizer_T.cpp | 4 +- dep/ACE_wrappers/ace/Unbounded_Set.h | 10 +- dep/ACE_wrappers/ace/Unbounded_Set.inl | 4 +- dep/ACE_wrappers/ace/Vector_T.cpp | 67 +- dep/ACE_wrappers/ace/Vector_T.h | 54 +- dep/ACE_wrappers/ace/Version.h | 8 +- dep/ACE_wrappers/ace/Versioned_Namespace.h | 2 +- dep/ACE_wrappers/ace/WIN32_Asynch_IO.h | 24 +- dep/ACE_wrappers/ace/ace.mpc | 13 +- dep/ACE_wrappers/ace/ace.mwc | 16 +- dep/ACE_wrappers/ace/ace_ce_dll.cfg | 1 - dep/ACE_wrappers/ace/ace_flreactor.mpc | 32 - dep/ACE_wrappers/ace/ace_for_tao.mpc | 12 +- dep/ACE_wrappers/ace/ace_foxreactor.mpc | 32 - dep/ACE_wrappers/ace/ace_qt3reactor.mpc | 43 - dep/ACE_wrappers/ace/ace_qt4reactor.mpc | 43 - dep/ACE_wrappers/ace/ace_tkreactor.mpc | 32 - dep/ACE_wrappers/ace/ace_wchar.h | 39 +- dep/ACE_wrappers/ace/ace_xtreactor.mpc | 32 - dep/ACE_wrappers/ace/config-aix-5.x.h | 3 +- dep/ACE_wrappers/ace/config-cray.h | 205 --- dep/ACE_wrappers/ace/config-cxx-common.h | 84 - dep/ACE_wrappers/ace/config-doxygen.h | 8 +- dep/ACE_wrappers/ace/config-g++-common.h | 18 +- dep/ACE_wrappers/ace/config-hpux-11.00.h | 10 +- dep/ACE_wrappers/ace/config-icc-common.h | 3 +- dep/ACE_wrappers/ace/config-integritySCA.h | 5 +- .../ace/config-irix6.5.x-sgic++.h | 18 - dep/ACE_wrappers/ace/config-irix6.x-common.h | 254 --- dep/ACE_wrappers/ace/config-irix6.x-g++.h | 15 - dep/ACE_wrappers/ace/config-irix6.x-sgic++.h | 36 - dep/ACE_wrappers/ace/config-kfreebsd.h | 4 +- dep/ACE_wrappers/ace/config-linux-common.h | 28 +- dep/ACE_wrappers/ace/config-lynxos.h | 7 +- dep/ACE_wrappers/ace/config-macosx-leopard.h | 3 +- .../ace/config-macosx-snowleopard.h | 3 +- dep/ACE_wrappers/ace/config-macosx-tiger.h | 3 +- dep/ACE_wrappers/ace/config-macosx.h | 3 +- dep/ACE_wrappers/ace/config-macros.h | 53 +- dep/ACE_wrappers/ace/config-mvs.h | 7 +- dep/ACE_wrappers/ace/config-openvms.h | 9 +- dep/ACE_wrappers/ace/config-qnx-neutrino.h | 6 +- dep/ACE_wrappers/ace/config-qnx-rtp-common.h | 6 +- dep/ACE_wrappers/ace/config-qnx-rtp.h | 6 +- .../ace/config-sco-5.0.0-nothread.h | 12 - dep/ACE_wrappers/ace/config-sco-5.0.0.h | 90 - dep/ACE_wrappers/ace/config-suncc-common.h | 3 +- dep/ACE_wrappers/ace/config-sunos5.5.h | 14 +- dep/ACE_wrappers/ace/config-sunos5.6.h | 8 +- .../ace/config-tandem-nsk-mips-v2.h | 9 +- .../ace/config-tandem-nsk-mips-v3.h | 9 +- dep/ACE_wrappers/ace/config-tandem.h | 4 +- dep/ACE_wrappers/ace/config-tru64.h | 151 -- dep/ACE_wrappers/ace/config-unixware-7.1.0.h | 399 ---- .../ace/config-unixware-7.1.0.udk.h | 452 ----- dep/ACE_wrappers/ace/config-vxworks6.4.h | 7 +- dep/ACE_wrappers/ace/config-win32-borland.h | 19 +- dep/ACE_wrappers/ace/config-win32-cegcc.h | 8 +- dep/ACE_wrappers/ace/config-win32-common.h | 12 +- dep/ACE_wrappers/ace/config-win32-dmc.h | 39 +- dep/ACE_wrappers/ace/config-win32-ghs.h | 92 - dep/ACE_wrappers/ace/config-win32-mingw.h | 8 +- dep/ACE_wrappers/ace/config-win32-msvc-10.h | 3 +- dep/ACE_wrappers/ace/config-win32-msvc-7.h | 3 +- dep/ACE_wrappers/ace/config-win32-msvc-8.h | 3 +- dep/ACE_wrappers/ace/config-win32-msvc-9.h | 3 +- dep/ACE_wrappers/ace/config-win32-msvc.h | 10 +- dep/ACE_wrappers/ace/config-win32.h | 4 +- dep/ACE_wrappers/ace/os_include/net/os_if.h | 6 +- dep/ACE_wrappers/ace/os_include/os_netdb.h | 4 +- dep/ACE_wrappers/ace/os_include/os_pthread.h | 24 +- dep/ACE_wrappers/ace/os_include/os_pwd.h | 7 +- dep/ACE_wrappers/ace/os_include/os_signal.h | 31 +- dep/ACE_wrappers/ace/os_include/os_stdlib.h | 6 +- dep/ACE_wrappers/ace/os_include/os_stropts.h | 4 +- dep/ACE_wrappers/ace/os_include/os_time.h | 9 +- dep/ACE_wrappers/ace/os_include/os_unistd.h | 17 +- dep/ACE_wrappers/ace/os_include/sys/os_mman.h | 14 +- .../ace/os_include/sys/os_resource.h | 6 +- .../ace/os_include/sys/os_socket.h | 4 +- .../ace/os_include/sys/os_types.h | 4 +- dep/ACE_wrappers/configure.ac | 30 +- dep/ACE_wrappers/m4/config_h.m4 | 5 +- src/shared/revision_nr.h | 2 +- win/VC100/ACE_vc10.vcxproj | 37 +- win/VC100/ACE_vc10.vcxproj.filters | 75 - win/VC80/ACE_vc8.vcproj | 108 +- win/VC90/ACE_vc9.vcproj | 108 +- 343 files changed, 3060 insertions(+), 7431 deletions(-) delete mode 100644 dep/ACE_wrappers/ace/Array.h delete mode 100644 dep/ACE_wrappers/ace/Map.h delete mode 100644 dep/ACE_wrappers/ace/Method_Object.h delete mode 100644 dep/ACE_wrappers/ace/OS.cpp delete mode 100644 dep/ACE_wrappers/ace/OS.h delete mode 100644 dep/ACE_wrappers/ace/OS.inl delete mode 100644 dep/ACE_wrappers/ace/OS_Dirent.h delete mode 100644 dep/ACE_wrappers/ace/OS_String.h delete mode 100644 dep/ACE_wrappers/ace/Pair.h delete mode 100644 dep/ACE_wrappers/ace/Refcountable.h delete mode 100644 dep/ACE_wrappers/ace/Service_Templates.h delete mode 100644 dep/ACE_wrappers/ace/Synch_T.cpp delete mode 100644 dep/ACE_wrappers/ace/Synch_T.h delete mode 100644 dep/ACE_wrappers/ace/ace_ce_dll.cfg delete mode 100644 dep/ACE_wrappers/ace/ace_flreactor.mpc delete mode 100644 dep/ACE_wrappers/ace/ace_foxreactor.mpc delete mode 100644 dep/ACE_wrappers/ace/ace_qt3reactor.mpc delete mode 100644 dep/ACE_wrappers/ace/ace_qt4reactor.mpc delete mode 100644 dep/ACE_wrappers/ace/ace_tkreactor.mpc delete mode 100644 dep/ACE_wrappers/ace/ace_xtreactor.mpc delete mode 100644 dep/ACE_wrappers/ace/config-cray.h delete mode 100644 dep/ACE_wrappers/ace/config-cxx-common.h delete mode 100644 dep/ACE_wrappers/ace/config-irix6.5.x-sgic++.h delete mode 100644 dep/ACE_wrappers/ace/config-irix6.x-common.h delete mode 100644 dep/ACE_wrappers/ace/config-irix6.x-g++.h delete mode 100644 dep/ACE_wrappers/ace/config-irix6.x-sgic++.h delete mode 100644 dep/ACE_wrappers/ace/config-sco-5.0.0-nothread.h delete mode 100644 dep/ACE_wrappers/ace/config-sco-5.0.0.h delete mode 100644 dep/ACE_wrappers/ace/config-tru64.h delete mode 100644 dep/ACE_wrappers/ace/config-unixware-7.1.0.h delete mode 100644 dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h delete mode 100644 dep/ACE_wrappers/ace/config-win32-ghs.h diff --git a/dep/ACE_wrappers/ACE-INSTALL.html b/dep/ACE_wrappers/ACE-INSTALL.html index 5a906165b..6ac91442f 100644 --- a/dep/ACE_wrappers/ACE-INSTALL.html +++ b/dep/ACE_wrappers/ACE-INSTALL.html @@ -1,5 +1,5 @@ - + Building and Installing ACE and Its Auxiliary Libraries and Services @@ -123,7 +123,7 @@ document.

DOC Group - Windows 2000, XP (MSVC++ 7.1, and 8); + Windows 2000, XP (MSVC++ 7.1, 8, 9, and 10); many versions of Linux/Intel (many compilers). DOC sites at ISIS, @@ -155,7 +155,7 @@ document.

Maintains ACE on many platforms required for their ACE and TAO service offerings. We support AIX, CodeGear C++ Builder 2007/2009, CodeGear RAD Studio 2007, Embarcadero C++ Builder 2010, - CBuilderX 1.0, Windows CE, MinGW, Microsoft Visual C++ 7.1/8/9, GCC, + CBuilderX 1.0, Windows CE, MinGW, Microsoft Visual C++ 7.1/8/9/10, GCC, Cygwin, VxWorks 5.5.x - 6.x (kernel and rtp), OpenVMS 8.2-1 & 8.3 on Alpha and IA64, BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris, Tru64, SuSE Linux on Alpha/IA32/EM64T/IA64, RTEMS, QNX, LynxOS 4.0/4.2, @@ -232,7 +232,7 @@ supported by the DOC group, Riverace, OCI or Remedy IT.

HREF="http://downloads.ociweb.com/MPC/docs/html/MakeProjectCreator.html">MPC (MakeProjectCreator) to generate files used by all supported build tools (such as GNUmakefiles for UNIX based platforms, sln and vcproj -files for VC71/VC8 and CodeGear makefiles) on various platforms. To +files for VC71/VC8 and Embarcadero makefiles) on various platforms. To help new users to bootstrap quickly the release bundles of ACE (as well as TAO and CIAO) include all needed files to use the build instructions in this document. @@ -556,7 +556,7 @@ one will not clean up any old files, and trying to use the environment's

@@ -565,20 +565,19 @@ one will not clean up any old files, and trying to use the environment's

Building and Installing ACE on Windows with Microsoft Visual Studio

-

ACE contains project files for Microsoft Visual Studio .NET 2003 (VC7.1) -and Visual Studio 2005 (VC8). Visual Studio 2005 supports building for +

ACE contains project files for Microsoft Visual Studio .NET 2005 (VC8) +, Visual Studio 2009 (VC9), and Visual Studio 2010 (VC10). +Visual Studio 2005 supports building for desktop/server Windows as well as for Windows CE and Windows Mobile. Since not all users will be interested in the CE/Mobile capability, these platforms have separate solution and project files from the desktop/server Windows. -Furthermore, VC7.1 and VC8 use different file formats but the same file +Furthermore, VC7.1, VC8, VC9, and 10 use different file formats but the same file suffixes (.sln and .vcproj). To support both environments, ACE supplies files with different names for the different development and target platforms. The platform/name mapping is shown below. All solution files have a .sln suffix and all project files have a .vcproj suffix.

-

Visual Studio 2008 (VC9) is also supported.

-

The free Visual C++ 2008 Express Edition will work in place of the traditional Visual Studio editions. All the other notes in this document @@ -614,6 +613,11 @@ can be built with the compiler and linker included in the

 

-

Building and Installing ACE on Windows with CodeGear C++

+

Building and Installing ACE on Windows with Embarcadero C++

If you are building for a machine without a network card, you may want to check here first.

@@ -842,7 +846,7 @@ to check here first.


Set the environment variable below to build a version of ACE optimized for a certain CPU. For this there are special compiler flags - (-3/-4/-5/-6), see the CodeGear help for more info.
+ (-3/-4/-5/-6), see the Embarcadero help for more info.
set CPU_FLAG=-6

You can then start the build with the command @@ -857,7 +861,7 @@ to check here first.

Note that when you run make in a sub directory you give make -f Makefile.bmak all. The all is needed to make sure the complete project is build.

-The Borland/CodeGear C++ Builder 4.0/5.0/6.0/2006/2007/2009/2010 port has been done by Jody Hagins, Christopher Kohlhoff and Johnny Willemsen.

+The Borland/CodeGear/Embarcadero C++ Builder 4.0/5.0/6.0/2006/2007/2009/2010 port has been done by Jody Hagins, Christopher Kohlhoff and Johnny Willemsen.

ACE TESTS

diff --git a/dep/ACE_wrappers/COPYING b/dep/ACE_wrappers/COPYING index 27a543f49..551231de6 100644 --- a/dep/ACE_wrappers/COPYING +++ b/dep/ACE_wrappers/COPYING @@ -1,36 +1,37 @@ _________________________________________________________________ - Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and - CoSMIC(TM) + Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), + DAnCE(TM), and CoSMIC(TM) - [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), and [4]CoSMIC(TM) (henceforth - referred to as "DOC software") are copyrighted by [5]Douglas C. - Schmidt and his [6]research group at [7]Washington University, - [8]University of California, Irvine, and [9]Vanderbilt University, - Copyright (c) 1993-2010, all rights reserved. Since DOC software is - open-source, freely available software, you are free to use, modify, - copy, and distribute--perpetually and irrevocably--the DOC software - source code and object code produced from the source, as well as copy - and distribute modified versions of this software. You must, however, - include this copyright statement along with any code built using DOC - software that you release. No copyright statement needs to be provided - if you just ship binary executables of your software products. + [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), DAnCE(TM), and [4]CoSMIC(TM) + (henceforth referred to as "DOC software") are copyrighted by + [5]Douglas C. Schmidt and his [6]research group at [7]Washington + University, [8]University of California, Irvine, and [9]Vanderbilt + University, Copyright (c) 1993-2009, all rights reserved. Since DOC + software is open-source, freely available software, you are free to + use, modify, copy, and distribute--perpetually and irrevocably--the + DOC software source code and object code produced from the source, as + well as copy and distribute modified versions of this software. You + must, however, include this copyright statement along with any code + built using DOC software that you release. No copyright statement + needs to be provided if you just ship binary executables of your + software products. You can use DOC software in commercial and/or binary software releases and are under no obligation to redistribute any of your source code - that is built using DOC software. Note, however, that you may not do - anything to the DOC software code, such as copyrighting it yourself or - claiming authorship of the DOC software code, that will prevent DOC - software from being distributed freely using an open-source - development model. You needn't inform anyone that you're using DOC - software in your software, though we encourage you to let [10]us know - so we can promote your project in the [11]DOC software success - stories. + that is built using DOC software. Note, however, that you may not + misappropriate the DOC software code, such as copyrighting it yourself + or claiming authorship of the DOC software code, in a way that will + prevent DOC software from being distributed freely using an + open-source development model. You needn't inform anyone that you're + using DOC software in your software, though we encourage you to let + [10]us know so we can promote your project in the [11]DOC software + success stories. - The [12]ACE, [13]TAO, [14]CIAO, and [15]CoSMIC web sites are - maintained by the [16]DOC Group at the [17]Institute for Software - Integrated Systems (ISIS) and the [18]Center for Distributed Object + The [12]ACE, [13]TAO, [14]CIAO, [15]DAnCE, and [16]CoSMIC web sites + are maintained by the [17]DOC Group at the [18]Institute for Software + Integrated Systems (ISIS) and the [19]Center for Distributed Object Computing of Washington University, St. Louis for the development of open-source software as part of the open-source software community. Submissions are provided by the submitter ``as is'' with no warranties @@ -54,11 +55,10 @@ DOC software is provided with no support and without any obligation on the part of Washington University, UC Irvine, Vanderbilt University, their employees, or students to assist in its use, correction, - modification, or enhancement. A [19]number of companies around the - world provide commercial support for DOC software, however. - - DOC software is Y2K-compliant, as long as the underlying OS platform - is Y2K-compliant. Likewise, DOC software is compliant with the new US + modification, or enhancement. A [20]number of companies around the + world provide commercial support for DOC software, however. DOC + software is Y2K-compliant, as long as the underlying OS platform is + Y2K-compliant. Likewise, DOC software is compliant with the new US daylight savings rule passed by Congress as "The Energy Policy Act of 2005," which established new daylight savings times (DST) rules for the United States that expand DST as of March 2007. Since DOC software @@ -66,23 +66,23 @@ users will not be affected by the new DST rules as long as they upgrade their operating systems accordingly. - The names ACE(TM), TAO(TM), CIAO(TM), CoSMIC(TM), Washington - University, UC Irvine, and Vanderbilt University, may not be used to - endorse or promote products or services derived from this source - without express written permission from Washington University, UC - Irvine, or Vanderbilt University. This license grants no permission to - call products or services derived from this source ACE(TM), TAO(TM), - CIAO(TM), or CoSMIC(TM), nor does it grant permission for the name - Washington University, UC Irvine, or Vanderbilt University to appear - in their names. + The names ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM), CoSMIC(TM), + Washington University, UC Irvine, and Vanderbilt University, may not + be used to endorse or promote products or services derived from this + source without express written permission from Washington University, + UC Irvine, or Vanderbilt University. This license grants no permission + to call products or services derived from this source ACE(TM), + TAO(TM), CIAO(TM), DAnCE(TM), or CoSMIC(TM), nor does it grant + permission for the name Washington University, UC Irvine, or + Vanderbilt University to appear in their names. If you have any suggestions, additions, comments, or questions, please - let [20]me know. + let [21]me know. - [21]Douglas C. Schmidt + [22]Douglas C. Schmidt _________________________________________________________________ - Back to the [22]ACE home page. + Back to the [23]ACE home page. References @@ -100,11 +100,12 @@ References 12. http://www.cs.wustl.edu/~schmidt/ACE.html 13. http://www.cs.wustl.edu/~schmidt/TAO.html 14. http://www.dre.vanderbilt.edu/CIAO/ - 15. http://www.dre.vanderbilt.edu/cosmic/ - 16. http://www.dre.vanderbilt.edu/ - 17. http://www.isis.vanderbilt.edu/ - 18. http://www.cs.wustl.edu/~schmidt/doc-center.html - 19. http://www.cs.wustl.edu/~schmidt/commercial-support.html - 20. mailto:d.schmidt@vanderbilt.edu - 21. http://www.dre.vanderbilt.edu/~schmidt/ - 22. http://www.cs.wustl.edu/ACE.html + 15. http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/DAnCE/ + 16. http://www.dre.vanderbilt.edu/cosmic/ + 17. http://www.dre.vanderbilt.edu/ + 18. http://www.isis.vanderbilt.edu/ + 19. http://www.cs.wustl.edu/~schmidt/doc-center.html + 20. http://www.cs.wustl.edu/~schmidt/commercial-support.html + 21. mailto:d.schmidt@vanderbilt.edu + 22. http://www.dre.vanderbilt.edu/~schmidt/ + 23. http://www.cs.wustl.edu/ACE.html diff --git a/dep/ACE_wrappers/ChangeLog b/dep/ACE_wrappers/ChangeLog index f10cd14c7..ec8c3ded3 100644 --- a/dep/ACE_wrappers/ChangeLog +++ b/dep/ACE_wrappers/ChangeLog @@ -1,6 +1,1602 @@ +Wed Oct 27 12:01:05 CEST 2010 Johnny Willemsen + + * ACE version 5.8.3 released. + +Tue Oct 26 11:21:35 UTC 2010 Johnny Willemsen + + * bin/diff-builds-and-group-fixed-tests-only.sh: + Fixed DANCE_ROOT, could cause problems with the test stats email + +Mon Oct 25 21:01:02 UTC 2010 Olli Savia + + * NEWS: + Updated. + +Mon Oct 25 14:07:15 UTC 2010 Phil Mesnier + + * ace/Service_Gestalt.cpp: + Another fix to error processing behavior. If the result of + process_directives() was > 0, that value was replaced by the + result of process_commandline_directives(), which is contrary to + the expected behavior. Now the result is the sum of these to + return values, unless either returns -1, then the result is just + -1. + +Mon Oct 25 06:30:35 UTC 2010 Johnny Willemsen + + * ace/Atomic_Op_T.h: + * ace/Auto_IncDec_T.h: + Doxygen changes + +Sun Oct 24 12:35:28 UTC 2010 Johnny Willemsen + + * ace/Event_Handler.h: + * ace/Reactor.h: + * ace/Reactor_Notification_Strategy.h: + * ace/Read_Buffer.h: + * ace/Registry_Name_Space.h: + * ace/Remote_Tokens.h: + Doxygen changes + +Fri Oct 22 11:19:33 UTC 2010 Johnny Willemsen + + * ace/Reactor.h: + Doxygen changes + +Thu Oct 21 11:10:56 UTC 2010 Johnny Willemsen + + * ace/ACE.cpp: + * ace/FILE_IO.h: + * ace/Free_List.h: + * ace/Handle_Set.h: + * ace/Log_Msg.h: + * ace/WIN32_Asynch_IO.h: + Doxygen changes + +Wed Oct 20 18:19:51 UTC 2010 Johnny Willemsen + + * bin/fuzz.pl: + If we just see dollarIddollar we trigger an error, svn:keywords is + than lacking + +Wed Oct 20 16:07:09 UTC 2010 Steve Huston + + * ace/Timer_Queue_Adapters.cpp (ACE_Thread_Timer_Queue_Adapter::svc): + * ace/Timer_Queue_T.cpp (expire): + Temporarily release and reacquire the mutex around timer dispatch. + This prevents a deadlock on user code with multiple threads doing + timer-related operations. + +Wed Oct 20 09:22:46 UTC 2010 Johnny Willemsen + + * bin/MakeProjectCreator/config/global.features: + Add nddsmonitor as default to 0 + +Wed Oct 20 09:19:25 UTC 2010 Johnny Willemsen + + * ace/Log_Msg.h: + + * bin/MakeProjectCreator/config/global.features: + + * tests/Time_Value_Test.cpp: + +Tue Oct 19 18:11:57 UTC 2010 Olli Savia + + * ace/Caching_Utility_T.cpp: + Added missing include. + +Tue Oct 19 09:44:45 UTC 2010 Olli Savia + + * ace/Caching_Utility_T.cpp: + Use ACE::is_equal() to compare floating point values. + +Fri Oct 15 10:18:05 UTC 2010 Johnny Willemsen + + * tests/Bug_3911_Regression_Test.cpp: + Fixed warning + +Thu Oct 14 18:29:35 UTC 2010 Johnny Willemsen + + * tests/run_test.lst: + * tests/tests.mpc: + 3911 doesn't work with ace_for_tao + +Thu Oct 14 13:15:00 UTC 2010 Martin Corino + + * ace/Process.h: + * ace/Process.cpp: + Changes to allow to dynamically define the max. number of cmdline args. + The tao_idl compiler was running out of room in certain instances and + the static max was very conservative. + +Thu Oct 14 09:38:00 UTC 2010 Martin Corino + + * tests/Bug_3911_Regression_Test.cpp: + Wchar build fixes. + +Wed Oct 13 08:24:00 UTC 2010 Martin Corino + + * tests/Bug_3911_Regression_Test.cpp: + Wchar build fixes. + +Wed Oct 13 06:15:00 UTC 2010 Johnny Willemsen + + * ace/Framework_Component.h: + * ace/Framework_Component.inl: + * ace/Framework_Component.cpp: + * ace/Framework_Component_T.h: + Use ACE_Copy_Disabled, change c-style cast to const cast, use + sync macros instead of ACE_MT. Thanks to Ranjit Hande + for reporting the c-style cast warnings + + * tests/Framework_Component_Test.h: + Layout change + +Tue Oct 12 21:12:51 UTC 2010 Adam Mitz + + * bin/DependencyGenerator/GNUObjectGenerator.pm: + + Fixed incorrect Perl regex escaping from my previous commit. + +Tue Oct 12 11:41:00 UTC 2010 Martin Corino + + * tests/Bug_3911_Regression_Test.cpp: + Fuzz fixes. + +Tue Oct 12 08:06:00 UTC 2010 Martin Corino + + * tests/Bug_3911_Regression_Test.cpp: + * tests/run_test.lst: + * tests/tests.mpc: + Added reproducer test for Bugzilla #3911. + +Mon Oct 11 16:31:12 UTC 2010 Adam Mitz + + * bin/DependencyGenerator/GNUObjectGenerator.pm: + + If the source file contains '../', remove the directory part from + the name of the object file (see gnu.mpd:383 OBJS make variable). + +Mon Oct 11 11:53:43 UTC 2010 Johnny Willemsen + + * ace/Dev_Poll_Reactor.cpp: + * ace/Select_Reactor_T.cpp: + Fixed problems with threads=0, thanks to Elez + for reporting this and providing a patch + +Fri Oct 8 11:19:44 UTC 2010 Olli Savia + + * protocols/ace/RMCast/Flow.cpp: + Added missing include. + +Fri Oct 8 08:42:37 UTC 2010 Olli Savia + + * ace/config-linux-common.h: + * ace/os_include/os_unistd.h: + * configure.ac: + * m4/config_h.m4: + Removed references to ACE_LACKS_PREAD_PROTOTYPE. It is no + longer used. + +Fri Oct 8 08:20:04 UTC 2010 Olli Savia + + * ace/OS_NS_stdio.inl: + * ace/README: + * tests/OS_Test.cpp: + Removed references to ACE_LACKS_RENAME. It is no + longer used. + +Fri Oct 8 07:51:46 UTC 2010 Olli Savia + + * ace/config-integritySCA.h: + Removed references to ACE_LACKS_IPC_H. It is no + longer used. + +Fri Oct 8 07:48:38 UTC 2010 Olli Savia + + * ace/README: + Removed references to ACE_LACKS_IOSTREAMS_TOTALLY. It is no + longer used. + + * ace/os_include/os_stropts.h: + Fixed typo. + +Fri Oct 8 07:42:26 UTC 2010 Olli Savia + + * ace/OS_NS_stdio.h: + * ace/OS_NS_stdio.inl: + * ace/README: + * ace/Svc_Conf_Lexer.cpp: + Removed references to ACE_LACKS_CLEARERR. It is no + longer used. + +Fri Oct 8 06:58:56 UTC 2010 Olli Savia + + * protocols/ace/RMCast/Flow.cpp: + * tests/CDR_Array_Test.cpp: + * tests/CDR_File_Test.cpp: + * tests/CDR_Test.cpp: + * tests/Upgradable_RW_Test.cpp: + Use ACE::is_equal() to compare floating point values. + +Thu Oct 7 12:34:20 UTC 2010 Olli Savia + + * ASNMP/tests/Counter64_Test.cpp: + * ace/ETCL/ETCL_Constraint.cpp: + * ace/Monitor_Control/CPU_Load_Monitor.cpp: + Use ACE::is_equal() to compare floating point values. + +Tue Oct 5 07:23:19 UTC 2010 Johnny Willemsen + + * ACE-INSTALL.html: + * COPYING: + Small updates + + * docs/ACE-porting.html: + Updated links + + * include/makeinclude/wrapper_macros.GNU: + Added support for valgrind=1 + +Mon Oct 4 19:55:33 UTC 2010 William R. Otte + + * bin/make_release.py: + + Updates. + +Mon Oct 4 12:32:02 UTC 2010 Johnny Willemsen + + * ace/LSOCK_Stream.h: + Doxygen changes + + * ace/Makefile.am: + Removed zapped file + + * include/makeinclude/platform_sunos5_sunc++.GNU: + Removed SUN_CC_HAS_PVFC_BUG, this got added 8 years ago and is + used for any SunCC compiler version. If some old SunCC compiler breaks + we can readd this flag for just that compiler version + +Fri Oct 1 16:00:51 UTC 2010 William Otte + + * COPYING: + + Updated to include DAnCE. + +Fri Oct 1 11:55:23 UTC 2010 Johnny Willemsen + + * ace/config-g++-common.h: + * ace/config-qnx-neutrino.h: + * ace/config-qnx-rtp-common.h: + Fixed redefinition warnings + + * ace/ace_for_tao.mpc: + Zapped some files + + * ace/config-win32-common.h: + * ace/config-win32-msvc.h: + * ace/config-win32.h: + Cleanup + + * ace/config-win32-ghs.h: + Removed this file. + +Thu Sep 30 10:49:38 UTC 2010 Johnny Willemsen + + * debian/mpc-ace.install: + Improved + + * docs/bczar/bczar.html: + Added DAnCE to doxygen instructions + +Thu Sep 30 08:09:34 UTC 2010 Johnny Willemsen + + * ace/IOStream.h: + * ace/config-g++-common.h: + * ace/config-hpux-11.00.h: + * ace/config-linux-common.h: + * ace/config-mvs.h: + * ace/config-sunos5.5.h: + * ace/config-win32-borland.h: + * ace/config-win32-cegcc.h: + * ace/config-win32-dmc.h: + * ace/config-win32-ghs.h: + * ace/config-win32-mingw.h: + * ace/config-win32-msvc.h: + Cleanup, move g++ version defines to config-g++-common.h + +Thu Sep 30 05:45:10 UTC 2010 Marcel Smit + + * NEWS: + * ace/Cache_Map_Manager_T.h: + * ace/Cache_Map_Manager_T.inl: + * ace/Cache_Map_Manager_T.cpp: + * ace/Cached_Connect_Strategy_T.h: + * ace/Cached_Connect_Strategy_T.cpp: + * ace/Caching_Strategies_T.h: + * ace/Caching_Utility_T.cpp: + * ace/Cleanup_Strategies_T.cpp: + * ace/Hash_Cache_Map_Manager_T.h: + * ace/Hash_Cache_Map_Manager_T.cpp: + * ace/Map_T.h: + * ace/Map_T.inl: + * ace/Map_T.cpp: + * ace/Pair_T.h: + * ace/Pair_T.inl: + * examples/Web_Crawler/URL_Visitor.h: + * tests/Cache_Map_Manager_Test.cpp: + * tests/Cached_Accept_Conn_Test.h: + * tests/Cached_Conn_Test.cpp: + * tests/Map_Manager_Test.cpp: + Removed ACE_Pair from the ACE library. + +Wed Sep 29 14:06:40 UTC 2010 Johnny Willemsen + + * ace/Cache_Map_Manager_T.h: + * ace/MEM_SAP.h: + * ace/Metrics_Cache_T.h: + * ace/Metrics_Cache_T.inl: + * ace/Metrics_Cache_T.cpp: + Doxygen changes + +Wed Sep 29 12:19:17 UTC 2010 Johnny Willemsen + + * ace/Caching_Utility_T.h: + * ace/Caching_Utility_T.cpp: + Use bool and ACE_Copy_Disabled + + * ace/Malloc_Base.h: + * ace/Malloc_T.h: + Typo fixes + +Wed Sep 29 12:08:58 UTC 2010 Marijke Hengstmengel + + * bin/MakeProjectCreator/config/global.features: + Add ccm_noevent option, default 0, events in CCM are enabled. + If set, events in CCM are disabled. + +Tue Sep 28 18:48:58 UTC 2010 Johnny Willemsen + + * apps/JAWS3/jaws3-todo: + Removed, todo for years now + +Tue Sep 28 18:16:52 UTC 2010 Adam Mitz + + * performance-tests/TCP/tcp_test.cpp: + + If the 1st char of the host name is a digit, need to set the IP + address and port as network byte order since that is what's + returned from ACE_OS::inet_addr(). + +Tue Sep 28 11:34:05 UTC 2010 Johnny Willemsen + + * ace/Asynch_Connector.cpp: + * ace/Barrier.h: + * ace/Barrier.cpp: + * ace/Condition_Thread_Mutex.h: + * ace/Condition_Thread_Mutex.inl: + * ace/Containers_T.cpp: + * ace/Functor.h: + * ace/Functor.inl: + * ace/IO_Cntl_Msg.cpp: + * ace/Intrusive_List.cpp: + * ace/Local_Tokens.inl: + * ace/MEM_IO.cpp: + * ace/MEM_Stream.h: + * ace/MEM_Stream.inl: + * ace/Malloc_T.inl: + * ace/OS_NS_Thread.inl: + * ace/OS_NS_string.inl: + * ace/Object_Manager_Base.cpp: + * ace/POSIX_Proactor.cpp: + * ace/Ping_Socket.cpp: + * ace/Signal.inl: + * ace/Throughput_Stats.h: + * ace/Throughput_Stats.cpp: + * ace/Time_Value.cpp: + * ace/Timer_Hash_T.cpp: + * ace/Timer_Heap_T.cpp: + * ace/Vector_T.h: + * ace/Vector_T.cpp: + * ace/config-linux-common.h: + Removed code that was ifdefed out for years now + +Tue Sep 28 08:31:37 UTC 2010 Vladimir Zykov + + * performance-tests/Misc/test_guard.cpp: + * tests/ACE_Test.cpp: + * examples/Reactor/TP_Reactor/client.cpp: + Fixed compilation errors with missing includes. + +Mon Sep 27 18:04:34 UTC 2010 Johnny Willemsen + + * ace/ACE.h: + * ace/Thread.h: + * ace/Thread_Adapter.h: + * ace/Thread_Mutex.h: + Doxygen changes + +Mon Sep 27 14:47:47 UTC 2010 Johnny Willemsen + + * ace/String_Base.h: + Doxygen changes + + * ace/Svc_Conf_Lexer.cpp: + Const changes + + * bin/msvc_static_order.lst: + Some updates, but this list is very outdated + +Mon Sep 27 14:27:25 UTC 2010 Jeff Parsons + + * THANKS: + + Added Matthew Waller + +Mon Sep 27 14:08:11 UTC 2010 Vladimir Zykov + + * ace/Log_Msg.h: + * ace/Log_Msg.cpp: + Fixed compilation with ACE_HAS_DUMP. The later happens because + ACE_Log_Msg depends on ACE_Atomic_Op and ACE_Atomic_Op needs + ACE_DEBUG when ACE_HAS_DUMP is defined. This change moves + include of ace/Atomic_Op.h from header to CPP file and adds + forward declaration for ACE_Atomic_Op. + + * ace/Atomic_Op_T.cpp: + * ace/Guard_T.cpp: + Removed unnecessary this paramater when doing ACE_END_DUMP. + + * examples/Misc/test_dump.h: + * examples/Threads/thread_specific.cpp: + Fixed logging in these tests. + +Mon Sep 27 11:24:02 UTC 2010 Vladimir Zykov + + * examples/C++NPv2/AIO_Client_Logging_Daemon.h: + Another attempt to fix compile error. + +Mon Sep 27 09:42:29 UTC 2010 Johnny Willemsen + + * bin/fuzz.pl: + Enable export file check, use TAO_IDL to generate export files or + remove the generated by line from the export file itself. Currently + only for CIAO and DAnCE + +Sat Sep 25 06:41:39 UTC 2010 Olli Savia + + * ace/ACE.h: + Modified ACE::is_equal() comment once again to make fuzz happy. + +Fri Sep 24 14:52:44 UTC 2010 Steve Huston + + * ace/Pipe.{h inl cpp}: Added two new methods, close_read() and + close_write() to close individual pipe handles. Refactored the + original close() method to use these and factored out the actual + closing code to a new inlined close_handle() method. + + Thanks to John Lilley for this + addition. + + * NEWS: Added description of the new methods. + +Fri Sep 24 12:41:13 UTC 2010 Johnny Willemsen + + * ACE-INSTALL.html: + Updated Remedy platforms + + * ACEXML/parser/parser/Parser.h: + * ace/Containers_T.h: + * ace/Containers_T.cpp: + * ace/OS_NS_string.h: + * ace/OS_NS_wchar.h: + * apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h: + Fixed typo + +Fri Sep 24 12:32:44 UTC 2010 Johnny Willemsen + + * ace/Containers_T.h: + * ace/Containers_T.cpp: + * ace/OS_NS_string.h: + * ace/OS_NS_wchar.h: + Fixed typo + +Fri Sep 24 12:24:01 UTC 2010 Johnny Willemsen + + * ACE-INSTALL.html: + Documented vc10, thanks to Paul Carter + for reporting this. + +Fri Sep 24 11:44:06 UTC 2010 Olli Savia + + * ace/ACE.h: + Adjusted ACE::is_equal() comment to make fuzz happy. + +Fri Sep 24 09:35:00 UTC 2010 Vladimir Zykov + + * examples/C++NPv2/AIO_Client_Logging_Daemon.h: + Removed code that is problematic for GCC 2.95.3 in a crossbuild + for LynxOS 4.0. + +Fri Sep 24 07:35:27 UTC 2010 Olli Savia + + * ace/ACE.h: + Added a simple helper ACE::is_equal() which compares equality of two + objects without using operator==. This is useful for comparing floating + point values. + + * tests/OS_Test.cpp: + Use ACE::is_equal() instead of local copy. + +Thu Sep 23 16:14:12 UTC 2010 Adam Mitz + + * ace/SSL/ssl.mpc: + * bin/MakeProjectCreator/config/pkgconfig.mpb: + * bin/MakeProjectCreator/templates/gnu.mpd: + * bin/ace_install_pkgconfig.pl: + * include/makeinclude/rules.lib.GNU: + * include/makeinclude/wrapper_macros.GNU: + + Added support for installing pkg-config (.pc) files as part of the + gnuace "make install". This includes a refactoring of how the + shared library version numbers are set internally in the makefiles. + +Thu Sep 23 12:32:05 UTC 2010 Vladimir Zykov + + * ace/Service_Gestalt.cpp: + Fixed memory leak. Previously it could happen that svc_queue_ was + allocated during processing of arguments but was not freed if + application didn't call process_commandline_directives(). + + * tests/Network_Adapters_Test.cpp: + Removed non-ASCII character from the comments. + +Wed Sep 22 18:42:25 UTC 2010 William R. Otte + + * bin/msvc_mpc_auto_compile.pl: + + Updates for DAnCE. + +Wed Sep 22 14:17:11 UTC 2010 Marcel Smit + + * debian/Basic_Logging_Service.sgml: + * debian/Event_Logging_Service.sgml: + * debian/Notify_Logging_Service.sgml: + * debian/RTEvent_Logging_Service.sgml: + Renamed TAO orb services. See $TAO_ROOT/NEWS for details. + +Wed Sep 22 14:06:25 UTC 2010 Marcel Smit + + * debian/libtao-orbsvcs-1.8.2.install: + * debian/libtao-orbsvcs-dev.install: + * debian/tao-imr.install: + * debian/tao-naming.install: + * debian/tao-notify.install: + * debian/tao-rtevent.install: + Renamed TAO orb services. See $TAO_ROOT/NEWS for details. + +Wed Sep 22 13:58:46 UTC 2010 Marcel Smit + + * debian/tao-concurrency.install: + * debian/tao-event.install: + * debian/tao-ft.install: + * debian/tao-ifr.install: + * debian/tao-lifecycle.install: + * debian/tao-load.install: + * debian/tao-log.install: + * debian/tao-scheduling.install: + * debian/tao-time.install: + * debian/tao-trading.install: + Renamed TAO orb services. See $TAO_ROOT/NEWS for details. + +Tue Sep 21 08:27:47 UTC 2010 Johnny Willemsen + + * ASNMP/agent/main.cpp: + Fixed compile error + +Mon Sep 20 13:24:56 UTC 2010 Johnny Willemsen + + * ASNMP/agent/agent.mpc: + * ASNMP/agent/main.cpp: + Enable for wchar, thanks to Christian Freund + for reporting this and providing a patch, fixes bugzilla 3889 + + * ace/String_Base.h: + * apps/JAWS3/http/HTTP_Service_Handler.h: + * apps/JAWS3/small/SS_Service_Handler.h: + Fixed typo in comment + + * ace/config-win32-borland.h: + Some updates based on QC emails + + * debian/libtao-dev.install: + * debian/mpc-ace.install: + Fixed paths + +Fri Sep 17 20:14:33 UTC 2010 Adam Mitz + + * ace/FlReactor/ace_flreactor.mpc: + * ace/FoxReactor/ace_foxreactor.mpc: + * ace/QtReactor/ace_qt3reactor.mpc: + * ace/QtReactor/ace_qt4reactor.mpc: + * ace/TkReactor/ace_tkreactor.mpc: + * ace/XtReactor/ace_xtreactor.mpc: + + Since these have been moved, the default install_dir isn't what we + want. Set the install_dir to ace/*Reactor. + +Fri Sep 17 07:51:06 UTC 2010 Marcel Smit + + * bin/fuzz.pl: + Added Id check for cdp files. + +Fri Sep 17 07:16:16 UTC 2010 Johnny Willemsen + + * ace/Log_Msg.h: + * ace/OS_Errno.cpp: + Layout changes + + * ace/Malloc_T.h: + * ace/Malloc_T.cpp: + * ace/Map_Manager.inl: + * ace/Map_Manager.cpp: + Moved some methods inline + + * ace/OS_NS_signal.cpp: + Fixed problem with versioned macros + +Thu Sep 16 13:36:51 UTC 2010 Martin Corino + + * protocols/ace/INet/ClientRequestHandler.h: + * protocols/ace/INet/URLBase.h: + * protocols/ace/INet/HTTP_ClientRequestHandler.h: + Changes to fix export problems with nested classes with MSVC 9. + +Thu Sep 16 09:25:51 UTC 2010 Johnny Willemsen + + * ace/ace.mpc: + Removed Service_Templates.h + +Thu Sep 16 09:08:39 UTC 2010 Johnny Willemsen + + * protocols/tests/HTBP/Send_Large_Msg/server.cpp: + * protocols/tests/HTBP/ping/client.cpp: + Added missing includes + +Wed Sep 15 12:45:13 UTC 2010 Johnny Willemsen + + * ace/Auto_Event.h: + * ace/OS_NS_arpa_inet.inl: + * ace/OS_NS_arpa_inet.cpp: + * ace/OS_NS_errno.cpp: + * ace/OS_NS_fcntl.cpp: + * ace/OS_NS_math.cpp: + * ace/OS_NS_pwd.inl: + * ace/OS_NS_pwd.cpp: + * ace/OS_NS_regex.inl: + * ace/OS_NS_regex.cpp: + * ace/OS_NS_signal.cpp: + * ace/OS_NS_sys_resource.cpp: + * ace/OS_NS_sys_wait.inl: + * ace/OS_NS_wctype.inl: + * ace/OS_NS_wctype.cpp: + * ace/config-tandem.h: + * ace/os_include/os_pthread.h: + * ace/os_include/os_signal.h: + * ace/os_include/sys/os_resource.h: + * ace/os_include/sys/os_socket.h: + Small cleanup and layout changes + +Wed Sep 15 12:31:07 UTC 2010 Johnny Willemsen + + * protocols/tests/HTBP/Reactor_Tests/server.cpp: + * protocols/tests/HTBP/Send_Recv_Tests/server.cpp: + * protocols/tests/HTBP/ping/server.cpp: + Fixed solaris compile problems + +Wed Sep 15 09:33:38 UTC 2010 Johnny Willemsen + + * ace/ace.mpc: + * ace/ace_for_tao.mpc: + Zapped removed files + + * docs/svn/config: + Added another file type + +Wed Sep 15 07:51:33 UTC 2010 Johnny Willemsen + + * bin/MakeProjectCreator/templates/gnu.mpd: + Removed invalid comma, thanks to Frank Preischl + for reporting this and Olli Savia + for correcting my initial patch + +Tue Sep 14 18:18:36 UTC 2010 Johnny Willemsen + + * ace/ace.mwc: + No need for a workspace with all projects in it + + * ace/ace_ce_dll.cfg: + Removed this file, ancient and not used + +Tue Sep 14 16:42:26 UTC 2010 Adam Mitz + + * bin/make_release.py (update_latest_tag): + + Fixed a bug with the new DAnCE changes and changed the way it does + the svn properties edits. This function is still not called, but + the calls are ready to be un-commented whenever the buildczar or + release manager can re-enable this. + +Tue Sep 14 13:00:44 UTC 2010 Johnny Willemsen + + * ace/Log_Record.h: + * ace/Log_Record.inl: + * ace/Log_Record.cpp: + Removed deprecated encode/decode methods + +Tue Sep 14 12:05:19 UTC 2010 Steve Huston + + * examples/APG/Logging/Callback-3.h: Replaced use of deprecated + ACE_Log_Record::encode() with CDR converter. + +Tue Sep 14 12:01:01 UTC 2010 Johnny Willemsen + + * ace/FlReactor/ace_flreactor.mpc: + * ace/FoxReactor/ace_foxreactor.mpc: + * ace/QtReactor/ace_qt3reactor.mpc: + * ace/QtReactor/ace_qt4reactor.mpc: + * ace/TkReactor/ace_tkreactor.mpc: + * ace/XtReactor/ace_xtreactor.mpc: + * ace/ace_flreactor.mpc: + * ace/ace_foxreactor.mpc: + * ace/ace_qt3reactor.mpc: + * ace/ace_qt4reactor.mpc: + * ace/ace_tkreactor.mpc: + * ace/ace_xtreactor.mpc: + Moved these files to the subdirectory they need to be in + +Tue Sep 14 11:40:39 UTC 2010 Johnny Willemsen + + * bin/Array.pl: + * bin/Array_Helper: + * bin/Hash_Map_Manager.pl: + * bin/Hash_Map_Manager_Helper: + * bin/vxworks_modify.pl: + Removed these files, very old and will not work at all + + * bin/PythonACE: + * bin/PythonACE/__init__.py: + * bin/PythonACE/fuzz: + * bin/PythonACE/fuzz/__init__.py: + * bin/PythonACE/fuzz/_fuzz.py: + * bin/PythonACE/fuzz/_generic_handler.py: + * bin/PythonACE/fuzz/_mailer.py: + * bin/PythonACE/fuzz/_path.py: + * bin/PythonACE/fuzz/_singleton.py: + * bin/PythonACE/fuzz/_types.py: + * bin/PythonACE/fuzz/_warning_handler.py: + * bin/PythonACE/fuzz/check_includes.py: + * bin/PythonACE/fuzz/check_no_tabs.py: + * bin/PythonACE/fuzz/cpp_inline.py: + * bin/PythonACE/fuzz/inline.py: + * bin/PythonACE/fuzz/math_include.py: + * bin/PythonACE/fuzz/max_filename.py: + * bin/PythonACE/fuzz/max_project_len.py: + * bin/PythonACE/fuzz/newline.py: + * bin/PythonACE/fuzz/no_conflict_markers.py: + * bin/PythonACE/fuzz/noncvs.py: + * bin/PythonACE/fuzz/ptr_arith_t.py: + * bin/PythonACE/fuzz/refcountservantbase.py: + * bin/PythonACE/fuzz/streams_include.py: + * bin/PythonACE/fuzz/verify_changelog.py: + * bin/fuzz.py: + Deleted, fuzz is still perl, if we need a PythonACE later we can + easily get this again from svn + +Tue Sep 14 11:31:42 UTC 2010 Johnny Willemsen + + * bin/generate_doxygen.pl: + * html/index.html: + Removed ciao config handlers + +Tue Sep 14 11:30:18 UTC 2010 Johnny Willemsen + + * bin/generate_doxygen.pl: + * html/index.html: + Removed pss + +Tue Sep 14 09:41:06 UTC 2010 Johnny Willemsen + + * debian/mpc-ace.install: + Don't use environment variables + + * protocols/ace/HTBP/HTBP_Filter.h: + Added missing includes + +Tue Sep 14 09:36:06 UTC 2010 Johnny Willemsen + + * bin/make_release.py: + Updated generation of dsc file + + * protocols/examples/RMCast/Send_Msg/Sender.cpp: + * protocols/tests/RMCast/Sender.cpp: + * tests/Based_Pointer_Test.cpp: + * tests/SSL/Bug_2912_Regression_Test.cpp: + Added missing includes + +Mon Sep 13 18:15:27 UTC 2010 Johnny Willemsen + + *: + Zapped trailing whitespaces using + find -name \*.h -o -name \*.cpp -name \*.inl | xargs perl -i -pe's/\s+\n/\n/' + +Mon Sep 13 14:04:48 UTC 2010 Johnny Willemsen + + Reverted change below, not correct given new info from Adam + + Thu Sep 9 11:49:30 UTC 2010 Johnny Willemsen + + * bin/MakeProjectCreator/templates/gnu.mpd: + Removed invalid comma, thanks to Frank Preischl + for reporting this + + * debian/debian.rules: + * debian/mpc-ace.install: + Improved + +Mon Sep 13 09:25:22 UTC 2010 Johnny Willemsen + + * bin/generate_doxygen.pl: + Updated for DAnCE move + + * ace/ETCL/ETCL_Constraint.cpp: + * ace/ETCL/ETCL_l.cpp.diff: + * ace/ETCL/ETCL_l.cpp: + * ace/Makefile.am: + * ace/Thread_Control.inl: + * ace/ace.mpc: + * ace/ace_for_tao.mpc: + * apps/JAWS3/bench/average.cpp: + * apps/JAWS3/bench/mkfiles.cpp: + * apps/JAWS3/bench/rqfiles.cpp: + * apps/JAWS3/http/HTTP_Data.h: + * apps/JAWS3/http/HTTP_Service_Handler.h: + * apps/JAWS3/http/HTTP_Service_Handler.cpp: + * apps/JAWS3/http/HTTP_States.h: + * apps/JAWS3/jaws3-todo/Reactive_Socket.h: + * apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.h: + * apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.cpp: + * apps/JAWS3/jaws3-todo/Socket.h: + * apps/JAWS3/jaws3/Concurrency_T.h: + * apps/JAWS3/small/SS_Data.h: + * apps/JAWS3/small/SS_Service_Handler.h: + * apps/JAWS3/small/SS_Service_Handler.cpp: + * apps/JAWS3/small/SS_State_DONE.h: + * apps/JAWS3/small/SS_State_DONE.cpp: + * apps/JAWS3/small/SS_State_ERROR.h: + * apps/JAWS3/small/SS_State_ERROR.cpp: + * apps/JAWS3/small/SS_State_PARSE.h: + * apps/JAWS3/small/SS_State_PARSE.cpp: + * apps/JAWS3/small/SS_State_READ.h: + * apps/JAWS3/small/SS_State_READ.cpp: + * apps/JAWS3/small/SS_State_WRITE.h: + * apps/JAWS3/small/SS_State_WRITE.cpp: + * apps/JAWS3/small/SS_Templates.cpp: + * contrib/FaCE/FaCE.h: + * examples/APG/Svc_Config/HA_Status_Dynamic.h: + * examples/APG/Svc_Config/HA_Status_Static.h: + * examples/Reactor/TP_Reactor/client.cpp: + * examples/Reactor/TP_Reactor/server.cpp: + * protocols/ace/HTBP/HTBP_Channel.cpp: + * protocols/ace/HTBP/HTBP_Filter.h: + * protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp: + * protocols/ace/HTBP/HTBP_Session.cpp: + * protocols/ace/TMCast/Group.cpp: + * protocols/examples/RMCast/Send_Msg/Sender.cpp: + * protocols/tests/HTBP/Reactor_Tests/client.cpp: + * protocols/tests/HTBP/Reactor_Tests/server.cpp: + * protocols/tests/HTBP/Reactor_Tests/test_config.h: + * protocols/tests/HTBP/Send_Large_Msg/client.cpp: + * protocols/tests/HTBP/Send_Large_Msg/server.cpp: + * protocols/tests/HTBP/Send_Recv_Tests/client.cpp: + * protocols/tests/HTBP/Send_Recv_Tests/server.cpp: + * protocols/tests/HTBP/ping/client.cpp: + * protocols/tests/HTBP/ping/server.cpp: + * protocols/tests/RMCast/Sender.cpp: + * tests/Based_Pointer_Test.cpp: + * tests/Bug_2980_Regression_Dll.cpp: + * tests/SSL/Bug_2912_Regression_Test.cpp: + Removed include of ace/OS.h, only in a few files we really had + to add an include of OS_NS_*.h + + * ace/OS.h: + * ace/OS.inl: + * ace/OS.cpp: + Removed these files, replaced with OS_NS_* files a long time ago + +Sun Sep 12 19:27:58 UTC 2010 William R. Otte + + * bin/make_release.py: + + Some updates to handle moved DAnCE package. + +Sun Sep 12 19:22:21 UTC 2010 William Otte + + * bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm: + * bin/MakeProjectCreator/templates/: + + Added rules to pullin rules.dance.GNU. + +Fri Sep 10 16:43:39 UTC 2010 Steve Huston + + * ace/Makefile.am: Removed references to files removed at + Thu Sep 9 11:14:45 UTC 2010 Johnny Willemsen + +Fri Sep 10 11:07:56 UTC 2010 Marcel Smit + + * ace/TSS_T.h: + Resolved compile issue regarding ACE_Copy_Disabled class. + +Fri Sep 10 07:36:39 UTC 2010 Marcel Smit + + * ace/Thread_Control.inl: + Include before versioning macros. + +Fri Sep 10 07:05:45 UTC 2010 Marcel Smit + + * ace/Thread_Control.inl: + Resolved compile error (ACE_OS_TRACE could not be found). + +Thu Sep 9 12:53:39 UTC 2010 Johnny Willemsen + + * ace/Asynch_Acceptor.h: + * ace/Asynch_Acceptor.cpp: + * ace/Hash_Multi_Map_Manager_T.h: + * ace/OS_NS_Thread.h: + * ace/OS_NS_Thread.cpp: + * ace/Service_Config.cpp: + * ace/TSS_T.cpp: + * ace/Thread.h: + * ace/Thread.inl: + * ace/config-macosx-snowleopard.h: + * ace/config-macosx-tiger.h: + * ace/config-macosx.h: + * tests/Hash_Multi_Map_Manager_Test.cpp: + Removed deprecated methods and arguments + + * docs/FAQ: + * FAQ: + Moved to docs + +Thu Sep 9 11:54:10 UTC 2010 Johnny Willemsen + + * apps/soreduce/Signature.cpp: + * tests/TkReactor_Test.cpp: + Fixed fuzz + +Thu Sep 9 11:49:30 UTC 2010 Johnny Willemsen + + * bin/MakeProjectCreator/templates/gnu.mpd: + Removed invalid comma, thanks to Frank Preischl + for reporting this + +Thu Sep 9 11:14:45 UTC 2010 Johnny Willemsen + + * Kokyu/Dispatch_Deferrer.h: + + * ace/Atomic_Op_T.h: + * ace/Atomic_Op_T.inl: + * ace/Configuration.h: + * ace/Configuration.cpp: + * ace/Default_Constants.h: + * ace/Hash_Multi_Map_Manager_T.h: + * ace/Hash_Multi_Map_Manager_T.cpp: + * ace/Intrusive_List.h: + * ace/Intrusive_List.inl: + * ace/Local_Name_Space_T.h: + * ace/Log_Msg.h: + * ace/Log_Msg.cpp: + * ace/MEM_Acceptor.h: + * ace/MEM_Acceptor.inl: + * ace/MEM_Connector.h: + * ace/MEM_Connector.inl: + * ace/Message_Queue.h: + * ace/OS.h: + * ace/OS_Memory.h: + * ace/OS_TLI.h: + * ace/Obstack_T.h: + * ace/Obstack_T.inl: + * ace/POSIX_Asynch_IO.h: + * ace/Process_Manager.h: + * ace/Process_Manager.cpp: + * ace/Recursive_Thread_Mutex.h: + * ace/Recursive_Thread_Mutex.cpp: + * ace/Refcountable_T.h: + * ace/Strategies_T.h: + * ace/Strategies_T.inl: + * ace/Synch.h: + * ace/Task.h: + * ace/Task_Ex_T.h: + * ace/Task_Ex_T.inl: + * ace/Task_T.h: + * ace/Task_T.inl: + * ace/Thread_Control.cpp: + * ace/Token_Collection.h: + * ace/Token_Invariants.h: + * ace/Token_Manager.h: + * ace/ace_wchar.h: + * ace/config-macosx-leopard.h: + * ace/os_include/net/os_if.h: + * ace/os_include/sys/os_mman.h: + * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp: + * netsvcs/lib/Time_Request_Reply.h: + * netsvcs/lib/Time_Request_Reply.cpp: + * tests/Conn_Test.cpp: + * tests/Dirent_Test.cpp: + * tests/Svc_Handler_Test.cpp: + Removed several methods, files, and macros that are marked deprecated + for several years now. + + * ace/Map.h: + * ace/Method_Object.h: + * ace/OS_Dirent.h: + * ace/OS_String.h: + * ace/Pair.h: + * ace/Refcountable.h: + * ace/Service_Templates.h: + Removed these files. + +Thu Sep 9 09:37:22 UTC 2010 Johnny Willemsen + + * bin/generate_doxygen.pl: + Fixed errors + + * debian/debian.rules: + Moving forward with OBS + +Thu Sep 9 09:29:30 UTC 2010 Johnny Willemsen + + * ace/CDR_Base.h: + * ace/CDR_Base.cpp: + * ace/DEV.h: + * ace/FILE.h: + * ace/Global_Macros.h: + * ace/INET_Addr.inl: + * ace/Malloc_T.h: + * ace/Malloc_T.inl: + * ace/Malloc_T.cpp: + * ace/SOCK_Dgram_Bcast.cpp: + * ace/SSL/SSL_SOCK.h: + * ace/Shared_Memory_Pool.cpp: + * ace/Sock_Connect.cpp: + * ace/config-aix-5.x.h: + * ace/config-doxygen.h: + * ace/config-g++-common.h: + * ace/config-hpux-11.00.h: + * ace/config-icc-common.h: + * ace/config-integritySCA.h: + * ace/config-linux-common.h: + * ace/config-macros.h: + * ace/config-mvs.h: + * ace/config-openvms.h: + * ace/config-suncc-common.h: + * ace/config-sunos5.5.h: + * ace/config-sunos5.6.h: + * ace/config-tandem-nsk-mips-v2.h: + * ace/config-tandem-nsk-mips-v3.h: + * ace/config-win32-borland.h: + * ace/config-win32-dmc.h: + * ace/config-win32-ghs.h: + * ace/config-win32-msvc-10.h: + * ace/config-win32-msvc-7.h: + * ace/config-win32-msvc-8.h: + * ace/config-win32-msvc-9.h: + * examples/IOStream/server/iostream_server.h: + * examples/IPC_SAP/SOCK_SAP/C-inserver.cpp: + * examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp: + * examples/Reactor/Misc/test_event_handler_t.cpp: + * tests/Basic_Types_Test.cpp: + * tests/Conn_Test.cpp: + * tests/Message_Queue_Test.cpp: + * tests/SSL/Thread_Pool_Reactor_SSL_Test.h: + * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp: + Cleanup, all compilers support templated typedefs + + * ace/config-cray.h: + * ace/config-cxx-common.h: + Removed these files, obsolete + +Thu Sep 9 09:01:10 UTC 2010 Johnny Willemsen + + * ace/ACE.cpp: + * ace/ACE_export.h: + * ace/ETCL/ETCL_y.cpp: + * ace/INET_Addr.cpp: + * ace/Log_Msg.cpp: + * ace/OS.inl: + * ace/OS_NS_Thread.h: + * ace/OS_NS_Thread.inl: + * ace/OS_NS_Thread.cpp: + * ace/OS_NS_ctype.cpp: + * ace/OS_NS_netdb.inl: + * ace/OS_NS_pwd.inl: + * ace/OS_NS_stdlib.inl: + * ace/OS_NS_time.inl: + * ace/OS_NS_time.cpp: + * ace/POSIX_CB_Proactor.cpp: + * ace/POSIX_Proactor.cpp: + * ace/config-cxx-common.h: + * ace/config-doxygen.h: + * ace/config-integritySCA.h: + * ace/config-lynxos.h: + * ace/config-macros.h: + * ace/config-openvms.h: + * ace/config-tandem-nsk-mips-v2.h: + * ace/config-tandem-nsk-mips-v3.h: + * ace/config-vxworks6.4.h: + * ace/config-win32-common.h: + * ace/os_include/os_pthread.h: + * ace/os_include/os_pwd.h: + * ace/os_include/os_signal.h: + * ace/os_include/os_stdlib.h: + * ace/os_include/os_time.h: + * ace/os_include/sys/os_types.h: + Removed Tru64, Irix, Unixware, and SCO support + + * debian/debian.rules: + Improved + + * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h: + * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h: + * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h: + * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h: + * examples/QOS/Simple/Receiver_QoS_Event_Handler.h: + * examples/QOS/Simple/Sender_QoS_Event_Handler.h: + Zapped ACE_RCSID + + * ace/config-irix6.5.x-sgic++.h: + * ace/config-irix6.x-common.h: + * ace/config-irix6.x-g++.h: + * ace/config-irix6.x-sgic++.h: + * ace/config-sco-5.0.0-nothread.h: + * ace/config-sco-5.0.0.h: + * ace/config-unixware-7.1.0.h: + * ace/config-unixware-7.1.0.udk.h: + * include/makeinclude/platform_irix6.x_common.GNU: + * include/makeinclude/platform_irix6.x_g++.GNU: + * include/makeinclude/platform_irix6.x_sgic++.GNU: + * include/makeinclude/platform_tru64_cxx.GNU: + * include/makeinclude/platform_tru64_g++.GNU: + * include/makeinclude/platform_tru64_post.GNU: + * include/makeinclude/platform_tru64_pre.GNU: + * include/makeinclude/platform_unixware_g++.GNU: + Removed the files because Tru64, Irix, Unixware, and SCO support are + removed now + +Wed Sep 8 14:54:45 UTC 2010 William Otte + + * docs/bczar/bczar.html: + + Updated documentation for removal of Release makefile. + +Wed Sep 8 14:40:57 UTC 2010 William Otte + + * Release: + + Removing obsolete release makefile. + +Wed Sep 8 10:57:12 UTC 2010 Johnny Willemsen + + * debian/ace.dsc: + * debian/debian.changelog: + * debian/debian.control: + * debian/debian.rules: + * debian/changelog: + * debian/control: + * debian/dsc: + * debian/rules: + Renamed to the names we use on OBS + +Wed Sep 8 09:11:03 UTC 2010 Johnny Willemsen + + * tests/SSL/Bug_2912_Regression_Test.cpp: + Fixed compile error + +Wed Sep 8 05:53:24 UTC 2010 Johnny Willemsen + + * examples/APG/ThreadPools/Futures.cpp: + Added missing include + +Tue Sep 7 17:07:58 UTC 2010 Steve Huston + + * ace/Process.h: Noted the affects of handle_inheritance() on Windows. + +Tue Sep 7 14:23:13 UTC 2010 Johnny Willemsen + + * ace/Message_Queue_T.cpp: + * examples/APG/ThreadPools/LF_ThreadPool.cpp: + * examples/APG/ThreadPools/ThreadPool.cpp: + * examples/APG/ThreadSafety/Mutex.cpp: + * examples/APG/Threads/Condition_Variables.cpp: + * protocols/ace/HTBP/HTBP_ID_Requestor.h: + * protocols/ace/TMCast/Group.cpp: + * protocols/ace/TMCast/MTQueue.hpp: + * tests/Bug_3878_Regression_Test.cpp: + * tests/Upgradable_RW_Test.cpp: + Fixed compile problems + +Tue Sep 7 11:35:04 UTC 2010 Johnny Willemsen + + * bin/fuzz.pl: + Fix fuzz problem + +Tue Sep 7 10:52:59 UTC 2010 Johnny Willemsen + + * Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp: + Use ACE_GUARD + + * Kokyu/Dispatcher_Task.cpp: + Initialise pointer with 0 + + * PROBLEM-REPORT-FORM: + * VERSION: + Updated support email addresses + + * ace/ACE.inl: + Layout changes + + * ace/ACE.cpp: + Layout changes, simplified some ifdef checks + + * ace/Auto_IncDec_T.h: + * ace/Env_Value_T.h: + Use ACE_Copy_Disabled + + * ace/Bound_Ptr.inl: + Documentation updates + + * ace/CORBA_macros.h: + Removed all deprecated macros + + * ace/Dynamic_Service_Base.cpp: + Use ACE_GUARD_RETURN + + * ace/Event_Handler_T.h: + * ace/Event_Handler_T.inl: + * ace/Event_Handler_T.cpp: + Removed checks for ACE_HAS_TEMPLATE_TYPEDEFS, I think all compilers + have this now, let us see if nothing breaks + + * ace/FILE.h: + Doxygen updates + + * ace/Future.h: + * ace/Future.cpp: + Use mutex defines + + * ace/Future_Set.h: + Use ACE_Copy_Disabled + + * ace/Future_Set.cpp: + Initialise pointer with 0 + + * ace/Global_Macros.h: + Removed checks for ACE_HAS_TEMPLATE_TYPEDEFS, doxygen changes, make it + possible for users to redefine ACE_GUARD macros + + * ace/Guard_T.h: + * ace/Guard_T.inl: + * ace/Guard_T.cpp: + Doxygen changes, disable ACE_Guard checks for this file + + * ace/Hash_Map_Manager_T.h: + * ace/Hash_Multi_Map_Manager_T.h: + * ace/Map_Manager.h: + Update to indicate the usage of ACE_GUARD + + * ace/INET_Addr.h: + Doxygen changes + + * ace/Local_Tokens.h: + Disable part of this file for ACE_Guard fuzz check + + * ace/Log_Msg.cpp: + Use ACE_OS::thr_self + + * ace/Malloc_T.h: + Disable part of this file for ACE_Guard fuzz check, doxygen changes + + * ace/Message_Queue_T.h: + * ace/Message_Queue_T.cpp: + * ace/Message_Queue_Vx.h: + * ace/Message_Queue_Vx.cpp: + Removed ACE_Guard argument to some methods, not used and now cause + fuzz to fail + + * ace/Mutex.h: + * ace/Mutex.inl: + Added non const lock(), this fixes bugzilla 3878. Thanks to + Susan Finster for reporting this + + * ace/Null_Barrier.h: + * ace/Null_Condition.h: + * ace/Null_Mutex.h: + * ace/Null_Semaphore.h: + Removed old comments, disable part for ACE_Guard, removed + ACE_Null_Mutex_Guard + + * ace/OS_NS_Thread.cpp: + Layout changes, use ACE_Guard + + * ace/OS_NS_poll.cpp: + * ace/OS_NS_sys_select.cpp: + Layout changes + + * ace/OS_NS_sys_socket.inl: + Comment change + + * ace/Read_Buffer.h: + * ace/Remote_Tokens.h: + * ace/SOCK.h: + Doxygen changes + + * ace/SOCK_Connector.h: + * ace/SOCK_Dgram_Mcast.h: + Doxygen changes + + * ace/SOCK_Connector.cpp: + Layout and const changes + + * ace/Select_Reactor.h: + Disable part of this file for ACE_Guard fuzz check + + * ace/Service_Gestalt.h: + Use ACE_Copy_Disabled + + * ace/Sig_Handler.cpp: + Use ACE_GUARD macros + + * ace/Synch_Traits.h: + Removed ACE_HAS_TEMPLATE_TYPEDEFS checks + + * ace/TSS_T.h: + * ace/TSS_T.cpp: + Use ACE_Copy_Disabled, reworked some code to fix ACE_Guard fuzz + checks + + * ace/Task_Ex_T.h: + Use ACE_Copy_Disabled + + * apps/Gateway/Peer/Peer.cpp: + * apps/JAWS/server/HTTP_Server.cpp: + * apps/JAWS/server/JAWS_IO.cpp: + Initialise pointers with 0 + + * apps/JAWS/server/HTTP_Helpers.cpp: + Use ACE_GUARD macros + + * apps/JAWS2/JAWS/Cache_Hash_T.cpp: + * apps/JAWS2/JAWS/Cache_Manager_T.cpp: + * apps/JAWS2/JAWS/Cache_Object.cpp: + * apps/JAWS2/JAWS/Concurrency.cpp: + * apps/JAWS2/JAWS/FILE.cpp: + * apps/JAWS2/JAWS/Jaws_IO.cpp: + * apps/JAWS2/JAWS/Reaper.cpp: + * apps/JAWS3/jaws3/FILE.cpp: + Use ACE_GUARD macros + + * apps/gperf/src/Options.cpp: + Rename of local variable so that we don't need to disable ACE_OS + fuzz check + + * bin/fuzz.pl: + Improved ACE_Guard checks and enable this one by default + + * bin/generate_doxygen.pl: + Let DANCE use the CIAO version file for the moment + + * bin/make_release.py: + Don't create static and wince solutions as part of the release anymore, + if you use these, generate them by hand in the future. Added vc10 + project files + + * examples/APG/Proactor/HA_Proactive_Status.cpp: + * examples/APG/Reactor/Client.cpp: + * examples/APG/Reactor/HAStatus.cpp: + * examples/APG/Streams/Answerer.cpp: + * examples/APG/Streams/CommandStream.cpp: + * examples/APG/ThreadManagement/Pool.cpp: + * examples/APG/ThreadPools/LF_ThreadPool.cpp: + * examples/APG/ThreadPools/Task_ThreadPool.cpp: + * examples/APG/ThreadSafety/Semaphore.cpp: + * examples/APG/Threads/Message_Blocks.cpp: + * examples/APG/Threads/Message_Queue.cpp: + * examples/ASX/Message_Queue/bounded_buffer.cpp: + * examples/ASX/Message_Queue/priority_buffer.cpp: + * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp: + * examples/C++NPv2/AIO_Client_Logging_Daemon.cpp: + * examples/C++NPv2/display_logfile.cpp: + * examples/IPC_SAP/UPIPE_SAP/ex1.cpp: + * examples/Reactor/Misc/test_demuxing.cpp: + * examples/Reactor/WFMO_Reactor/Talker.cpp: + * examples/Threads/barrier2.cpp: + * examples/Threads/thread_pool.cpp: + Initialise pointers with 0 + + * examples/APG/ThreadPools/ThreadPool.cpp: + Use ACE_Thread_ID to store a print a thread id using ACE_DEBUG, that + is the only way that is 100% portable + + * examples/APG/Threads/Guards.cpp: + Disable ACE_Guard fuzz + + * examples/Threads/reader_writer.cpp: + * examples/Threads/recursive_mutex.cpp: + Use ACE_GUARD macros + + * examples/Threads/thread_specific.cpp: + * examples/Threads/tss1.cpp: + Removed code not used + + * include/makeinclude/platform_g++_common.GNU: + Added CROSS_COMPILE support to this file + + * include/makeinclude/platform_linux.GNU: + * include/makeinclude/platform_linux_common.GNU: + Moved some bits to platform_g++_common.GNU, works with G++ in + general + + * include/makeinclude/platform_qnx_neutrino.GNU: + * include/makeinclude/platform_qnx_rtp_gcc.GNU: + Cleanup + + * netsvcs/lib/Log_Message_Receiver.h: + * netsvcs/lib/Log_Message_Receiver.cpp: + Use ACE_GUARD macros + + * performance-tests/Misc/Misc.mpc: + Enable test_guard + + * performance-tests/Misc/test_guard.cpp: + Made this compiling again + + * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp: + * performance-tests/TCP/tcp_test.cpp: + Renamed variable to not need ACE_OS fuzz disable code + + * protocols/ace/HTBP/HTBP_ID_Requestor.cpp: + * protocols/ace/HTBP/HTBP_Session.cpp: + Use ACE_GUARD macros + + * protocols/ace/RMCast/Acknowledge.h: + * protocols/ace/RMCast/Acknowledge.cpp: + * protocols/ace/RMCast/Bits.h: + * protocols/ace/RMCast/Flow.h: + * protocols/ace/RMCast/Flow.cpp: + * protocols/ace/RMCast/Fragment.h: + * protocols/ace/RMCast/Fragment.cpp: + * protocols/ace/RMCast/Link.h: + * protocols/ace/RMCast/Link.cpp: + * protocols/ace/RMCast/Parameters.h: + * protocols/ace/RMCast/Protocol.h: + * protocols/ace/RMCast/Protocol.cpp: + * protocols/ace/RMCast/Reassemble.h: + * protocols/ace/RMCast/Reassemble.cpp: + * protocols/ace/RMCast/Retransmit.h: + * protocols/ace/RMCast/Retransmit.cpp: + * protocols/ace/RMCast/Simulator.h: + * protocols/ace/RMCast/Simulator.cpp: + * protocols/ace/RMCast/Socket.h: + * protocols/ace/RMCast/Socket.cpp: + * protocols/ace/RMCast/Stack.h: + * protocols/ace/RMCast/Stack.cpp: + * protocols/ace/TMCast/FaultDetector.hpp: + * protocols/ace/TMCast/Group.cpp: + * protocols/ace/TMCast/Group.hpp: + * protocols/ace/TMCast/GroupFwd.hpp: + * protocols/ace/TMCast/LinkListener.hpp: + * protocols/ace/TMCast/MTQueue.hpp: + * protocols/ace/TMCast/MTQueue.cpp: + * protocols/ace/TMCast/Messaging.hpp: + * protocols/ace/TMCast/Protocol.hpp: + * protocols/ace/TMCast/Protocol.cpp: + * protocols/ace/TMCast/TransactionController.hpp: + Removed commented out code, Id changes, disable ACE_Guard check + for this project + + * rpmbuild/ace-tao.spec: + Fixed some problems in this spec file + + * tests/Aio_Platform_Test.cpp: + * tests/Basic_Types_Test.cpp: + * tests/Bug_1576_Regression_Test.cpp: + * tests/Bug_3532_Regression_Test.cpp: + * tests/Bug_3673_Regression_Test.cpp: + * tests/Bug_3709_Regression_Test.cpp: + * tests/Bug_3744_Regression_Test.cpp: + * tests/Compiler_Features_03_Test.cpp: + * tests/Compiler_Features_09_Test.cpp: + * tests/Compiler_Features_13_Test.cpp: + * tests/Compiler_Features_14_Test.cpp: + * tests/Env_Value_Test.cpp: + * tests/Hash_Map_Bucket_Iterator_Test.cpp: + * tests/Logging_Strategy_Test.cpp: + * tests/MT_SOCK_Test.cpp: + * tests/Pipe_Test.cpp: + * tests/Priority_Task_Test.cpp: + * tests/Proactor_UDP_Test.cpp: + * tests/QtReactor_Test.cpp: + * tests/Reactor_Notification_Queue_Test.cpp: + * tests/Reactor_Registration_Test.cpp: + * tests/Reference_Counted_Event_Handler_Test.cpp: + * tests/Time_Service_Test.cpp: + Zapped ACE_RCSID + + * tests/Message_Block_Test.cpp: + * tests/Multicast_Test_IPV6.cpp: + Initialise pointer with 0 + + * tests/Reader_Writer_Test.cpp: + Use ACE_GUARD + + * tests/Recursive_Mutex_Test.cpp: + Disable ACE_Guard fuzz for part of this file + + * tests/Bug_3878_Regression_Test.cpp: + New test for bugzilla 3878 + + * tests/SSL/Bug_2912_Regression_Test.cpp: + * tests/TP_Reactor_Test.cpp: + Use ACE_GUARD + + * tests/Simple_Message_Block_Test.cpp: + * tests/Svc_Handler_Test.cpp: + * tests/Thread_Pool_Test.cpp: + * tests/UPIPE_SAP_Test.cpp: + Initialise pointers with 0 + + * tests/Thread_Mutex_Test.cpp: + Disable ACE_Guard fuzz + + * tests/Upgradable_RW_Test.cpp: + Use ACE_GUARD + + * tests/run_test.lst: + * tests/tests.mpc: + Added 3878 + +Mon Sep 6 09:30:00 UTC 2010 Simon Massey + + * ace/Acceptor.cpp: + Due to the way the code was formatted, I mistook a do {} while loop for + a while loop with my change. I have corrected this. + +Mon Sep 6 08:10:00 UTC 2010 Simon Massey + + * ace/ACE.cpp: + * ace/Acceptor.cpp: + * ace/SOCK_IO.cpp: + * ace/SOCK_Dgram.cpp: + * tests/SOCK_Test.cpp: + * tests/MT_SOCK_Test.cpp: + * NEWS: + Now that release x.8.3. is out, we are attempting to provide the correct + fix to the original commit by Steve Huston related to handle_ready() + (Fri Aug 27 19:17:11 UTC 2010 Steve Huston ) + and added back the corresponding NEWS entry. + +Sat Sep 04 18:08:03 UTC 2010 Johnny Willemsen + + * NEWS: + * bin/diff-builds-and-group-fixed-tests-only.sh: + * bin/make_release.py: + * docs/Download.html: + * etc/index.html: + Updated because of release + Sat Sep 04 11:30:18 CEST 2010 Johnny Willemsen - * ACE version 5.8.2 released. + * ACE version 5.8.2 released. Thu Sep 2 14:46:56 UTC 2010 Vladimir Zykov diff --git a/dep/ACE_wrappers/NEWS b/dep/ACE_wrappers/NEWS index 9c845b1a7..d648b09c2 100644 --- a/dep/ACE_wrappers/NEWS +++ b/dep/ACE_wrappers/NEWS @@ -1,3 +1,37 @@ +USER VISIBLE CHANGES BETWEEN ACE-5.8.2 and ACE-5.8.3 +==================================================== + +. Two new methods were added to ACE_Pipe: close_read() and close_write(). + These methods can be used to close individual pipe handles. + +. The ACE::handle_ready() family of methods was changed to prefer using + poll() over select() on platforms where poll() is available. This + preference was previously only used if ACE_HAS_LIMITED_SELECT was set. + The ACE_HAS_LIMITED_SELECT choice is removed, making ACE_HAS_POLL the + setting that switches this preference. The driving reason for this + is that if select() is called to detect changes on a handle whose + values falls outside that which can safely be stored in an fdset, + the handle-setting macros/functions will set/clear bits outside + of the fdset. This results in very weird memory changes, often in + the stack, which are very hard to diagnose. poll()'s operation + does not suffer from this affect. With the growing use of large + numbers of handles and use of ACE_Dev_Poll_Reactor on Linux, + the rate at which this problem was cropping up was increasing. + +. Added a simple helper ACE::is_equal() which compares equality of two + objects without using operator==. This is useful for comparing floating + point values. + +. Removed all deprecated methods, arguments, files, classes, macros and + anything else we kept for years. + +. Removed Irix/Tru64/SCO/Uniware/Cray support + +. ACE_Pair has been removed. Users should now use std::pair. + +. This is the last micro release that will work with GCC < 3, after x.8.3 + support for GCC < 3 will be removed + USER VISIBLE CHANGES BETWEEN ACE-5.8.1 and ACE-5.8.2 ==================================================== @@ -8,7 +42,7 @@ USER VISIBLE CHANGES BETWEEN ACE-5.8.1 and ACE-5.8.2 USER VISIBLE CHANGES BETWEEN ACE-5.8.0 and ACE-5.8.1 ==================================================== -. Added support for Microsoft Visual Studio 2010 using nmake +. Added support for Microsoft Visual Studio 2010 using nmake . Reduced the amount of doxygen pages generated, the original settings caused a doxygen generated html package of 1.4GB which was way too large diff --git a/dep/ACE_wrappers/PROBLEM-REPORT-FORM b/dep/ACE_wrappers/PROBLEM-REPORT-FORM index 6aa5988c9..c1f90fae2 100644 --- a/dep/ACE_wrappers/PROBLEM-REPORT-FORM +++ b/dep/ACE_wrappers/PROBLEM-REPORT-FORM @@ -1,6 +1,7 @@ [Please use the PRF form below to submit bug reports, problem reports, - etc., to the ACE developers and interested users. Send to - ace-bugs@cs.wustl.edu. If you are using OCI, PrismTech, or + etc., to the ACE developers and interested users. Send it to + ace-bugs@list.isis.vanderbilt.edu, you must be subscribed to the list + in order to be able to post to it. If you are using OCI, PrismTech, or Riverace's versions of ACE do not send bugs to this mailing list, but instead contact those companies for support. Please also send your PRF as plain ASCII text, _not_ uuencoded or as an attachment. @@ -15,12 +16,8 @@ browse bugzilla and the ChangeLog files to find out if your problem has been solved in a more recent version of ACE. - To ensure that you see responses, please do one of the following: - - 1) Subscribe to the ace-bugs mail list, by sending email with - contents "subscribe ace-bugs" to majordomo@cs.wustl.edu. - - 2) Or, monitor the comp.soft-sys.ace newsgroup for responses. + To subscribe to the list see + http://www.cs.wustl.edu/~schmidt/ACE-mail.html Replace/remove all the explanatory text in brackets before mailing. @@ -40,10 +37,10 @@ 8<----------8<----------8<----------8<----------8<----------8<----------8<---- -To: ace-bugs@cs.wustl.edu +To: ace-bugs@list.isis.vanderbilt.edu Subject: [area]: [synopsis] - ACE VERSION: 5.8.2 + ACE VERSION: 5.8.3 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/dep/ACE_wrappers/THANKS b/dep/ACE_wrappers/THANKS index 90679c225..a23b239e6 100644 --- a/dep/ACE_wrappers/THANKS +++ b/dep/ACE_wrappers/THANKS @@ -2333,6 +2333,12 @@ Rafi Kannan Ramaswamy Brian Johnson Catherine L. Paquin +Susan Finster +Frank Preischl +Matthew Waller +Elez +Ranjit Hande +Van Vuong I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile @@ -2353,6 +2359,7 @@ hear about it. Please see the instructions in $ACE_ROOT/PROBLEM-REPORT-FORM $TAO_ROOT/PROBLEM-REPORT-FORM $CIAO_ROOT/PROBLEM-REPORT-FORM +$DANCE_ROOT/PROBLEM-REPORT-FORM for instructions on submitting suggestions or fixes. diff --git a/dep/ACE_wrappers/VERSION b/dep/ACE_wrappers/VERSION index 2e26ed8f5..594af04e5 100644 --- a/dep/ACE_wrappers/VERSION +++ b/dep/ACE_wrappers/VERSION @@ -1,11 +1,8 @@ -This is ACE version 5.8.2, released Sat Sep 04 11:30:18 CEST 2010 +This is ACE version 5.8.3, released Wed Oct 27 12:01:05 CEST 2010 If you have any problems with or questions about ACE, please send -email to the ACE mailing list (ace-users@cs.wustl.edu), using the form -found in the file PROBLEM-REPORT-FORM. To ensure that you see responses, -please do one of the following: +e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu), +using the form found in the file PROBLEM-REPORT-FORM. In order +to post to the list you must subscribe to it. - 1) Subscribe to the ace-users mail list, by sending email with - contents "subscribe ace-users" to majordomo@cs.wustl.edu. - - 2) Or, monitor the comp.soft-sys.ace newsgroup for responses. +See http://www.cs.wustl.edu/~schmidt/ACE-mail.html diff --git a/dep/ACE_wrappers/ace/ACE.cpp b/dep/ACE_wrappers/ace/ACE.cpp index 97ed2ae4f..433b5e3e7 100644 --- a/dep/ACE_wrappers/ace/ACE.cpp +++ b/dep/ACE_wrappers/ace/ACE.cpp @@ -1,4 +1,4 @@ -// $Id: ACE.cpp 91604 2010-09-02 14:51:58Z vzykov $ +// $Id: ACE.cpp 92298 2010-10-21 11:15:17Z johnnyw $ #include "ace/ACE.h" @@ -33,9 +33,9 @@ extern "C" int maxFiles; #include "ace/ACE.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) +#if defined (ACE_HAS_POLL) # include "ace/OS_NS_poll.h" -#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ +#endif /* ACE_HAS_POLL */ // Open versioned namespace, if enabled by the user. ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -88,10 +88,6 @@ ACE::out_of_handles (int error) #elif defined (__OpenBSD__) // OpenBSD appears to return EBADF. error == EBADF || -#elif defined (__sgi) // irix - error == ENOTSUP || -#elif defined (DIGITAL_UNIX) // osf1 - error == ENOTSUP || #endif /* ACE_WIN32 */ error == ENFILE) return 1; @@ -1762,7 +1758,7 @@ ACE::sendv_n_i (ACE_HANDLE handle, { // Try to transfer as much of the remaining data as possible. ssize_t n = ACE_OS::sendv (handle, iov + s, iovcnt - s); - + // Check EOF. if (n == 0) return 0; @@ -2169,28 +2165,29 @@ ACE::handle_ready (ACE_HANDLE handle, int write_ready, int exception_ready) { -#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) - ACE_UNUSED_ARG (write_ready); +#if defined (ACE_HAS_POLL) ACE_UNUSED_ARG (exception_ready); struct pollfd fds; fds.fd = handle; - fds.events = read_ready ? POLLIN : POLLOUT; + fds.events = read_ready ? POLLIN : 0; + + if( write_ready ) + { + fds.events |= POLLOUT; + } + fds.revents = 0; - int result = ACE_OS::poll (&fds, 1, timeout); + int const result = ACE_OS::poll (&fds, 1, timeout); #else ACE_Handle_Set handle_set; handle_set.set_bit (handle); // Wait for data or for the timeout to elapse. - int select_width; -# if defined (ACE_WIN32) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles. - select_width = 0; -# else + int select_width = 0; +#if !defined (ACE_WIN32) select_width = int (handle) + 1; # endif /* ACE_WIN64 */ int result = ACE_OS::select (select_width, @@ -2199,8 +2196,7 @@ ACE::handle_ready (ACE_HANDLE handle, exception_ready ? handle_set.fdset () : 0, // exception_fds. timeout); -#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ - +#endif /* ACE_HAS_POLL */ switch (result) { case 0: // Timer expired. @@ -2221,14 +2217,12 @@ ACE::enter_recv_timedwait (ACE_HANDLE handle, const ACE_Time_Value *timeout, int &val) { - int result = ACE::handle_read_ready (handle, - timeout); + int const result = ACE::handle_read_ready (handle, timeout); if (result == -1) return -1; - ACE::record_and_set_non_blocking_mode (handle, - val); + ACE::record_and_set_non_blocking_mode (handle, val); return result; } @@ -2238,21 +2232,18 @@ ACE::enter_send_timedwait (ACE_HANDLE handle, const ACE_Time_Value *timeout, int &val) { - int result = ACE::handle_write_ready (handle, - timeout); + int const result = ACE::handle_write_ready (handle, timeout); if (result == -1) return -1; - ACE::record_and_set_non_blocking_mode (handle, - val); + ACE::record_and_set_non_blocking_mode (handle, val); return result; } void -ACE::record_and_set_non_blocking_mode (ACE_HANDLE handle, - int &val) +ACE::record_and_set_non_blocking_mode (ACE_HANDLE handle, int &val) { // We need to record whether we are already *in* nonblocking mode, // so that we can correctly reset the state when we're done. @@ -2265,11 +2256,9 @@ ACE::record_and_set_non_blocking_mode (ACE_HANDLE handle, } void -ACE::restore_non_blocking_mode (ACE_HANDLE handle, - int val) +ACE::restore_non_blocking_mode (ACE_HANDLE handle, int val) { - if (ACE_BIT_DISABLED (val, - ACE_NONBLOCK)) + if (ACE_BIT_DISABLED (val, ACE_NONBLOCK)) { // Save/restore errno. ACE_Errno_Guard error (errno); @@ -2279,11 +2268,9 @@ ACE::restore_non_blocking_mode (ACE_HANDLE handle, } } - -// Format buffer into printable format. This is useful for debugging. -// Portions taken from mdump by J.P. Knight (J.P.Knight@lut.ac.uk) -// Modifications by Todd Montgomery. - +/// Format buffer into printable format. This is useful for debugging. +/// Portions taken from mdump by J.P. Knight (J.P.Knight@lut.ac.uk) +/// Modifications by Todd Montgomery. size_t ACE::format_hexdump (const char *buffer, size_t size, @@ -2430,7 +2417,7 @@ ACE::timestamp (const ACE_Time_Value& time_value, ACE_TEXT ("Fri"), ACE_TEXT ("Sat") }; - + static const ACE_TCHAR *month_name[] = { ACE_TEXT ("Jan"), @@ -2446,10 +2433,10 @@ ACE::timestamp (const ACE_Time_Value& time_value, ACE_TEXT ("Nov"), ACE_TEXT ("Dec") }; - + SYSTEMTIME local; ::GetLocalTime (&local); - + ACE_OS::sprintf (date_and_time, ACE_TEXT ("%3s %3s %2d %04d %02d:%02d:%02d.%06d"), day_of_week_name[local.wDayOfWeek], @@ -2464,8 +2451,8 @@ ACE::timestamp (const ACE_Time_Value& time_value, } #endif /* WIN32 */ ACE_TCHAR timebuf[26]; // This magic number is based on the ctime(3c) man page. - ACE_Time_Value cur_time = - (time_value == ACE_Time_Value::zero) ? + ACE_Time_Value cur_time = + (time_value == ACE_Time_Value::zero) ? ACE_Time_Value (ACE_OS::gettimeofday ()) : time_value; time_t secs = cur_time.sec (); @@ -2528,7 +2515,7 @@ ACE::handle_timed_complete (ACE_HANDLE h, { ACE_TRACE ("ACE::handle_timed_complete"); -#if !defined (ACE_WIN32) && defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) +#if !defined (ACE_WIN32) && defined (ACE_HAS_POLL) struct pollfd fds; @@ -2541,7 +2528,7 @@ ACE::handle_timed_complete (ACE_HANDLE h, ACE_Handle_Set wr_handles; rd_handles.set_bit (h); wr_handles.set_bit (h); -#endif /* !ACE_WIN32 && ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ +#endif /* !ACE_WIN32 && ACE_HAS_POLL */ #if defined (ACE_WIN32) // Winsock is different - it sets the exception bit for failed connect, @@ -2561,7 +2548,7 @@ ACE::handle_timed_complete (ACE_HANDLE h, ex_handles, timeout); #else -# if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) +# if defined (ACE_HAS_POLL) int n = ACE_OS::poll (&fds, 1, timeout); @@ -2579,7 +2566,7 @@ ACE::handle_timed_complete (ACE_HANDLE h, wr_handles, 0, timeout); -# endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ +# endif /* ACE_HAS_POLL */ #endif /* ACE_WIN32 */ // If we failed to connect within the time period allocated by the @@ -2613,18 +2600,18 @@ ACE::handle_timed_complete (ACE_HANDLE h, } #else if (is_tli) -# if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) +# if defined (ACE_HAS_POLL) need_to_check = (fds.revents & POLLIN) && !(fds.revents & POLLOUT); # else need_to_check = rd_handles.is_set (h) && !wr_handles.is_set (h); -# endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ +# endif /* ACE_HAS_POLL */ else -# if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) +# if defined (ACE_HAS_POLL) need_to_check = (fds.revents & POLLIN); # else need_to_check = true; -# endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ +# endif /* ACE_HAS_POLL */ #endif /* ACE_WIN32 */ if (need_to_check) @@ -2686,7 +2673,7 @@ ACE::handle_timed_accept (ACE_HANDLE listener, if (listener == ACE_INVALID_HANDLE) return -1; -#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) +#if defined (ACE_HAS_POLL) struct pollfd fds; @@ -2698,29 +2685,25 @@ ACE::handle_timed_accept (ACE_HANDLE listener, // Use the select() implementation rather than poll(). ACE_Handle_Set rd_handle; rd_handle.set_bit (listener); -#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ +#endif /* ACE_HAS_POLL */ // We need a loop here if is enabled. for (;;) { -#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) +#if defined (ACE_HAS_POLL) int n = ACE_OS::poll (&fds, 1, timeout); #else - int select_width; -# if defined (ACE_WIN32) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles. - select_width = 0; -# else + int select_width = 0; +# if !defined (ACE_WIN32) select_width = int (listener) + 1; # endif /* ACE_WIN32 */ int n = ACE_OS::select (select_width, rd_handle, 0, 0, timeout); -#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ +#endif /* ACE_HAS_POLL */ switch (n) { diff --git a/dep/ACE_wrappers/ace/ACE.h b/dep/ACE_wrappers/ace/ACE.h index f4e6adf16..04b39a856 100644 --- a/dep/ACE_wrappers/ace/ACE.h +++ b/dep/ACE_wrappers/ace/ACE.h @@ -4,7 +4,7 @@ /** * @file ACE.h * - * $Id: ACE.h 91603 2010-09-01 21:02:28Z shuston $ + * $Id: ACE.h 92060 2010-09-27 18:08:48Z johnnyw $ * * This file contains value added ACE functions that extend the * behavior of the UNIX and Win32 OS calls. @@ -90,7 +90,7 @@ namespace ACE /// Simple wildcard matching function supporting '*' and '?' /// return true if string s matches pattern. - /// If character_classes is true, '[' is treated as a wildcard character + /// If @a character_classes is true, '[' is treated as a wildcard character /// as described in the fnmatch() POSIX API. The following POSIX "bracket /// expression" features are not implemented: collating symbols, equivalence /// class expressions, and character class expressions. The POSIX locale is @@ -642,6 +642,14 @@ namespace ACE /// Computes the base 2 logarithm of {num}. ACE_NAMESPACE_INLINE_FUNCTION u_long log2 (u_long num); + /// Helper to avoid comparing floating point values with == + /// (uses < and > operators). + template + bool is_equal (const T& a, const T& b) + { + return !((a < b) || (a > b)); + } + /// Hex conversion utility. extern ACE_Export ACE_TCHAR nibble2hex (u_int n); diff --git a/dep/ACE_wrappers/ace/ACE.inl b/dep/ACE_wrappers/ace/ACE.inl index 4be80bfb6..e36e4f01f 100644 --- a/dep/ACE_wrappers/ace/ACE.inl +++ b/dep/ACE_wrappers/ace/ACE.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: ACE.inl 87366 2009-11-05 20:16:30Z olli $ +// $Id: ACE.inl 91813 2010-09-17 07:52:52Z johnnyw $ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_Thread.h" @@ -238,36 +238,21 @@ ACE::recv_i (ACE_HANDLE handle, void *buf, size_t len) } ACE_INLINE int -ACE::handle_read_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout) +ACE::handle_read_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout) { - return ACE::handle_ready (handle, - timeout, - 1, - 0, - 0); + return ACE::handle_ready (handle, timeout, 1, 0, 0); } ACE_INLINE int -ACE::handle_write_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout) +ACE::handle_write_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout) { - return ACE::handle_ready (handle, - timeout, - 0, - 1, - 0); + return ACE::handle_ready (handle, timeout, 0, 1, 0); } ACE_INLINE int -ACE::handle_exception_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout) +ACE::handle_exception_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout) { - return ACE::handle_ready (handle, - timeout, - 0, - 0, - 1); + return ACE::handle_ready (handle, timeout, 0, 0, 1); } ACE_INLINE void @@ -287,7 +272,7 @@ ACE::strdelete (wchar_t *s) ACE_INLINE bool ACE::isdotdir (const char *s) { - return (s[0] == '.' && + return (s[0] == '.' && ((s[1] == 0) || (s[1] == '.' && s[2] == 0))); } @@ -295,7 +280,7 @@ ACE::isdotdir (const char *s) ACE_INLINE bool ACE::isdotdir (const wchar_t *s) { - return (s[0] == ACE_TEXT ('.') && + return (s[0] == ACE_TEXT ('.') && ((s[1] == 0) || (s[1] == ACE_TEXT ('.') && s[2] == 0))); } #endif /* ACE_HAS_WCHAR */ diff --git a/dep/ACE_wrappers/ace/ACE_export.h b/dep/ACE_wrappers/ace/ACE_export.h index 8ad2a33eb..74c62ec34 100644 --- a/dep/ACE_wrappers/ace/ACE_export.h +++ b/dep/ACE_wrappers/ace/ACE_export.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: ACE_export.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: ACE_export.h 91683 2010-09-09 09:07:49Z johnnyw $ // Definition for Win32 Export directives. // This file is generated automatically by // generate_export_file.pl @@ -53,9 +53,7 @@ #if defined (__ACE_INLINE__) # if defined (_MSC_VER) || defined (__MINGW32__) || defined (CYGWIN32) || \ (defined (__SUNPRO_CC) && __SUNPRO_CC >= 0x560) || \ - (defined (__HP_aCC) && (__HP_aCC >= 60500)) || \ - (defined (__sgi) && \ - defined (_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + (defined (__HP_aCC) && (__HP_aCC >= 60500)) # define ACE_NAMESPACE_INLINE_FUNCTION inline # else # define ACE_NAMESPACE_INLINE_FUNCTION ACE_NAMESPACE_STORAGE_CLASS inline diff --git a/dep/ACE_wrappers/ace/Acceptor.cpp b/dep/ACE_wrappers/ace/Acceptor.cpp index 859afb12c..236a35ba8 100644 --- a/dep/ACE_wrappers/ace/Acceptor.cpp +++ b/dep/ACE_wrappers/ace/Acceptor.cpp @@ -1,4 +1,4 @@ -// $Id: Acceptor.cpp 91604 2010-09-02 14:51:58Z vzykov $ +// $Id: Acceptor.cpp 91623 2010-09-06 09:30:59Z sma $ #ifndef ACE_ACCEPTOR_CPP #define ACE_ACCEPTOR_CPP @@ -10,12 +10,10 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Acceptor.h" -#include "ace/Handle_Set.h" #include "ace/Svc_Handler.h" #include "ace/WFMO_Reactor.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" -#include "ace/OS_NS_sys_select.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -365,17 +363,9 @@ template int ACE_Acceptor::handle_input (ACE_HANDLE listener) { ACE_TRACE ("ACE_Acceptor::handle_input"); - ACE_Handle_Set conn_handle; // Default is "timeout (0, 0)," which means "poll." ACE_Time_Value timeout; -# if defined (ACE_WIN32) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles - int select_width = 0; -# else - int select_width = int (listener) + 1; -# endif /* ACE_WIN32 */ // Accept connections from clients. Note that a loop is used for two // reasons: @@ -387,6 +377,11 @@ ACE_Acceptor::handle_input (ACE_HANDLE listene // 2. It allows the TLI_SAP::ACE_Acceptor class to work correctly (don't // ask -- TLI is *horrible*...). + // Ensure that errno is preserved in case the ACE::handle_read_ready() + // method resets it in the loop bellow. We are actually supposed to + // ignore any errors from this loop, hence the return 0 following it. + ACE_Errno_Guard error (errno); + // @@ What should we do if any of the substrategies fail? Right // now, we just print out a diagnostic message if // returns > 0 and return 0 (which means that the Acceptor remains @@ -401,9 +396,11 @@ ACE_Acceptor::handle_input (ACE_HANDLE listene if (this->make_svc_handler (svc_handler) == -1) { if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%p\n"), - ACE_TEXT ("make_svc_handler"))); + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("%p\n"), + ACE_TEXT ("make_svc_handler"))); + } return 0; } // Accept connection into the Svc_Handler. @@ -412,10 +409,18 @@ ACE_Acceptor::handle_input (ACE_HANDLE listene // Note that closes the // on failure. if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%p\n"), - ACE_TEXT ("accept_svc_handler"))); - return this->handle_accept_error (); + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("%p\n"), + ACE_TEXT ("accept_svc_handler"))); + } + const int ret = this->handle_accept_error (); + if (ret == -1) + { + // Ensure that the errno from the above call propegates. + error = errno; + } + return ret; } // Activate the using the designated concurrency // strategy (note that this method becomes responsible for @@ -427,23 +432,17 @@ ACE_Acceptor::handle_input (ACE_HANDLE listene // on failure. if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%p\n"), - ACE_TEXT ("activate_svc_handler"))); + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("%p\n"), + ACE_TEXT ("activate_svc_handler"))); + } return 0; } - - conn_handle.set_bit (listener); - } - - // Now, check to see if there is another connection pending and - // break out of the loop if there is none. - while (this->use_select_ - && ACE_OS::select (select_width, - conn_handle, - 0, - 0, - &timeout) == 1); + // Now, check to see if there is another connection pending and + // break out of the loop if there is none. + } while (this->use_select_ && + ACE::handle_read_ready (listener, &timeout) == 1); return 0; } diff --git a/dep/ACE_wrappers/ace/Arg_Shifter.cpp b/dep/ACE_wrappers/ace/Arg_Shifter.cpp index d491f8236..626786035 100644 --- a/dep/ACE_wrappers/ace/Arg_Shifter.cpp +++ b/dep/ACE_wrappers/ace/Arg_Shifter.cpp @@ -1,4 +1,4 @@ -// $Id: Arg_Shifter.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Arg_Shifter.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #ifndef ACE_ARG_SHIFTER_T_CPP #define ACE_ARG_SHIFTER_T_CPP diff --git a/dep/ACE_wrappers/ace/Array.h b/dep/ACE_wrappers/ace/Array.h deleted file mode 100644 index 3caaa7b71..000000000 --- a/dep/ACE_wrappers/ace/Array.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Array.h - * - * $Id: Array.h 80826 2008-03-04 14:51:23Z wotte $ - * - * @deprecated - * - * @note This file has been deprecated and will soon go away. You - * should directly include "Containers_T.h" instead. - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_ARRAY_H -#define ACE_ARRAY_H -#include /**/ "ace/pre.h" - -#include "ace/Containers_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "ace/post.h" -#endif /* ACE_ARRAY_H */ diff --git a/dep/ACE_wrappers/ace/Asynch_Acceptor.cpp b/dep/ACE_wrappers/ace/Asynch_Acceptor.cpp index 85d656956..56af2f140 100644 --- a/dep/ACE_wrappers/ace/Asynch_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/Asynch_Acceptor.cpp @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: Asynch_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Asynch_Acceptor.cpp 91693 2010-09-09 12:57:54Z johnnyw $ #ifndef ACE_ASYNCH_ACCEPTOR_C #define ACE_ASYNCH_ACCEPTOR_C @@ -445,13 +445,6 @@ ACE_Asynch_Acceptor::make_handler (void) return handler; } -/* static */ -template size_t -ACE_Asynch_Acceptor::address_size (void) -{ - return sizeof (sockaddr) + sizeof (sockaddr_in); -} - template bool ACE_Asynch_Acceptor::pass_addresses (void) const { diff --git a/dep/ACE_wrappers/ace/Asynch_Acceptor.h b/dep/ACE_wrappers/ace/Asynch_Acceptor.h index 29872d594..b806d6e45 100644 --- a/dep/ACE_wrappers/ace/Asynch_Acceptor.h +++ b/dep/ACE_wrappers/ace/Asynch_Acceptor.h @@ -4,7 +4,7 @@ /** * @file Asynch_Acceptor.h * - * $Id: Asynch_Acceptor.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Asynch_Acceptor.h 91693 2010-09-09 12:57:54Z johnnyw $ * * @author Irfan Pyarali (irfan@cs.wustl.edu) */ @@ -211,11 +211,6 @@ public: /// Set bytes to be read with the call. virtual void bytes_to_read (size_t new_value); - /// @deprecated address_size() assumes IPv4 use, so is not always valid. - /// This method will be removed after ACE 5.5. Internal uses have been - /// changes to base needed sizes on the addr_family_ member. - static size_t address_size (void); - protected: /// This is called when an outstanding accept completes. diff --git a/dep/ACE_wrappers/ace/Asynch_Connector.cpp b/dep/ACE_wrappers/ace/Asynch_Connector.cpp index 3d493069f..466d48646 100644 --- a/dep/ACE_wrappers/ace/Asynch_Connector.cpp +++ b/dep/ACE_wrappers/ace/Asynch_Connector.cpp @@ -1,4 +1,4 @@ -// $Id: Asynch_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Asynch_Connector.cpp 92069 2010-09-28 11:38:59Z johnnyw $ #ifndef ACE_ASYNCH_CONNECTOR_CPP #define ACE_ASYNCH_CONNECTOR_CPP @@ -221,32 +221,6 @@ ACE_Asynch_Connector::parse_address (const ACE_Asynch_Connect::Result & remote_address.set (reinterpret_cast (&remote_addr), remote_size); -#if 0 - // @@ Just debugging. - char local_address_buf [BUFSIZ]; - char remote_address_buf [BUFSIZ]; - - if (local_address.addr_to_string (local_address_buf, - sizeof local_address_buf) == -1) - ACE_ERROR ((LM_ERROR, - "Error:%m:can't obtain local_address's address string")); - - ACE_DEBUG ((LM_DEBUG, - "ACE_Asynch_Connector::parse_address : " - "Local address %s\n", - local_address_buf)); - - if (remote_address.addr_to_string (remote_address_buf, - sizeof remote_address_buf) == -1) - ACE_ERROR ((LM_ERROR, - "Error:%m:can't obtain remote_address's address string")); - - ACE_DEBUG ((LM_DEBUG, - "ACE_Asynch_Connector::parse_address : " - "Remote address %s\n", - remote_address_buf)); -#endif /* 0 */ - return; } diff --git a/dep/ACE_wrappers/ace/Atomic_Op.inl b/dep/ACE_wrappers/ace/Atomic_Op.inl index 6dcade6c0..564017aec 100644 --- a/dep/ACE_wrappers/ace/Atomic_Op.inl +++ b/dep/ACE_wrappers/ace/Atomic_Op.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Atomic_Op.inl 89905 2010-04-16 13:04:47Z johnnyw $ +// $Id: Atomic_Op.inl 91813 2010-09-17 07:52:52Z johnnyw $ #if defined (ACE_HAS_INTRINSIC_INTERLOCKED) # include "ace/os_include/os_intrin.h" @@ -13,7 +13,7 @@ #if defined (ACE_HAS_SOLARIS_ATOMIC_LIB) # include -#endif +#endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Atomic_Op_T.cpp b/dep/ACE_wrappers/ace/Atomic_Op_T.cpp index 3c463d489..de1fd7dd0 100644 --- a/dep/ACE_wrappers/ace/Atomic_Op_T.cpp +++ b/dep/ACE_wrappers/ace/Atomic_Op_T.cpp @@ -1,4 +1,4 @@ -// $Id: Atomic_Op_T.cpp 91287 2010-08-05 10:30:49Z johnnyw $ +// $Id: Atomic_Op_T.cpp 92052 2010-09-27 14:20:22Z vzykov $ #ifndef ACE_ATOMIC_OP_T_CPP #define ACE_ATOMIC_OP_T_CPP @@ -38,7 +38,7 @@ ACE_Atomic_Op_Ex::dump (void) const // ACE_TRACE ("ACE_Atomic_Op_Ex::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->mutex_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP, this)); + ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/dep/ACE_wrappers/ace/Atomic_Op_T.h b/dep/ACE_wrappers/ace/Atomic_Op_T.h index 13bd7dbbf..7a20049ce 100644 --- a/dep/ACE_wrappers/ace/Atomic_Op_T.h +++ b/dep/ACE_wrappers/ace/Atomic_Op_T.h @@ -4,7 +4,7 @@ /** * @file Atomic_Op_T.h * - * $Id: Atomic_Op_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Atomic_Op_T.h 92353 2010-10-25 06:34:35Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -220,11 +220,12 @@ public: ACE_Atomic_Op_Ex (ACE_Atomic_Op_Ex const &); /** - * Returns a reference to the underlying . This makes it + * Returns a reference to the underlying ACE_LOCK. This makes it * possible to acquire the lock explicitly, which can be useful in - * some cases if you instantiate the with an - * ACE_Recursive_Mutex or ACE_Process_Mutex. @note the right - * name would be lock_, but HP/C++ will choke on that! + * some cases if you instantiate the ACE_Atomic_Op_Ex with an + * ACE_Recursive_Mutex or ACE_Process_Mutex. + * + * @note The right name would be lock_, but HP/C++ will choke on that! */ ACE_LOCK & mutex (void); @@ -274,10 +275,10 @@ public: /// Manage copying... ACE_Atomic_Op (ACE_Atomic_Op const & c); - /// Atomically assign rhs to @c value_. + /// Atomically assign @a rhs to @c value_. ACE_Atomic_Op & operator= (arg_type rhs); - /// Atomically assign to @c value_. + /// Atomically assign @a rhs to @c value_. ACE_Atomic_Op & operator= ( ACE_Atomic_Op const & rhs); @@ -296,25 +297,25 @@ public: /// Atomically post-decrement @c value_. TYPE operator-- (int); - /// Atomically decrement @c value_ by rhs. + /// Atomically decrement @c value_ by @a rhs. TYPE operator-= (arg_type rhs); - /// Atomically compare @c value_ with rhs. + /// Atomically compare @c value_ with @a rhs. bool operator== (arg_type rhs) const; - /// Atomically compare @c value_ with rhs. + /// Atomically compare @c value_ with @a rhs. bool operator!= (arg_type rhs) const; - /// Atomically check if @c value_ greater than or equal to rhs. + /// Atomically check if @c value_ greater than or equal to @a rhs. bool operator>= (arg_type rhs) const; - /// Atomically check if @c value_ greater than rhs. + /// Atomically check if @c value_ greater than @a rhs. bool operator> (arg_type rhs) const; - /// Atomically check if @c value_ less than or equal to rhs. + /// Atomically check if @c value_ less than or equal to @a rhs. bool operator<= (arg_type rhs) const; - /// Atomically check if @c value_ less than rhs. + /// Atomically check if @c value_ less than @a rhs. bool operator< (arg_type rhs) const; /// Explicitly return @c value_. @@ -323,18 +324,6 @@ public: /// Dump the state of an object. void dump (void) const; - /** - * Returns a reference to the underlying . This makes it - * possible to acquire the lock explicitly, which can be useful in - * some cases if you instantiate the ACE_Atomic_Op with an - * ACE_Recursive_Mutex or ACE_Process_Mutex. - * - * @deprecated This member function is deprecated and so may go away in - * the future. If you need access to the underlying mutex, consider - * using the ACE_Atomic_Op_Ex template instead. - */ - ACE_LOCK & mutex (void); - /** * Explicitly return @c value_ (by reference). This gives the user * full, unrestricted access to the underlying value. This method diff --git a/dep/ACE_wrappers/ace/Atomic_Op_T.inl b/dep/ACE_wrappers/ace/Atomic_Op_T.inl index ff051b0cb..71ce1c1e2 100644 --- a/dep/ACE_wrappers/ace/Atomic_Op_T.inl +++ b/dep/ACE_wrappers/ace/Atomic_Op_T.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Atomic_Op_T.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Atomic_Op_T.inl 91688 2010-09-09 11:21:50Z johnnyw $ #include "ace/Guard_T.h" @@ -322,14 +322,6 @@ ACE_Atomic_Op::dump (void) const #endif /* ACE_HAS_DUMP */ return; } - -template -ACE_INLINE ACE_LOCK & -ACE_Atomic_Op::mutex (void) -{ - return this->own_mutex_; -} - template ACE_INLINE TYPE & ACE_Atomic_Op::value_i (void) diff --git a/dep/ACE_wrappers/ace/Auto_Event.h b/dep/ACE_wrappers/ace/Auto_Event.h index 042f82ed2..9699759ad 100644 --- a/dep/ACE_wrappers/ace/Auto_Event.h +++ b/dep/ACE_wrappers/ace/Auto_Event.h @@ -4,7 +4,7 @@ /** * @file Auto_Event.h * - * $Id: Auto_Event.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Auto_Event.h 91781 2010-09-15 12:49:15Z johnnyw $ * * Moved from Synch.h. * @@ -32,7 +32,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @brief Auto Events. * * Specialization of Event mechanism which wakes up one waiting - * thread on . All platforms support process-scope locking + * thread on @c signal. All platforms support process-scope locking * support. However, only Win32 platforms support global naming and * system-scope locking support. */ diff --git a/dep/ACE_wrappers/ace/Auto_IncDec_T.h b/dep/ACE_wrappers/ace/Auto_IncDec_T.h index 8fcdb0bcd..86fa65523 100644 --- a/dep/ACE_wrappers/ace/Auto_IncDec_T.h +++ b/dep/ACE_wrappers/ace/Auto_IncDec_T.h @@ -4,7 +4,7 @@ /** * @file Auto_IncDec_T.h * - * $Id: Auto_IncDec_T.h 84675 2009-03-02 11:44:35Z johnnyw $ + * $Id: Auto_IncDec_T.h 92353 2010-10-25 06:34:35Z johnnyw $ * * @author Edan Ayal */ @@ -34,14 +34,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * This data structure is meant to be used within a method, * function, or scope. The actual parameter given for the - * template parameter + * @c ACE_SAFELY_INCREMENTABLE_DECREMENTABLE template parameter * must provide at least operators ++ and --. */ template -class ACE_Auto_IncDec +class ACE_Auto_IncDec : private ACE_Copy_Disabled { public: - /// Implicitly increment the counter. ACE_Auto_IncDec (ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter); @@ -52,16 +51,9 @@ public: void dump (void) const; protected: - /// Reference to the counter + /// Reference to the @c ACE_SAFELY_INCREMENTABLE_DECREMENTABLE counter /// we're incrementing/decrementing. ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter_; - -private: - // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const - ACE_Auto_IncDec &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Auto_IncDec (const - ACE_Auto_IncDec &)) }; ACE_END_VERSIONED_NAMESPACE_DECL @@ -72,14 +64,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Auto_IncDec_T.cpp" -// On Win32 platforms, this code will be included as template source -// code and will not be inlined. Therefore, we first turn off -// ACE_INLINE, set it to be nothing, include the code, and then turn -// ACE_INLINE back to its original setting. All this nonsense is -// necessary, since the generic template code that needs to be -// specialized cannot be inlined, else the compiler will ignore the -// specialization code. Also, the specialization code *must* be -// inlined or the compiler will ignore the specializations. #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/dep/ACE_wrappers/ace/Barrier.cpp b/dep/ACE_wrappers/ace/Barrier.cpp index c4b0cceec..b55ee1c41 100644 --- a/dep/ACE_wrappers/ace/Barrier.cpp +++ b/dep/ACE_wrappers/ace/Barrier.cpp @@ -1,4 +1,4 @@ -// $Id: Barrier.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Barrier.cpp 92069 2010-09-28 11:38:59Z johnnyw $ #include "ace/Barrier.h" @@ -167,26 +167,6 @@ ACE_Thread_Barrier::dump (void) const #endif /* ACE_HAS_DUMP */ } -#if 0 -ACE_ALLOC_HOOK_DEFINE(ACE_Process_Barrier) - -ACE_Process_Barrier::ACE_Process_Barrier (u_int count, - const ACE_TCHAR *name) - : ACE_Barrier (count, USYNC_PROCESS, name) -{ -// ACE_TRACE ("ACE_Process_Barrier::ACE_Process_Barrier"); -} - -void -ACE_Process_Barrier::dump (void) const -{ -#if defined (ACE_HAS_DUMP) -// ACE_TRACE ("ACE_Process_Barrier::dump"); - ACE_Barrier::dump (); -#endif /* ACE_HAS_DUMP */ -} -#endif /* 0 */ - ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ diff --git a/dep/ACE_wrappers/ace/Barrier.h b/dep/ACE_wrappers/ace/Barrier.h index 189ff07e4..84d7b6492 100644 --- a/dep/ACE_wrappers/ace/Barrier.h +++ b/dep/ACE_wrappers/ace/Barrier.h @@ -4,7 +4,7 @@ /** * @file Barrier.h * - * $Id: Barrier.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Barrier.h 92069 2010-09-28 11:38:59Z johnnyw $ * * Moved from Synch.h. * @@ -156,29 +156,6 @@ private: ACE_Barrier (const ACE_Barrier &); }; -#if 0 -/** - * @class ACE_Process_Barrier - * - * @brief Implements "barrier synchronization" using ACE_Process_Mutexes! - * - * This class is just a simple wrapper for ACE_Barrier that - * selects the USYNC_PROCESS variant for the locks. - */ -class ACE_Export ACE_Process_Barrier : public ACE_Barrier -{ -public: - /// Create a Process_Barrier, passing in the optional @a name. - ACE_Process_Barrier (unsigned int count, const ACE_TCHAR *name = 0); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; -#endif /* 0 */ - /** * @class ACE_Thread_Barrier * diff --git a/dep/ACE_wrappers/ace/Bound_Ptr.inl b/dep/ACE_wrappers/ace/Bound_Ptr.inl index 399a7bc9b..06f03abd8 100644 --- a/dep/ACE_wrappers/ace/Bound_Ptr.inl +++ b/dep/ACE_wrappers/ace/Bound_Ptr.inl @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: Bound_Ptr.inl 82723 2008-09-16 09:35:44Z johnnyw $ +// $Id: Bound_Ptr.inl 91626 2010-09-07 10:59:20Z johnnyw $ // Bound_Ptr.i @@ -67,7 +67,7 @@ ACE_Bound_Ptr_Counter::detach_strong (ACE_Bound_Ptr_Counter* counter->obj_ref_count_ = -1; if (--counter->self_ref_count_ == 0) - // Since counter contains the lock held by the ACE_Guard, the + // Since counter contains the lock held by the guard, the // guard needs to be released before freeing the memory holding // the lock. So save the pointer to free, then release, then // free. @@ -112,7 +112,7 @@ ACE_Bound_Ptr_Counter::detach_weak (ACE_Bound_Ptr_Counter* c ACE_GUARD (ACE_LOCK, guard, counter->lock_); if (--counter->self_ref_count_ == 0) - // Since counter contains the lock held by the ACE_Guard, the + // Since counter contains the lock held by the guard, the // guard needs to be released before freeing the memory holding // the lock. So save the pointer to free, then release, then // free. diff --git a/dep/ACE_wrappers/ace/CDR_Base.cpp b/dep/ACE_wrappers/ace/CDR_Base.cpp index ea1214fa9..0acf651d4 100644 --- a/dep/ACE_wrappers/ace/CDR_Base.cpp +++ b/dep/ACE_wrappers/ace/CDR_Base.cpp @@ -1,4 +1,4 @@ -// $Id: CDR_Base.cpp 91287 2010-08-05 10:30:49Z johnnyw $ +// $Id: CDR_Base.cpp 91685 2010-09-09 09:35:14Z johnnyw $ #include "ace/CDR_Base.h" @@ -774,27 +774,4 @@ ACE_CDR::LongDouble::operator ACE_CDR::LongDouble::NativeImpl () const } #endif /* NONNATIVE_LONGDOUBLE */ -#if defined(_UNICOS) && !defined(_CRAYMPP) -// placeholders to get things compiling -ACE_CDR::Float::Float (void) -{ -} - -ACE_CDR::Float::Float (const float & /* init */) -{ -} - -ACE_CDR::Float & -ACE_CDR::Float::operator= (const float & /* rhs */) -{ - return *this; -} - -bool -ACE_CDR::Float::operator!= (const ACE_CDR::Float & /* rhs */) const -{ - return false; -} -#endif /* _UNICOS */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/CDR_Base.h b/dep/ACE_wrappers/ace/CDR_Base.h index 12b4a4953..66a6d8857 100644 --- a/dep/ACE_wrappers/ace/CDR_Base.h +++ b/dep/ACE_wrappers/ace/CDR_Base.h @@ -4,7 +4,7 @@ /** * @file CDR_Base.h * - * $Id: CDR_Base.h 88488 2010-01-12 14:20:13Z olli $ + * $Id: CDR_Base.h 91685 2010-09-09 09:35:14Z johnnyw $ * * ACE Common Data Representation (CDR) basic types. * @@ -209,7 +209,7 @@ public: # if (defined (_MSC_VER)) || (defined (__BORLANDC__)) typedef __int64 LongLong; -# elif ACE_SIZEOF_LONG == 8 && !defined(_CRAYMPP) +# elif ACE_SIZEOF_LONG == 8 typedef long LongLong; # elif defined(__TANDEM) typedef long long LongLong; @@ -263,12 +263,6 @@ public: # else /* ACE_SIZEOF_INT != 4 */ // Applications will probably have trouble with this. char f[4]; -# if defined(_UNICOS) && !defined(_CRAYMPP) - Float (void); - Float (const float &init); - Float & operator= (const float &rhs); - bool operator!= (const Float &rhs) const; -# endif /* _UNICOS */ # endif /* ACE_SIZEOF_INT != 4 */ }; # endif /* ACE_SIZEOF_FLOAT != 4 */ diff --git a/dep/ACE_wrappers/ace/CDR_Size.cpp b/dep/ACE_wrappers/ace/CDR_Size.cpp index 68fa9d5e9..40ea9d35b 100644 --- a/dep/ACE_wrappers/ace/CDR_Size.cpp +++ b/dep/ACE_wrappers/ace/CDR_Size.cpp @@ -1,4 +1,4 @@ -// $Id: CDR_Size.cpp 91287 2010-08-05 10:30:49Z johnnyw $ +// $Id: CDR_Size.cpp 91813 2010-09-17 07:52:52Z johnnyw $ #include "ace/CDR_Size.h" #include "ace/SString.h" @@ -21,13 +21,13 @@ ACE_SizeCDR::write_wchar (ACE_CDR::WChar x) errno = EACCES; return (this->good_bit_ = false); } - + if (static_cast (major_version_) == 1 && static_cast (minor_version_) == 2) { ACE_CDR::Octet len = static_cast (ACE_OutputCDR::wchar_maxbytes ()); - + if (this->write_1 (&len)) { if (ACE_OutputCDR::wchar_maxbytes () == sizeof(ACE_CDR::WChar)) @@ -63,7 +63,7 @@ ACE_SizeCDR::write_wchar (ACE_CDR::WChar x) errno = EINVAL; return (this->good_bit_ = false); } - + if (ACE_OutputCDR::wchar_maxbytes () == sizeof (ACE_CDR::WChar)) { const void *temp = &x; @@ -74,7 +74,7 @@ ACE_SizeCDR::write_wchar (ACE_CDR::WChar x) ACE_CDR::Short sx = static_cast (x); return this->write_2 (reinterpret_cast (&sx)); } - + ACE_CDR::Octet ox = static_cast (x); return this->write_1 (reinterpret_cast (&ox)); } @@ -136,9 +136,9 @@ ACE_SizeCDR::write_wstring (ACE_CDR::ULong len, this->write_ulong ( ACE_Utils::truncate_cast ( ACE_OutputCDR::wchar_maxbytes () * len)); - + if (good_ulong) - { + { return this->write_wchar_array (x, len); } } diff --git a/dep/ACE_wrappers/ace/CORBA_macros.h b/dep/ACE_wrappers/ace/CORBA_macros.h index ef8050bd1..8233b63cd 100644 --- a/dep/ACE_wrappers/ace/CORBA_macros.h +++ b/dep/ACE_wrappers/ace/CORBA_macros.h @@ -4,7 +4,7 @@ /** * @file CORBA_macros.h * - * $Id: CORBA_macros.h 91285 2010-08-05 08:29:30Z johnnyw $ + * $Id: CORBA_macros.h 91626 2010-09-07 10:59:20Z johnnyw $ * * Writing code that is portable between platforms with or without * native C++ exceptions is hard. The following macros offer some @@ -43,369 +43,6 @@ # define ACE_del_bad_alloc #endif -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - -// If you wish to you use these macros for emulating exceptions on -// platforms which lack native exception support, you need to do the -// following: -// 1. Define a class Exception. You can name it as you please. This class -// should be at the root of the inheritance hierarchy of all the -// exceptions used in your application. It should define at a minimum -// the following pure virtual methods: -// a) _downcast () - Which allows narrowing of the base exception type to a -// derived type. -// b) _raise() - Which throws an exception of type Exception. -// -// Classes which derive from these should implement these operations. -// -// 2. Define a class Environment. You can name it as you please. This class -// is an exception holder. This class is always on the stack. It should -// support at a minimum the following methods: -// a) exception() - Which returns the Exception held in the current -// Environment. -// b) exception (Exception* foo) - Which replaces/sets the Exception -// held in the current Environment with foo. -// b) clear() - Which resets a particular instance of Environment. -// c) A copy constructor and an assignment operator. -// -// Note that the above description assumes that you use the following -// macros only within a particular domain. For example, if your -// application has to interoperate across domains, then you need to define -// an exception adapter to translate exceptions from one domain to -// exceptions in the other. Please refer to Stroustrup's book on how to do -// this. If your use case is this complex, you would be better off with -// going with native exceptions rather than emulated exceptions, though -// the macros should still work if you defined your adapter class as -// ACE_EXCEPTION_TYPE. - - -// The following macros assume that an environment variable is passed -// in/out of each function that can throw an exception. The type of the -// environment variable is defined by ACE_ENV_TYPE. - -#if !defined (ACE_ENV_TYPE) -# define ACE_ENV_TYPE CORBA::Environment -#endif /* ACE_ENV_TYPE */ - -// The name of the variable is defined by ACE_TRY_ENV. Below is the name -// that we use by default. If you wish to change it you can redefine -// ACE_TRY_ENV to change the default name. Also ACE_ADOPT_ENV allows the -// use of non-standard name within a scope. - -#if !defined (ACE_TRY_ENV) -# define ACE_TRY_ENV _ACE_CORBA_Environment_variable -#endif /* ACE_TRY_ENV */ - -// The base type of Exception from which all the other exception types are -// derived. You can set this to any type as you please. By default, it is -// set to CORBA::Exception. - -#if !defined (ACE_EXCEPTION_TYPE) -# define ACE_EXCEPTION_TYPE CORBA::Exception -#endif /* ACE_EXCEPTION_TYPE */ - -// This method is used to get the default value of the Environment -// variable. In the case of TAO, this variable is part of the TSS ORB -// resources and the method TAO_default_environment() returns the -// Environment variable. - -#if !defined (ACE_DEFAULT_GET_ENV_METHOD) -# define ACE_DEFAULT_GET_ENV_METHOD TAO_default_environment -#endif /* ACE_DEFAULT_GET_ENV_METHOD */ - -// This is the exception caught by ACE_CATCHANY. -#if !defined (ACE_ANY_EXCEPTION) -# define ACE_ANY_EXCEPTION ex -#endif /* ACE_ANY_EXCEPTION */ - -// Declare a new environment variable on the stack. The type of the -// environment variable is determined by ACE_ENV_TYPE. -#if defined (ACE_USES_NATIVE_EXCEPTIONS) -// Don't instantiate an emulated exception environment at all when -// using native C++ exception support. It won't be used. -# define ACE_DECLARE_NEW_ENV -#else -# define ACE_DECLARE_NEW_ENV \ - ACE_ENV_TYPE ACE_TRY_ENV -#endif /* ACE_USES_NATIVE_EXCEPTIONS */ - -// Provided for backward compatibility purposes. Don't use it in new code. -// Use the definition above along with defining ACE_ENV_TYPE. - -#if defined (ACE_ENV_POLLUTE_NAMES) -# define ACE_DECLARE_NEW_CORBA_ENV ACE_DECLARE_NEW_ENV -#endif /* ACE_ENV_POLLUTE_NAMES */ - -#if defined (ACE_USES_NATIVE_EXCEPTIONS) -// ----------------------------------------------------------------- - -// Provided for backward compatibility purposes. Don't use it in new code. -#if defined (ACE_ENV_POLLUTE_NAMES) -# define ACE_ADOPT_CORBA_ENV(ENV) -#endif /* ACE_ENV_POLLUTE_NAMES */ - -#define ACE_ADOPT_ENV (ENV) - -// No need to check. Native exceptions handle the control flow -// automatically when an exception occurs. -# define ACE_CHECK - -// Used when the function requires a return value. -# define ACE_CHECK_RETURN(RETV) - -// ACE_THROW_INT should not be used by the user. -# define ACE_THROW_INT(EXCEPTION) \ - throw EXCEPTION - -// Throwing an exception is easy. These two macros should _NOT_ be -// used within try blocks. -# define ACE_THROW(EXCEPTION) \ - throw EXCEPTION - -// Throwing an exception when the function requires a return value. -# define ACE_THROW_RETURN(EXCEPTION,RETV) \ - throw EXCEPTION - -// For compilers with native exceptions, we can simply use try to try. ;-) -// do {} while (0) is required to avoid compilation warnings. -# define ACE_TRY \ - do \ - { \ - try \ - { -# define ACE_TRY_NEW_ENV \ - do \ - { \ - try \ - { -# define ACE_TRY_EX(LABEL) \ - do \ - { \ - try \ - { - -// No need to check for exceptions within try block for compilers with -// native exceptions. -# define ACE_TRY_CHECK -# define ACE_TRY_CHECK_EX(LABEL) - -// Likewise, throwing exceptions within try blocks is easy. -# define ACE_TRY_THROW(EXCEPTION) throw EXCEPTION -# define ACE_TRY_THROW_EX(EXCEPTION,LABEL) throw EXCEPTION - -// Same thing for catch. -# define ACE_CATCH(EXCEPTION,VAR) \ - } \ - catch (EXCEPTION & VAR) \ - { \ - ACE_UNUSED_ARG (VAR); - -# define ACE_CATCHANY \ - ACE_CATCH(ACE_EXCEPTION_TYPE, ACE_ANY_EXCEPTION) - -# define ACE_CATCHALL \ - } \ - catch (...) \ - { - -# if defined (ACE_HAS_DEPRECATED_ACE_RETHROW) -# define ACE_RETHROW throw -# endif /* ACE_HAS_DEPRECATED_ACE_RETHROW */ - -// Rethrowing the exception from catch blocks. -# define ACE_RE_THROW throw -# define ACE_RE_THROW_EX(LABEL) throw - -// Close the catch block. -# define ACE_ENDTRY \ - } \ - } while (0) - -#else /* ! ACE_USES_NATIVE_EXCEPTIONS */ -// ----------------------------------------------------------------- - -// When handling compilers without native exceptions, things get a bit -// hairy. Exceptions are simulated using ACE_ENV_TYPE. The trick here is to -// make sure the flow-of-control can simulate the case when native -// exceptions occur... - -#if defined (ACE_ENV_POLLUTE_NAMES) -# define ACE_ADOPT_CORBA_ENV(ENV) ACE_ENV_TYPE &ACE_TRY_ENV = ENV -#endif /* ACE_ENV_POLLUTE_NAMES */ - -# define ACE_ADOPT_ENV(ENV) ACE_ENV_TYPE &ACE_TRY_ENV = ENV - -// Follow every statement that could throw exceptions with ACE_CHECK or -// ACE_CHECK_RETURN. These two macros should _NOT_ be used within try -// blocks. Use ACE_TRY_CHECK or ACE_TRY_CHECK_EX instead. -# define ACE_CHECK \ - if (ACE_TRY_ENV . exception () != 0) \ - return -// When function requires a return value -# define ACE_CHECK_RETURN(RETV) \ - if (ACE_TRY_ENV . exception () != 0) \ - return RETV - -// ACE_THROW_INT should not be used by the user. -# define ACE_THROW_INT(EXCEPTION) ACE_TRY_ENV.exception (new EXCEPTION) - -// Throwing exceptions will inevitably cause a return from the current -// function. These two macros should _NOT_ be used within try blocks. Use -// ACE_TRY_THROW or ACE_TRY_THROW_EX instead. -# define ACE_THROW(EXCEPTION) \ - do \ - { \ - ACE_TRY_ENV.exception (new EXCEPTION); \ - return; \ - } while (0) - -# define ACE_THROW_RETURN(EXCEPTION,RETV) \ - do \ - { \ - ACE_TRY_ENV.exception (new EXCEPTION); \ - return RETV; \ - } while (0) - -// ACE_TRY sets up flags to control program flow. ACE_TRY_FLAG acts like a -// one-shot flip-flop. When an exception occurs (detected using -// ACE_TRY_CHECK,) ACE_TRY_FLAG will be reset and the control goes back -// into ACE_TRY_LABEL. Since ACE_TRY_FLAG is reset, the try block won't get -// executed again and the control proceeds to the following catch blocks. -// ACE_EXCEPTION_NOT_CAUGHT flag is used to prevent catching an exception -// twice. This macro assumes there's already an ACE_ENV_TYPE variable -// ACE_TRY_ENV defined (which should be the case normally) -# define ACE_TRY \ - do { \ - int ACE_TRY_FLAG = 1; \ - int ACE_EXCEPTION_NOT_CAUGHT = 1; \ - ACE_TRY_LABEL: \ - if (ACE_TRY_FLAG) \ - do { - -// ACE_TRY_NEW_ENV functions like the macro ACE_TRY but defines a new -// ACE_ENV_TYPE variable ACE_TRY_ENV. It is most often used in the outer -// most function where no ACE_TRY_ENV is available. -# define ACE_TRY_NEW_ENV \ - do { \ - ACE_DECLARE_NEW_ENV;\ - int ACE_TRY_FLAG = 1; \ - int ACE_EXCEPTION_NOT_CAUGHT = 1; \ - ACE_TRY_LABEL: \ - if (ACE_TRY_FLAG) \ - do { - -// ACE_TRY_EX works exactly like ACE_TRY macro except the label used in the -// try block is customizable to avoid name clashing. It should be used when -// nested try blocks or multiple try blocks are required, in the same -// function. -# define ACE_TRY_EX(LABEL) \ - do { \ - int ACE_TRY_FLAG = 1; \ - int ACE_EXCEPTION_NOT_CAUGHT = 1; \ - ACE_TRY_LABEL ## LABEL: \ - if (ACE_TRY_FLAG) \ - do { - -// Check for exceptions within try blocks. -# define ACE_TRY_CHECK \ - { \ - if (ACE_TRY_ENV.exception () != 0) \ - { \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL; \ - } \ - } - -// Checking exception within EX try blocks. -# define ACE_TRY_CHECK_EX(LABEL) \ - { \ - if (ACE_TRY_ENV.exception () != 0) \ - { \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL ## LABEL; \ - } \ - } - -// Throwing exception within TRY blocks. -# define ACE_TRY_THROW(EXCEPTION) \ - { \ - ACE_TRY_ENV.exception (new EXCEPTION); \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL; \ - } - -# define ACE_TRY_THROW_EX(EXCEPTION,LABEL) \ - { \ - ACE_TRY_ENV.exception (new EXCEPTION); \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL ## LABEL; \ - } - -// When exceptions occur or try block finishes execution without exception, -// control will continue in the catch block. This macro first checks if -// there's any uncaught exception left. If all the conditions are met, we -// have caught an exception. It then resets ACE_EXCEPTION_NOT_CAUGHT to -// prevent subsequent catch blocks from catching the same exception again, -// and extracts out the underlying exception in ACE_TRY_ENV. We also make a -// copy of ACE_TRY_ENV in ACE_CAUGHT_ENV, in case we want to rethrow the -// exception. ACE_TRY_ENV is cleared out after the exception is caught so -// you should not use ACE_TRY_ENV within the catch block(You should use the -// exception directly). -# define ACE_CATCH(TYPE,VAR) \ - } while (0); \ - do \ - if (ACE_TRY_ENV.exception () != 0 && ACE_EXCEPTION_NOT_CAUGHT && \ - TYPE::_downcast(ACE_TRY_ENV.exception ()) != 0) \ - { \ - ACE_ENV_TYPE ACE_CAUGHT_ENV = ACE_TRY_ENV;\ - ACE_EXCEPTION_NOT_CAUGHT = 0; \ - TYPE &VAR = *TYPE::_downcast (ACE_CAUGHT_ENV.exception ()); \ - ACE_UNUSED_ARG (VAR); \ - ACE_TRY_ENV.clear (); - -// ACE_CATCHANY uses ACE_CATCH to catch all exceptions derived from -// ACE_EXCEPTION_TYPE -# define ACE_CATCHANY ACE_CATCH (ACE_EXCEPTION_TYPE, ACE_ANY_EXCEPTION) - -// Since there's no other exception for compilers without exception -// support, we simply catch all ACE_EXCEPTION_TYPE exceptions for -// ACE_CATCHALL. -# define ACE_CATCHALL ACE_CATCHANY - -# if defined (ACE_HAS_DEPRECATED_ACE_RETHROW) -# define ACE_RETHROW \ - do \ - ACE_TRY_ENV = ACE_CAUGHT_ENV; \ - while (0) -# endif /* ACE_HAS_DEPRECATED_ACE_RETHROW */ - -// Rethrowing exception within catch blocks. Notice that we depend on the -// ACE_CHECK/ACE_CHECK_RETURN following the ACE_ENDTRY, or ACE_TRY_CHECK/ -// ACE_TRY_CHECK_EX following the ACE_ENDTRY when the catch block is within -// another try block, to do the "Right Thing[TM]." -# define ACE_RE_THROW \ - do {\ - ACE_TRY_ENV = ACE_CAUGHT_ENV; \ - goto ACE_TRY_LABEL; \ - } while (0) -# define ACE_RE_THROW_EX(LABEL) \ - do {\ - ACE_TRY_ENV = ACE_CAUGHT_ENV; \ - goto ACE_TRY_LABEL ## LABEL; \ - } while (0) - -// Close the try block. Since exceptions may not get caught, and exceptions -// can also be rethrown from the catch block, it's always a good idea to -// follow ACE_ENDTRY with ACE_CHECK or ACE_TRY_CHECK (depending on the -// context.) -# define ACE_ENDTRY \ - } while (0); \ - } while (0) - -#endif /* ! ACE_USES_NATIVE_EXCEPTIONS */ - -#endif /* !ACE_LACKS_DEPRECATED_MACROS */ - // ACE_HAS_EXCEPTIONS is not the same as ACE_NEW_THROWS_EXCEPTIONS. #if defined(ACE_NEW_THROWS_EXCEPTIONS) @@ -434,6 +71,7 @@ #endif /* ACE_NEW_THROWS_EXCEPTIONS */ +// FUZZ: disable check_for_ACE_Guard # define ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \ ACE_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) throw EXCEPTION; @@ -445,6 +83,7 @@ # define ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \ ACE_Write_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) throw EXCEPTION; +// FUZZ: enable check_for_ACE_Guard #include /**/ "ace/post.h" diff --git a/dep/ACE_wrappers/ace/Cache_Map_Manager_T.cpp b/dep/ACE_wrappers/ace/Cache_Map_Manager_T.cpp index f87031eb0..4fb5b93ca 100644 --- a/dep/ACE_wrappers/ace/Cache_Map_Manager_T.cpp +++ b/dep/ACE_wrappers/ace/Cache_Map_Manager_T.cpp @@ -1,4 +1,4 @@ -// $Id: Cache_Map_Manager_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Cache_Map_Manager_T.cpp 92097 2010-09-30 05:41:49Z msmit $ #ifndef ACE_CACHE_MAP_MANAGER_T_CPP #define ACE_CACHE_MAP_MANAGER_T_CPP @@ -77,7 +77,7 @@ ACE_Cache_Map_Manager::bind (const KEY &key, { int result = this->caching_strategy_.notify_bind (bind_result, - cache_value.second ()); + cache_value.second); if (result == -1) { @@ -285,7 +285,7 @@ ACE_Cache_Map_Manager::find (const KEY &key, { int result = this->caching_strategy_.notify_find (find_result, - cache_value.second ()); + cache_value.second); // Unless the find and notification operations go thru, this // method is not successful. @@ -301,7 +301,7 @@ ACE_Cache_Map_Manager::find (const KEY &key, if (rebind_result == -1) find_result = -1; else - value = cache_value.first (); + value = cache_value.first; } @@ -361,7 +361,7 @@ ACE_Cache_Map_Manager::unbind (const KEY &key) { int result = this->caching_strategy_.notify_unbind (unbind_result, - cache_value.second ()); + cache_value.second); if (result == -1) unbind_result = -1; diff --git a/dep/ACE_wrappers/ace/Cache_Map_Manager_T.h b/dep/ACE_wrappers/ace/Cache_Map_Manager_T.h index 060a8b38a..3f11d92fd 100644 --- a/dep/ACE_wrappers/ace/Cache_Map_Manager_T.h +++ b/dep/ACE_wrappers/ace/Cache_Map_Manager_T.h @@ -4,7 +4,7 @@ /** * @file Cache_Map_Manager_T.h * - * $Id: Cache_Map_Manager_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Cache_Map_Manager_T.h 92097 2010-09-30 05:41:49Z msmit $ * * @author Kirthika Parameswaran */ @@ -91,7 +91,7 @@ public: * are used by the strategy and is transparent to the user of this * class. */ - typedef ACE_Pair CACHE_VALUE; + typedef std::pair CACHE_VALUE; // = Initialization and termination methods. @@ -251,10 +251,10 @@ public: // = Traits. /// The actual value mapped to the key in the cache. The - /// are used by the strategy and is transperant to the cache user. + /// are used by the strategy and is transparent to the cache user. typedef ACE_Reference_Pair value_type; - typedef ACE_Pair + typedef std::pair CACHE_VALUE; // = Initialisation and termination methods. @@ -274,7 +274,7 @@ public: (const ACE_Cache_Map_Iterator &rhs); - /// Comparision operators. + /// Comparison operators. bool operator== (const ACE_Cache_Map_Iterator &rhs) const; bool operator!= (const ACE_Cache_Map_Iterator &rhs) const; @@ -327,9 +327,9 @@ public: // = Traits. /// The actual value mapped to the key in the cache. The - /// are used by the strategy and is transperant to the cache user. + /// are used by the strategy and is transparent to the cache user. typedef ACE_Reference_Pair value_type; - typedef ACE_Pair CACHE_VALUE; + typedef std::pair CACHE_VALUE; // = Initialisation and termination methods. @@ -348,7 +348,7 @@ public: (const ACE_Cache_Map_Reverse_Iterator &rhs); - /// Comparision operators. + /// Comparison operators. bool operator== (const ACE_Cache_Map_Reverse_Iterator &rhs) const; bool operator!= (const ACE_Cache_Map_Reverse_Iterator &rhs) const; diff --git a/dep/ACE_wrappers/ace/Cache_Map_Manager_T.inl b/dep/ACE_wrappers/ace/Cache_Map_Manager_T.inl index bcd48bd33..06378de04 100644 --- a/dep/ACE_wrappers/ace/Cache_Map_Manager_T.inl +++ b/dep/ACE_wrappers/ace/Cache_Map_Manager_T.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -//$Id: Cache_Map_Manager_T.inl 80826 2008-03-04 14:51:23Z wotte $ +//$Id: Cache_Map_Manager_T.inl 92097 2010-09-30 05:41:49Z msmit $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -89,7 +89,7 @@ template ::operator* (void) const { value_type retn ((*this->iterator_implementation_).ext_id_, - (*this->iterator_implementation_).int_id_.first ()); + (*this->iterator_implementation_).int_id_.first); return retn; } @@ -183,7 +183,7 @@ template ::operator* (void) const { value_type retv ((*this->reverse_iterator_implementation_).ext_id_, - (*this->reverse_iterator_implementation_).int_id_.first ()); + (*this->reverse_iterator_implementation_).int_id_.first); return retv; } diff --git a/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.cpp b/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.cpp index 077c6d6a9..738155a57 100644 --- a/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.cpp +++ b/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.cpp @@ -1,4 +1,4 @@ -//$Id: Cached_Connect_Strategy_T.cpp 82771 2008-09-17 18:47:48Z johnnyw $ +//$Id: Cached_Connect_Strategy_T.cpp 92097 2010-09-30 05:41:49Z msmit $ #ifndef ACE_CACHED_CONNECT_STRATEGY_T_CPP #define ACE_CACHED_CONNECT_STRATEGY_T_CPP @@ -14,7 +14,6 @@ #include "ace/Service_Types.h" #include "ace/Thread_Manager.h" #include "ace/WFMO_Reactor.h" -#include "ace/Pair_T.h" #define ACE_T1 class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX #define ACE_T2 SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX @@ -54,7 +53,7 @@ ACE_Cached_Connect_Strategy_Ex::check_hint_i bool reuse_addr, int flags, int perms, - ACE_Hash_Map_Entry, ACE_Pair > *&entry, + ACE_Hash_Map_Entry, std::pair > *&entry, int &found) { ACE_UNUSED_ARG (remote_addr); @@ -77,8 +76,8 @@ ACE_Cached_Connect_Strategy_Ex::check_hint_i if (possible_entry->ext_id_.decrement () == 0) { // If refcount goes to zero, close down the svc_handler - possible_entry->int_id_.first ()->recycler (0, 0); - possible_entry->int_id_.first ()->close (); + possible_entry->int_id_.first->recycler (0, 0); + possible_entry->int_id_.first->close (); this->purge_i (possible_entry); } @@ -111,7 +110,7 @@ ACE_Cached_Connect_Strategy_Ex::check_hint_i int find_result = 0; int result = this->caching_strategy ().notify_find (find_result, - possible_entry->int_id_.second ()); + possible_entry->int_id_.second); if (result == -1) return result; @@ -144,7 +143,7 @@ ACE_Cached_Connect_Strategy_Ex::find_or_create_svc_handler_i bool reuse_addr, int flags, int perms, - ACE_Hash_Map_Entry, ACE_Pair > *&entry, + ACE_Hash_Map_Entry, std::pair > *&entry, int &found) { REFCOUNTED_HASH_RECYCLABLE_ADDRESS search_addr (remote_addr); @@ -155,7 +154,7 @@ ACE_Cached_Connect_Strategy_Ex::find_or_create_svc_handler_i { // We found a cached svc_handler. // Get the cached - sh = entry->int_id_.first (); + sh = entry->int_id_.first; // Is the connection clean? int state_result = @@ -450,8 +449,8 @@ ACE_Cached_Connect_Strategy_Ex::cleanup_hint_i (const void *recycling_ac if (entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED && refcount == 0) { - entry->int_id_.first ()->recycler (0, 0); - entry->int_id_.first ()->close (); + entry->int_id_.first->recycler (0, 0); + entry->int_id_.first->close (); this->purge_i (entry); } @@ -472,10 +471,10 @@ ACE_Cached_Connect_Strategy_Ex::caching_strategy (void) template int ACE_Cached_Connect_Strategy_Ex::find (ACE_Refcounted_Hash_Recyclable &search_addr, - ACE_Hash_Map_Entry, ACE_Pair > *&entry) + ACE_Hash_Map_Entry, std::pair > *&entry) { typedef ACE_Hash_Map_Bucket_Iterator, + std::pair, ACE_Hash, ACE_Equal_To, ACE_Null_Mutex> @@ -512,7 +511,7 @@ ACE_Cached_Connect_Strategy_Ex::find (ACE_Refcounted_Hash_Recyclablecaching_strategy ().notify_find (find_result, - entry->int_id_.second ()); + entry->int_id_.second); if (result == -1) return result; @@ -591,7 +590,7 @@ ACE_Bounded_Cached_Connect_Strategy::find_or_create_svc_handler_i int flags, int perms, ACE_Hash_Map_Entry, - ACE_Pair > *&entry, + std::pair > *&entry, int &found) { diff --git a/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.h b/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.h index e95218f60..12c5485ce 100644 --- a/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.h +++ b/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.h @@ -4,7 +4,7 @@ /** * @file Cached_Connect_Strategy_T.h * - * $Id: Cached_Connect_Strategy_T.h 91077 2010-07-13 14:33:08Z johnnyw $ + * $Id: Cached_Connect_Strategy_T.h 92097 2010-09-30 05:41:49Z msmit $ * * @author Kirthika Parameswaran */ @@ -90,9 +90,9 @@ public: typedef typename CONNECTION_CACHE::mapped_type VALUE; typedef ACE_Recyclable_Handler_Cleanup_Strategy, + std::pair, ACE_Hash_Map_Manager_Ex, + std::pair, ACE_Hash, ACE_Equal_To, MUTEX> > @@ -108,7 +108,7 @@ protected: /// Find an idle handle. int find (ACE_Refcounted_Hash_Recyclable &search_addr, - ACE_Hash_Map_Entry, ACE_Pair > *&entry); + ACE_Hash_Map_Entry, std::pair > *&entry); /// Remove from cache (non-locking version). virtual int purge_i (const void *recycling_act); @@ -133,7 +133,7 @@ protected: bool reuse_addr, int flags, int perms, - ACE_Hash_Map_Entry, ACE_Pair > *&entry, + ACE_Hash_Map_Entry, std::pair > *&entry, int &found); virtual int find_or_create_svc_handler_i (SVC_HANDLER *&sh, @@ -143,7 +143,7 @@ protected: bool reuse_addr, int flags, int perms, - ACE_Hash_Map_Entry, ACE_Pair > *&entry, + ACE_Hash_Map_Entry, std::pair > *&entry, int &found); virtual int connect_svc_handler_i (SVC_HANDLER *&sh, @@ -240,7 +240,7 @@ protected: int flags, int perms, ACE_Hash_Map_Entry, - ACE_Pair > *&entry, + std::pair > *&entry, int &found); protected: diff --git a/dep/ACE_wrappers/ace/Caching_Strategies_T.h b/dep/ACE_wrappers/ace/Caching_Strategies_T.h index e4b0817aa..48f5e898e 100644 --- a/dep/ACE_wrappers/ace/Caching_Strategies_T.h +++ b/dep/ACE_wrappers/ace/Caching_Strategies_T.h @@ -4,7 +4,7 @@ /** * @file Caching_Strategies_T.h * - * $Id: Caching_Strategies_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Caching_Strategies_T.h 92097 2010-09-30 05:41:49Z msmit $ * * @author Kirthika Parameswaran */ @@ -191,7 +191,7 @@ private: * The ATTRIBUTES are the deciding factor for purging of entries * and should logically be included with the VALUE. Some ways of * doing this are: As being a member of the VALUE or VALUE being - * ACE_Pair. The CACHING_UTILITY is the + * std::pair. The CACHING_UTILITY is the * class which can be plugged in and which decides the entries * to purge. */ @@ -291,7 +291,7 @@ private: * The ATTRIBUTES are the deciding factor for purging of entries * and should logically be included with the VALUE. Some ways of * doing this are: As being a member of the VALUE or VALUE being - * ACE_Pair. The CACHING_UTILITY is the + * std::pair. The CACHING_UTILITY is the * class which can be plugged in and which decides the entries * to purge. */ @@ -384,7 +384,7 @@ private: * The ATTRIBUTES are the deciding factor for purging of entries * and should logically be included with the VALUE. Some ways of * doing this are: As being a member of the VALUE or VALUE being - * ACE_Pair. The CACHING_UTILITY is the + * std::pair. The CACHING_UTILITY is the * class which can be plugged in and which decides the entries * to purge. */ diff --git a/dep/ACE_wrappers/ace/Caching_Utility_T.cpp b/dep/ACE_wrappers/ace/Caching_Utility_T.cpp index a03a45758..4713c974b 100644 --- a/dep/ACE_wrappers/ace/Caching_Utility_T.cpp +++ b/dep/ACE_wrappers/ace/Caching_Utility_T.cpp @@ -1,4 +1,4 @@ -// $Id: Caching_Utility_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Caching_Utility_T.cpp 92264 2010-10-19 18:12:46Z olli $ #ifndef ACE_CACHING_UTILITY_T_CPP #define ACE_CACHING_UTILITY_T_CPP @@ -9,6 +9,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/ACE.h" #include "ace/Min_Max.h" #include "ace/OS_Memory.h" #include "ace/Recyclable.h" @@ -19,7 +20,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template ACE_Pair_Caching_Utility::ACE_Pair_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy, - int delete_cleanup_strategy) + bool delete_cleanup_strategy) : cleanup_strategy_ (cleanup_strategy), delete_cleanup_strategy_ (delete_cleanup_strategy) { @@ -27,7 +28,7 @@ ACE_Pair_Caching_Utility::ACE_Pair_ { ACE_NEW (this->cleanup_strategy_, CLEANUP_STRATEGY); - this->delete_cleanup_strategy_ = 1; + this->delete_cleanup_strategy_ = true; } } @@ -43,7 +44,7 @@ ACE_Pair_Caching_Utility::clear_cac double purge_percent) { // Check that the purge_percent is non-zero. - if (purge_percent == 0) + if (ACE::is_equal (purge_percent, 0.0)) return 0; // Get the number of entries in the container. @@ -94,7 +95,7 @@ ACE_Pair_Caching_Utility::minimum ( // Starting values. ITERATOR iter = container.begin (); ITERATOR end = container.end (); - ATTRIBUTES min = (*iter).int_id_.second (); + ATTRIBUTES min = (*iter).int_id_.second; key_to_remove = &(*iter).ext_id_; value_to_remove = &(*iter).int_id_; @@ -104,10 +105,10 @@ ACE_Pair_Caching_Utility::minimum ( iter != end; ++iter) { - if (min > (*iter).int_id_.second ()) + if (min > (*iter).int_id_.second) { // Ah! an item with lower ATTTRIBUTES... - min = (*iter).int_id_.second (); + min = (*iter).int_id_.second; key_to_remove = &(*iter).ext_id_; value_to_remove = &(*iter).int_id_; } @@ -118,7 +119,7 @@ ACE_Pair_Caching_Utility::minimum ( template ACE_Recyclable_Handler_Caching_Utility::ACE_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy, - int delete_cleanup_strategy) + bool delete_cleanup_strategy) : cleanup_strategy_ (cleanup_strategy), delete_cleanup_strategy_ (delete_cleanup_strategy) { @@ -126,7 +127,7 @@ ACE_Recyclable_Handler_Caching_Utilitycleanup_strategy_, CLEANUP_STRATEGY); - this->delete_cleanup_strategy_ = 1; + this->delete_cleanup_strategy_ = true; } } @@ -142,7 +143,7 @@ ACE_Recyclable_Handler_Caching_Utility (*iter).int_id_.second ()) + if (min > (*iter).int_id_.second) { - min = (*iter).int_id_.second (); + min = (*iter).int_id_.second; key_to_remove = &(*iter).ext_id_; value_to_remove = &(*iter).int_id_; } @@ -237,7 +238,7 @@ ACE_Recyclable_Handler_Caching_Utility ACE_Refcounted_Recyclable_Handler_Caching_Utility::ACE_Refcounted_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy, - int delete_cleanup_strategy) + bool delete_cleanup_strategy) : cleanup_strategy_ (cleanup_strategy), delete_cleanup_strategy_ (delete_cleanup_strategy), marked_as_closed_entries_ (0) @@ -246,7 +247,7 @@ ACE_Refcounted_Recyclable_Handler_Caching_Utilitycleanup_strategy_, CLEANUP_STRATEGY); - this->delete_cleanup_strategy_ = 1; + this->delete_cleanup_strategy_ = true; } } @@ -262,7 +263,7 @@ ACE_Refcounted_Recyclable_Handler_Caching_Utility ACE_Handler_Caching_Utility::ACE_Handler_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy, - int delete_cleanup_strategy) + bool delete_cleanup_strategy) : cleanup_strategy_ (cleanup_strategy), delete_cleanup_strategy_ (delete_cleanup_strategy) { @@ -370,7 +371,7 @@ ACE_Handler_Caching_Utility::ACE_Ha { ACE_NEW (this->cleanup_strategy_, CLEANUP_STRATEGY); - this->delete_cleanup_strategy_ = 1; + this->delete_cleanup_strategy_ = true; } } @@ -386,7 +387,7 @@ ACE_Handler_Caching_Utility::clear_ double purge_percent) { // Check that the purge_percent is non-zero. - if (purge_percent == 0) + if (ACE::is_equal (purge_percent, 0.0)) return 0; // Get the number of entries in the container. @@ -455,7 +456,7 @@ ACE_Handler_Caching_Utility::minimu template ACE_Null_Caching_Utility::ACE_Null_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy, - int delete_cleanup_strategy) + bool delete_cleanup_strategy) : cleanup_strategy_ (cleanup_strategy), delete_cleanup_strategy_ (delete_cleanup_strategy) { @@ -463,7 +464,7 @@ ACE_Null_Caching_Utility::ACE_Null_ { ACE_NEW (this->cleanup_strategy_, CLEANUP_STRATEGY); - this->delete_cleanup_strategy_ = 1; + this->delete_cleanup_strategy_ = true; } } diff --git a/dep/ACE_wrappers/ace/Caching_Utility_T.h b/dep/ACE_wrappers/ace/Caching_Utility_T.h index 5428682d0..9340d73ac 100644 --- a/dep/ACE_wrappers/ace/Caching_Utility_T.h +++ b/dep/ACE_wrappers/ace/Caching_Utility_T.h @@ -4,7 +4,7 @@ /** * @file Caching_Utility_T.h * - * $Id: Caching_Utility_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Caching_Utility_T.h 92085 2010-09-29 12:23:13Z johnnyw $ * * @author Kirthika Parameswaran */ @@ -23,9 +23,7 @@ #include "ace/Global_Macros.h" #include "ace/Cleanup_Strategies_T.h" - -// For linkers that cant grok long names. -#define ACE_Pair_Caching_Utility APUTIL +#include "ace/Copy_Disabled.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -44,7 +42,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * entries to be cleaned up will be delegated. */ template -class ACE_Pair_Caching_Utility +class ACE_Pair_Caching_Utility : private ACE_Copy_Disabled { public: @@ -52,7 +50,7 @@ public: /// Constructor. ACE_Pair_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy = 0, - int delete_cleanup_strategy = 0); + bool delete_cleanup_strategy = false); /// Destructor. ~ACE_Pair_Caching_Utility (void); @@ -61,8 +59,7 @@ public: * Purge entries from the @a container. The Cleanup_Strategy will do the * actual job of cleanup once the entries to be cleaned up are decided. */ - int clear_cache (CONTAINER &container, - double purge_percent); + int clear_cache (CONTAINER &container, double purge_percent); protected: @@ -76,15 +73,9 @@ protected: CLEANUP_STRATEGY *cleanup_strategy_; /// Whether the cleanup_strategy should be destroyed or not. - int delete_cleanup_strategy_; - - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Pair_Caching_Utility &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Pair_Caching_Utility (const ACE_Pair_Caching_Utility &)) + bool delete_cleanup_strategy_; }; -//////////////////////////////////////////////////////////////////////////////// -#define ACE_Recyclable_Handler_Caching_Utility ARHUTIL - /** * @class ACE_Recyclable_Handler_Caching_Utility * @@ -100,7 +91,7 @@ protected: * be cleaned up will be delegated. */ template -class ACE_Recyclable_Handler_Caching_Utility +class ACE_Recyclable_Handler_Caching_Utility : private ACE_Copy_Disabled { public: @@ -110,7 +101,7 @@ public: /// Constructor. ACE_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy = 0, - int delete_cleanup_strategy = 0); + bool delete_cleanup_strategy = false); /// Destructor. ~ACE_Recyclable_Handler_Caching_Utility (void); @@ -134,16 +125,9 @@ protected: CLEANUP_STRATEGY_BASE *cleanup_strategy_; /// Whether the cleanup_strategy should be destroyed or not. - int delete_cleanup_strategy_; - -private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Recyclable_Handler_Caching_Utility &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Recyclable_Handler_Caching_Utility (const ACE_Recyclable_Handler_Caching_Utility &)) + bool delete_cleanup_strategy_; }; -/////////////////////////////////////////////////////////////////////////// -#define ACE_Refcounted_Recyclable_Handler_Caching_Utility ARRHUTIL - /** * @class ACE_Refcounted_Recyclable_Handler_Caching_Utility * @@ -160,17 +144,15 @@ private: * delegated. */ template -class ACE_Refcounted_Recyclable_Handler_Caching_Utility +class ACE_Refcounted_Recyclable_Handler_Caching_Utility : private ACE_Copy_Disabled { - public: - typedef ACE_Refcounted_Recyclable_Handler_Cleanup_Strategy CLEANUP_STRATEGY; typedef ACE_Cleanup_Strategy CLEANUP_STRATEGY_BASE; /// Constructor. ACE_Refcounted_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy = 0, - int delete_cleanup_strategy = 0); + bool delete_cleanup_strategy = false); /// Destructor. ~ACE_Refcounted_Recyclable_Handler_Caching_Utility (void); @@ -194,7 +176,7 @@ protected: CLEANUP_STRATEGY_BASE *cleanup_strategy_; /// Whether the cleanup_strategy should be destroyed or not. - int delete_cleanup_strategy_; + bool delete_cleanup_strategy_; /** * This figure denotes the number of entries are there in the @@ -202,14 +184,8 @@ protected: * not have been unbound from the container. */ size_t marked_as_closed_entries_; - -private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Refcounted_Recyclable_Handler_Caching_Utility &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Refcounted_Recyclable_Handler_Caching_Utility (const ACE_Refcounted_Recyclable_Handler_Caching_Utility &)) }; -//////////////////////////////////////////////////////////////////////////////////////// - /** * @class ACE_Handler_Caching_Utility * @@ -225,7 +201,7 @@ private: * class to which the entries to be cleaned up will be delegated. */ template -class ACE_Handler_Caching_Utility +class ACE_Handler_Caching_Utility : private ACE_Copy_Disabled { public: @@ -234,7 +210,7 @@ public: /// Constructor. ACE_Handler_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy = 0, - int delete_cleanup_strategy = 0); + bool delete_cleanup_strategy = false); /// Destructor. ~ACE_Handler_Caching_Utility (void); @@ -264,15 +240,9 @@ protected: CLEANUP_STRATEGY_BASE *cleanup_strategy_; /// Whether the cleanup_strategy should be destroyed or not. - int delete_cleanup_strategy_; - -private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Handler_Caching_Utility &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Handler_Caching_Utility (const ACE_Handler_Caching_Utility &)) + bool delete_cleanup_strategy_; }; -/////////////////////////////////////////////////////////////////////////// -#define ACE_Null_Caching_Utility ANUTIL /** * @class ACE_Null_Caching_Utility * @@ -286,7 +256,7 @@ private: * be cleaned up will be delegated. */ template -class ACE_Null_Caching_Utility +class ACE_Null_Caching_Utility : private ACE_Copy_Disabled { public: @@ -295,7 +265,7 @@ public: /// Constructor. ACE_Null_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy = 0, - int delete_cleanup_strategy = 0); + bool delete_cleanup_strategy = false); /// Destructor. ~ACE_Null_Caching_Utility (void); @@ -325,11 +295,7 @@ protected: CLEANUP_STRATEGY_BASE *cleanup_strategy_; /// Whether the cleanup_strategy should be destroyed or not. - int delete_cleanup_strategy_; - -private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Null_Caching_Utility &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Null_Caching_Utility (const ACE_Null_Caching_Utility &)) + bool delete_cleanup_strategy_; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Cleanup_Strategies_T.cpp b/dep/ACE_wrappers/ace/Cleanup_Strategies_T.cpp index 329659937..7ce542e28 100644 --- a/dep/ACE_wrappers/ace/Cleanup_Strategies_T.cpp +++ b/dep/ACE_wrappers/ace/Cleanup_Strategies_T.cpp @@ -1,4 +1,4 @@ -//$Id: Cleanup_Strategies_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +//$Id: Cleanup_Strategies_T.cpp 92097 2010-09-30 05:41:49Z msmit $ #ifndef ACE_CLEANUP_STRATEGIES_T_CPP #define ACE_CLEANUP_STRATEGIES_T_CPP @@ -39,9 +39,9 @@ ACE_Recyclable_Handler_Cleanup_Strategy::cleanup ( if (container.unbind (*key, value) == -1) return -1; - value.first ()->recycler (0, 0); + value.first->recycler (0, 0); - value.first ()->close (); + value.first->close (); return 0; } diff --git a/dep/ACE_wrappers/ace/Codecs.cpp b/dep/ACE_wrappers/ace/Codecs.cpp index d205ab826..f7107114a 100644 --- a/dep/ACE_wrappers/ace/Codecs.cpp +++ b/dep/ACE_wrappers/ace/Codecs.cpp @@ -1,4 +1,4 @@ -// $Id: Codecs.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ +// $Id: Codecs.cpp 91813 2010-09-17 07:52:52Z johnnyw $ #include "ace/Codecs.h" #include "ace/Log_Msg.h" @@ -69,7 +69,7 @@ ACE_Base64::encode (const ACE_Byte* input, result[pos++] = alphabet[bits & 0x3f]; cols += 4; if (cols == max_columns) { - if (is_chunked) + if (is_chunked) result[pos++] = '\n'; cols = 0; } diff --git a/dep/ACE_wrappers/ace/Condition_Thread_Mutex.h b/dep/ACE_wrappers/ace/Condition_Thread_Mutex.h index 693ff0820..1ba866d2e 100644 --- a/dep/ACE_wrappers/ace/Condition_Thread_Mutex.h +++ b/dep/ACE_wrappers/ace/Condition_Thread_Mutex.h @@ -4,7 +4,7 @@ /** * @file Condition_Thread_Mutex.h * - * $Id: Condition_Thread_Mutex.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Condition_Thread_Mutex.h 92069 2010-09-28 11:38:59Z johnnyw $ * * Moved from Synch.h. * @@ -154,30 +154,6 @@ private: ACE_Condition_Thread_Mutex (const ACE_Condition_Thread_Mutex &); }; -#if 0 -// The following class is commented out since there doesn't -// appear to be a portable and robust means of implementing this -// functionality across platforms. If you know of a portable and -// robust way to implement this functionality please let us know. - -/** - * @class ACE_Process_Condition - * - * @brief ACE_Condition variable wrapper that works across processes. - */ -class ACE_Export ACE_Process_Condition -{ -public: - ACE_Process_Condition (MUTEX &m, const ACE_TCHAR *name = 0, void *arg = 0); - - /// Dump the state of an object. - void dump (void) const; - - // ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. -}; -#endif /* 0 */ - ACE_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/dep/ACE_wrappers/ace/Condition_Thread_Mutex.inl b/dep/ACE_wrappers/ace/Condition_Thread_Mutex.inl index 851269e4a..712a8be02 100644 --- a/dep/ACE_wrappers/ace/Condition_Thread_Mutex.inl +++ b/dep/ACE_wrappers/ace/Condition_Thread_Mutex.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Condition_Thread_Mutex.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Condition_Thread_Mutex.inl 92069 2010-09-28 11:38:59Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -50,25 +50,4 @@ ACE_Condition_Thread_Mutex::mutex (void) return this->mutex_; } -#if 0 -template void -ACE_Process_Condition::dump (void) const -{ -#if defined (ACE_HAS_DUMP) -// ACE_TRACE ("ACE_Process_Condition::dump"); - - ACE_Condition::dump (); -#endif /* ACE_HAS_DUMP */ -} - -template -ACE_Process_Condition::ACE_Process_Condition (MUTEX &m, - const ACE_TCHAR *name, - void *arg) - : ACE_Condition (m, USYNC_PROCESS, name, arg) -{ -// ACE_TRACE ("ACE_Process_Condition::ACE_Process_Condition"); -} -#endif /* 0 */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Configuration.cpp b/dep/ACE_wrappers/ace/Configuration.cpp index 1914f2dc6..4e0a1749e 100644 --- a/dep/ACE_wrappers/ace/Configuration.cpp +++ b/dep/ACE_wrappers/ace/Configuration.cpp @@ -1,4 +1,4 @@ -// $Id: Configuration.cpp 86348 2009-08-04 14:45:29Z shuston $ +// $Id: Configuration.cpp 91688 2010-09-09 11:21:50Z johnnyw $ #include "ace/Configuration.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" @@ -6,10 +6,6 @@ #include "ace/OS_NS_strings.h" #include "ace/Tokenizer_T.h" -// Can remove this when import_config and export_config are removed from -// ACE_Configuration. They're deprecated at ACE 5.2. -#include "ace/Configuration_Import_Export.h" - #if !defined (ACE_LACKS_ACCESS) # include "ace/OS_NS_unistd.h" #endif /* ACE_LACKS_ACCESS */ @@ -135,22 +131,6 @@ ACE_Configuration::expand_path (const ACE_Configuration_Section_Key& key, } -// import_config and export_config are here for backward compatibility, -// and have been deprecated. -int -ACE_Configuration::export_config (const ACE_TCHAR* filename) -{ - ACE_Registry_ImpExp exporter (*this); - return exporter.export_config (filename); -} - -int -ACE_Configuration::import_config (const ACE_TCHAR* filename) -{ - ACE_Registry_ImpExp importer (*this); - return importer.import_config (filename); -} - int ACE_Configuration::validate_name (const ACE_TCHAR* name, int allow_path) { diff --git a/dep/ACE_wrappers/ace/Configuration.h b/dep/ACE_wrappers/ace/Configuration.h index 354361901..4c931e6ab 100644 --- a/dep/ACE_wrappers/ace/Configuration.h +++ b/dep/ACE_wrappers/ace/Configuration.h @@ -4,7 +4,7 @@ /** * @file Configuration.h * - * $Id: Configuration.h 86348 2009-08-04 14:45:29Z shuston $ + * $Id: Configuration.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Chris Hafey * @@ -359,22 +359,6 @@ public: ACE_Configuration_Section_Key& key_out, int create = 1); - /** - * @deprecated Exports the configuration database to filename. - * If @a filename is already present, it is overwritten. This function is - * deprecated and will be removed in a future version of ACE. Please use - * either ACE_Registry_ImpExp or ACE_Ini_ImpExp instead. - */ - int export_config (const ACE_TCHAR* filename); - - /** - * @deprecated Imports the configuration database from filename. Any - * existing data is not removed. This function is deprecated and will be - * removed in a future version of ACE. Please use ACE_Registry_ImpExp - * or ACE_Ini_ImpExp instead. - */ - int import_config (const ACE_TCHAR* filename); - /** * Determine if the contents of this object is the same as the * contents of the object on the right hand side. @@ -619,9 +603,6 @@ typedef ACE_Hash_Map_Manager_Ex SUBSECTION_HASH; -/// @deprecated Deprecated typedef. Use the SUBSECTION_HASH::ENTRY trait instead. -typedef SUBSECTION_HASH::ENTRY SUBSECTION_ENTRY; - /** * @class ACE_Configuration_Value_IntId * diff --git a/dep/ACE_wrappers/ace/Containers_T.cpp b/dep/ACE_wrappers/ace/Containers_T.cpp index f4b6bd8a7..411b26dc8 100644 --- a/dep/ACE_wrappers/ace/Containers_T.cpp +++ b/dep/ACE_wrappers/ace/Containers_T.cpp @@ -1,4 +1,4 @@ -// $Id: Containers_T.cpp 82588 2008-08-11 13:37:41Z johnnyw $ +// $Id: Containers_T.cpp 92069 2010-09-28 11:38:59Z johnnyw $ #ifndef ACE_CONTAINERS_T_CPP #define ACE_CONTAINERS_T_CPP @@ -796,35 +796,6 @@ ACE_Double_Linked_List::dump (void) const #endif /* ACE_HAS_DUMP */ } -#if 0 -template T * -ACE_Double_Linked_List::find (const T &item) -{ - for (ACE_Double_Linked_List_Iterator iter (*this); - !iter.done (); - iter.advance ()) - { - T *temp = iter.next (); - - if (*temp == item) - return temp; - } - - return 0; -} - -template int -ACE_Double_Linked_List::remove (const T &item) -{ - T *temp = this->find (item); - - if (temp != 0) - return this->remove (temp); - else - return -1; -} -#endif /* 0 */ - template int ACE_Double_Linked_List::remove (T *n) { @@ -1621,7 +1592,7 @@ template int ACE_Ordered_MultiSet::find (const T &item, ITERATOR &iter) const { - // search an occurance of item, using iterator's current position as a hint + // search an occurrence of item, using iterator's current position as a hint ACE_DNode *node = iter.current_; int const result = locate (item, node, node); @@ -1779,7 +1750,7 @@ ACE_Ordered_MultiSet::locate (const T &item, ACE_DNode *start_position, return 0; } -// Looks for first occurance of in the ordered set, using the +// Looks for first occurrence of in the ordered set, using the // passed starting position as a hint: if there is such an instance, // it updates the new_position pointer to point to one such node and // returns 0; if there is no such node, then if there is a node before diff --git a/dep/ACE_wrappers/ace/Containers_T.h b/dep/ACE_wrappers/ace/Containers_T.h index 3f5463fe3..6e6c5bd34 100644 --- a/dep/ACE_wrappers/ace/Containers_T.h +++ b/dep/ACE_wrappers/ace/Containers_T.h @@ -4,7 +4,7 @@ /** * @file Containers_T.h * - * $Id: Containers_T.h 88975 2010-02-12 19:19:38Z johnnyw $ + * $Id: Containers_T.h 91995 2010-09-24 12:45:24Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -1920,7 +1920,7 @@ private: ACE_DNode **new_position); /** - * Looks for first occurance of @a item in the ordered set, using the + * Looks for first occurrence of @a item in the ordered set, using the * passed starting position as a hint: if there is such an instance, it * updates the new_position pointer to point to this node and returns 0; * if there is no such node, then if there is a node before where the @@ -1994,7 +1994,7 @@ public: // Define a "trait" typedef T TYPE; typedef ACE_Array_Iterator ITERATOR; - + /// Dynamically create an uninitialized array. /** * Initialize an empty array of the specified size using the provided diff --git a/dep/ACE_wrappers/ace/DEV.h b/dep/ACE_wrappers/ace/DEV.h index 86f8d5dc8..d8ce8628e 100644 --- a/dep/ACE_wrappers/ace/DEV.h +++ b/dep/ACE_wrappers/ace/DEV.h @@ -4,7 +4,7 @@ /** * @file DEV.h * - * $Id: DEV.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: DEV.h 91685 2010-09-09 09:35:14Z johnnyw $ * * @author Gerhard Lenzer */ @@ -23,19 +23,6 @@ #include "ace/DEV_Addr.h" -// The following is necessary since many C++ compilers don't support -// typedef'd types inside of classes used as formal template -// arguments... ;-(. Luckily, using the C++ preprocessor I can hide -// most of this nastiness! - -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) -#define ACE_DEV_CONNECTOR ACE_DEV_Connector -#define ACE_DEV_STREAM ACE_DEV_IO -#else /* TEMPLATES are broken (must be a cfront-based compiler...) */ -#define ACE_DEV_CONNECTOR ACE_DEV_Connector, ACE_DEV_Addr -#define ACE_DEV_STREAM ACE_DEV_IO, ACE_DEV_Addr -#endif /* ACE_TEMPLATE_TYPEDEFS */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/dep/ACE_wrappers/ace/Default_Constants.h b/dep/ACE_wrappers/ace/Default_Constants.h index 1c0743b52..c21c776ea 100644 --- a/dep/ACE_wrappers/ace/Default_Constants.h +++ b/dep/ACE_wrappers/ace/Default_Constants.h @@ -4,7 +4,7 @@ /** * @file Default_Constants.h * - * $Id: Default_Constants.h 87487 2009-11-12 07:54:39Z johnnyw $ + * $Id: Default_Constants.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -556,21 +556,6 @@ # define ACE_DEFAULT_GLOBALNAME_A "globalnames" #endif /* ACE_DEFAULT_GLOBALNAME_A */ -// ACE_DEFAULT_NAMESPACE_DIR is for legacy mode apps. A better -// way of doing this is something like ACE_Lib_Find::get_temp_dir, since -// this directory may not exist -#if defined (ACE_LEGACY_MODE) -# if defined (ACE_WIN32) -# define ACE_DEFAULT_NAMESPACE_DIR_A "C:\\temp" -# else /* ACE_WIN32 */ -# define ACE_DEFAULT_NAMESPACE_DIR_A "/tmp" -# endif /* ACE_WIN32 */ -# if defined (ACE_HAS_WCHAR) -# define ACE_DEFAULT_NAMESPACE_DIR_W ACE_TEXT_WIDE(ACE_DEFAULT_NAMESPACE_DIR_A) -# endif /* ACE_HAS_WCHAR */ -# define ACE_DEFAULT_NAMESPACE_DIR ACE_TEXT(ACE_DEFAULT_NAMESPACE_DIR_A) -#endif /* ACE_LEGACY_MODE */ - #if defined (ACE_HAS_WCHAR) # define ACE_DEFAULT_LOCALNAME_W ACE_TEXT_WIDE(ACE_DEFAULT_LOCALNAME_A) # define ACE_DEFAULT_GLOBALNAME_W ACE_TEXT_WIDE(ACE_DEFAULT_GLOBALNAME_A) diff --git a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp index 8698cbd5c..5f18064ec 100644 --- a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp +++ b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp @@ -1,4 +1,4 @@ -// $Id: Dev_Poll_Reactor.cpp 91535 2010-08-27 18:16:14Z shuston $ +// $Id: Dev_Poll_Reactor.cpp 92199 2010-10-11 11:58:35Z johnnyw $ #include "ace/OS_NS_errno.h" #include "ace/Dev_Poll_Reactor.h" @@ -997,7 +997,7 @@ ACE_Dev_Poll_Reactor::handle_events (ACE_Time_Value *max_wait_time) // // The destructor of this object will automatically compute how much // time elapsed since this method was called. - ACE_MT (ACE_Countdown_Time countdown (max_wait_time)); + ACE_Countdown_Time countdown (max_wait_time); Token_Guard guard (this->token_); int const result = guard.acquire_quietly (max_wait_time); diff --git a/dep/ACE_wrappers/ace/Dump_T.h b/dep/ACE_wrappers/ace/Dump_T.h index 4186cabf9..69d86718b 100644 --- a/dep/ACE_wrappers/ace/Dump_T.h +++ b/dep/ACE_wrappers/ace/Dump_T.h @@ -4,7 +4,7 @@ /** * @file Dump_T.h * - * $Id: Dump_T.h 91064 2010-07-12 10:11:24Z johnnyw $ + * $Id: Dump_T.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Doug Schmidt */ @@ -44,7 +44,7 @@ public: ACE_Dumpable_Adapter (const Concrete *t); ~ACE_Dumpable_Adapter (void); - /// Concrete dump method (simply delegates to the method of + /// Concrete dump method (simply delegates to the dump() method of /// ). virtual void dump (void) const; diff --git a/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp b/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp index 904c89f36..b13e68612 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp +++ b/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp @@ -1,4 +1,4 @@ -// $Id: Dynamic_Service_Base.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ +// $Id: Dynamic_Service_Base.cpp 91813 2010-09-17 07:52:52Z johnnyw $ #include "ace/Dynamic_Service_Base.h" #include "ace/ACE.h" @@ -78,7 +78,7 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo, if (ACE::debug ()) { - ACE_Guard log_guard (*ACE_Log_Msg::instance ()); + ACE_GUARD_RETURN (ACE_Log_Msg, log_guard, *ACE_Log_Msg::instance (), 0); if (repo->repo_ != repo_found->repo_) { @@ -86,7 +86,7 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo, ACE_TEXT ("ACE (%P|%t) DSB::instance, repo=%@, name=%s") ACE_TEXT (" type=%@ => %@") ACE_TEXT (" [in repo=%@]\n"), - repo->repo_, name, type, obj, + repo->repo_, name, type, obj, repo_found->repo_)); } else diff --git a/dep/ACE_wrappers/ace/Env_Value_T.h b/dep/ACE_wrappers/ace/Env_Value_T.h index df2178a0f..c8b459b26 100644 --- a/dep/ACE_wrappers/ace/Env_Value_T.h +++ b/dep/ACE_wrappers/ace/Env_Value_T.h @@ -4,7 +4,7 @@ /** * @file Env_Value_T.h * - * $Id: Env_Value_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Env_Value_T.h 91626 2010-09-07 10:59:20Z johnnyw $ * * Template to encapsulate getting a value from an environment variable * and using a supplied default value if not in the environment. @@ -22,6 +22,7 @@ #include /**/ "ace/config-all.h" #include "ace/Global_Macros.h" #include "ace/OS_NS_stdlib.h" +#include "ace/Copy_Disabled.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -38,7 +39,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * value. */ template -class ACE_Env_Value +class ACE_Env_Value : private ACE_Copy_Disabled { public: /** @@ -48,9 +49,8 @@ public: */ ACE_Env_Value (void); - /// Constructor that calls . - ACE_Env_Value (const ACE_TCHAR *varname, - const T &vardefault); + /// Constructor that calls open(). + ACE_Env_Value (const ACE_TCHAR *varname, const T &vardefault); /// Destroy the value. ~ACE_Env_Value (void); @@ -66,10 +66,6 @@ public: const ACE_TCHAR *varname (void) const; private: - /// Disallow copying and assignment. - ACE_UNIMPLEMENTED_FUNC (ACE_Env_Value(const ACE_Env_Value &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Env_Value operator=(const ACE_Env_Value &)) - void fetch_value (void); const ACE_TCHAR *varname_; diff --git a/dep/ACE_wrappers/ace/Event_Handler.h b/dep/ACE_wrappers/ace/Event_Handler.h index 417f78578..fe5d1de74 100644 --- a/dep/ACE_wrappers/ace/Event_Handler.h +++ b/dep/ACE_wrappers/ace/Event_Handler.h @@ -4,7 +4,7 @@ /** * @file Event_Handler.h * - * $Id: Event_Handler.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: Event_Handler.h 92345 2010-10-24 12:39:33Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -125,10 +125,10 @@ public: /// Called when a process exits. virtual int handle_exit (ACE_Process *); - /// Called when a method returns -1 or when the - /// method is called on an ACE_Reactor. The + /// Called when a handle_*() method returns -1 or when the + /// remove_handler() method is called on an ACE_Reactor. The /// @a close_mask indicates which event has triggered the - /// method callback on a particular @a handle. + /// handle_close() method callback on a particular @a handle. virtual int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); @@ -146,13 +146,14 @@ public: /// The application takes responsibility of resuming the handler ACE_APPLICATION_RESUMES_HANDLER }; + /** * Called to figure out whether the handler needs to resumed by the * reactor or the application can take care of it. The default * value of 0 would be returned which would allow the reactor to * take care of resumption of the handler. The application can * return a value more than zero and decide to resume the handler - * themseleves. + * themselves. * * @note This method has an affect only when used with the * ACE_Dev_Poll_Reactor (and then, only on Linux) or the ACE_TP_Reactor. @@ -368,7 +369,7 @@ public: ACE_Notification_Buffer (ACE_Event_Handler *eh, ACE_Reactor_Mask mask); - /// Default dtor. + /// Default destructor. ~ACE_Notification_Buffer (void); /// Pointer to the Event_Handler that will be dispatched diff --git a/dep/ACE_wrappers/ace/Event_Handler_T.cpp b/dep/ACE_wrappers/ace/Event_Handler_T.cpp index 45d9d4e27..3d2649524 100644 --- a/dep/ACE_wrappers/ace/Event_Handler_T.cpp +++ b/dep/ACE_wrappers/ace/Event_Handler_T.cpp @@ -1,6 +1,6 @@ // Event_Handler_T.cpp // -// $Id: Event_Handler_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Event_Handler_T.cpp 91626 2010-09-07 10:59:20Z johnnyw $ #ifndef ACE_EVENT_HANDLER_T_CPP #define ACE_EVENT_HANDLER_T_CPP @@ -11,8 +11,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) - #if !defined (__ACE_INLINE__) #include "ace/Event_Handler_T.inl" #endif /* __ACE_INLINE__ */ @@ -120,6 +118,4 @@ ACE_Event_Handler_T::handle_signal (int signum, siginfo_t *s, ucontext_t *u) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - #endif /* ACE_EVENT_HANDLER_T_CPP */ diff --git a/dep/ACE_wrappers/ace/Event_Handler_T.h b/dep/ACE_wrappers/ace/Event_Handler_T.h index d86ac3332..61ea28a17 100644 --- a/dep/ACE_wrappers/ace/Event_Handler_T.h +++ b/dep/ACE_wrappers/ace/Event_Handler_T.h @@ -4,7 +4,7 @@ /** * @file Event_Handler_T.h * - * $Id: Event_Handler_T.h 83891 2008-11-28 11:01:50Z johnnyw $ + * $Id: Event_Handler_T.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -20,8 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -186,6 +184,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL #pragma implementation ("Event_Handler_T.cpp") #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ #include /**/ "ace/post.h" #endif /* ACE_EVENT_HANDLER_H */ diff --git a/dep/ACE_wrappers/ace/Event_Handler_T.inl b/dep/ACE_wrappers/ace/Event_Handler_T.inl index 40db43e8e..9c209f981 100644 --- a/dep/ACE_wrappers/ace/Event_Handler_T.inl +++ b/dep/ACE_wrappers/ace/Event_Handler_T.inl @@ -1,6 +1,5 @@ // -*- C++ -*- -// -// $Id: Event_Handler_T.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Event_Handler_T.inl 91626 2010-09-07 10:59:20Z johnnyw $ #include "ace/Global_Macros.h" diff --git a/dep/ACE_wrappers/ace/FIFO_Recv_Msg.inl b/dep/ACE_wrappers/ace/FIFO_Recv_Msg.inl index 0a0b0673d..d6dfc369d 100644 --- a/dep/ACE_wrappers/ace/FIFO_Recv_Msg.inl +++ b/dep/ACE_wrappers/ace/FIFO_Recv_Msg.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: FIFO_Recv_Msg.inl 82559 2008-08-07 20:23:07Z parsons $ +// $Id: FIFO_Recv_Msg.inl 91813 2010-09-17 07:52:52Z johnnyw $ #include "ace/Min_Max.h" #include "ace/OS_NS_stropts.h" @@ -43,12 +43,12 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg) ssize_t recv_len = ACE_OS::read (this->get_handle (), (char *) recv_msg.buf, ACE_MIN (remaining, requested)); - + if (recv_len == -1) { return -1; } - + // Tell caller what's really in the buffer. recv_msg.len = static_cast (recv_len); @@ -60,7 +60,7 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg) // saving the indication here either to read the remainder later. size_t total_msg_size = remaining; remaining -= recv_len; - + while (remaining > 0) { const size_t throw_away = 1024; @@ -68,15 +68,15 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg) recv_len = ACE_OS::read (this->get_handle (), dev_null, ACE_MIN (remaining, throw_away)); - + if (recv_len == -1) { break; } - + remaining -= recv_len; } - + return ACE_Utils::truncate_cast (total_msg_size); } #endif /* ACE_HAS_STREAM_PIPES */ @@ -118,7 +118,7 @@ ACE_FIFO_Recv_Msg::recv (int *band, int *flags) { ACE_TRACE ("ACE_FIFO_Recv_Msg::recv"); - + if (ACE_OS::getpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, diff --git a/dep/ACE_wrappers/ace/FILE.h b/dep/ACE_wrappers/ace/FILE.h index 407a03379..b0cf71264 100644 --- a/dep/ACE_wrappers/ace/FILE.h +++ b/dep/ACE_wrappers/ace/FILE.h @@ -4,7 +4,7 @@ /** * @file FILE.h * - * $Id: FILE.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: FILE.h 91685 2010-09-09 09:35:14Z johnnyw $ * * @author Gerhard Lenzer */ @@ -22,19 +22,6 @@ #include "ace/FILE_Addr.h" -// The following is necessary since many C++ compilers don't support -// typedef'd types inside of classes used as formal template -// arguments... ;-(. Luckily, using the C++ preprocessor I can hide -// most of this nastiness! - -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) -#define ACE_FILE_CONNECTOR ACE_FILE_Connector -#define ACE_FILE_STREAM ACE_FILE_IO -#else /* TEMPLATES are broken (must be a cfront-based compiler...) */ -#define ACE_FILE_CONNECTOR ACE_FILE_Connector, ACE_FILE_Addr -#define ACE_FILE_STREAM ACE_FILE_IO, ACE_FILE_Addr -#endif /* ACE_TEMPLATE_TYPEDEFS */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -85,13 +72,13 @@ public: /** * Sets the file pointer as follows: - * o If is , the pointer is set to @a offset + * o If @ whence is @c SEEK_SET, the pointer is set to @a offset * bytes. * - * o If is , the pointer is set to its - * current location plus @a offset. + * o If @a whence> is @c SEEK_CUR, the pointer is set to its + * current location plus @a offset. * - * o If is , the pointer is set to the size + * o If @a whence is @c SEEK_END, the pointer is set to the size * of the file plus offset. */ ACE_OFF_T seek (ACE_OFF_T offset, diff --git a/dep/ACE_wrappers/ace/FILE_IO.h b/dep/ACE_wrappers/ace/FILE_IO.h index 951069e36..4540db830 100644 --- a/dep/ACE_wrappers/ace/FILE_IO.h +++ b/dep/ACE_wrappers/ace/FILE_IO.h @@ -4,7 +4,7 @@ /** * @file FILE_IO.h * - * $Id: FILE_IO.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: FILE_IO.h 92298 2010-10-21 11:15:17Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -59,8 +59,8 @@ public: /// Send n bytes, keep trying until n are sent. ssize_t send_n (const void *buf, size_t n) const; - /// Send all the @a message_blocks chained through their and - /// pointers. This call uses the underlying OS gather-write + /// Send all the @a message_blocks chained through their next and + /// cont pointers. This call uses the underlying OS gather-write /// operation to reduce the domain-crossing penalty. ssize_t send_n (const ACE_Message_Block *message_block, const ACE_Time_Value *timeout = 0, diff --git a/dep/ACE_wrappers/ace/Framework_Component.cpp b/dep/ACE_wrappers/ace/Framework_Component.cpp index dae19a13d..36e69d099 100644 --- a/dep/ACE_wrappers/ace/Framework_Component.cpp +++ b/dep/ACE_wrappers/ace/Framework_Component.cpp @@ -1,5 +1,4 @@ -// Framework_Component.cpp -// $Id: Framework_Component.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Framework_Component.cpp 92208 2010-10-13 06:20:39Z johnnyw $ #include "ace/Framework_Component.h" @@ -13,8 +12,6 @@ #include "ace/Recursive_Thread_Mutex.h" #include "ace/OS_NS_string.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Framework_Component::~ACE_Framework_Component (void) @@ -60,7 +57,7 @@ int ACE_Framework_Repository::close (void) { ACE_TRACE ("ACE_Framework_Repository::close"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); this->shutting_down_ = 1; @@ -128,7 +125,7 @@ int ACE_Framework_Repository::register_component (ACE_Framework_Component *fc) { ACE_TRACE ("ACE_Framework_Repository::register_component"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); int i; // Check to see if it's already registered @@ -155,7 +152,7 @@ int ACE_Framework_Repository::remove_component (const ACE_TCHAR *name) { ACE_TRACE ("ACE_Framework_Repository::remove_component"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); int i; for (i = 0; i < this->current_size_; i++) @@ -178,7 +175,7 @@ ACE_Framework_Repository::remove_dll_components (const ACE_TCHAR *dll_name) if (this->shutting_down_) return this->remove_dll_components_i (dll_name); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); return this->remove_dll_components_i (dll_name); } diff --git a/dep/ACE_wrappers/ace/Framework_Component.h b/dep/ACE_wrappers/ace/Framework_Component.h index 941960bf0..51330af86 100644 --- a/dep/ACE_wrappers/ace/Framework_Component.h +++ b/dep/ACE_wrappers/ace/Framework_Component.h @@ -4,7 +4,7 @@ /** * @file Framework_Component.h * - * $Id: Framework_Component.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Framework_Component.h 92208 2010-10-13 06:20:39Z johnnyw $ * * A prototype mechanism that allows framework components, singletons * such as ACE_Reactor, ACE_Proactor, etc, to be registered with a @@ -45,6 +45,8 @@ #include "ace/os_include/os_signal.h" #include "ace/Thread_Mutex.h" +#include "ace/Copy_Disabled.h" +#include "ace/Synch_Traits.h" #define ACE_DEFAULT_FRAMEWORK_REPOSITORY_SIZE 1024 @@ -56,7 +58,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @brief Base class that defines a uniform interface for all managed * framework components. */ -class ACE_Export ACE_Framework_Component +class ACE_Export ACE_Framework_Component : private ACE_Copy_Disabled { public: friend class ACE_Framework_Repository; @@ -73,11 +75,6 @@ protected: /// Destructor. virtual ~ACE_Framework_Component (void); -private: - // No copy possible - ACE_Framework_Component (const ACE_Framework_Component &); - void operator= (const ACE_Framework_Component &); - private: /// Pointer to the actual component. const void *this_; @@ -98,7 +95,7 @@ private: * destruction, framework components are destroyed in the reverse order * that they were added originally. */ -class ACE_Export ACE_Framework_Repository +class ACE_Export ACE_Framework_Repository : private ACE_Copy_Disabled { public: // This is just to silence a compiler warning about no public ctors @@ -166,10 +163,6 @@ private: /// order. void compact (void); - /// Disallow copying and assignment. - ACE_Framework_Repository (const ACE_Framework_Repository &); - ACE_Framework_Repository &operator= (const ACE_Framework_Repository &); - private: /// Contains all the framework components. @@ -190,11 +183,8 @@ private: /// unload their components, e.g., ACE_DLL_Manager. static sig_atomic_t shutting_down_; -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - /// Synchronization variable for the MT_SAFE Repository - ACE_Thread_Mutex lock_; -#endif /* ACE_MT_SAFE */ - + /// Synchronization variable for the repository + ACE_SYNCH_MUTEX lock_; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Framework_Component.inl b/dep/ACE_wrappers/ace/Framework_Component.inl index 1fb2de38b..d9afc4c2d 100644 --- a/dep/ACE_wrappers/ace/Framework_Component.inl +++ b/dep/ACE_wrappers/ace/Framework_Component.inl @@ -1,6 +1,5 @@ // -*- C++ -*- -// -// $Id: Framework_Component.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Framework_Component.inl 92208 2010-10-13 06:20:39Z johnnyw $ #include "ace/ACE.h" #include "ace/Guard_T.h" @@ -24,7 +23,7 @@ ACE_INLINE int ACE_Framework_Repository::current_size (void) const { ACE_TRACE ("ACE_Framework_Repository::current_size"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->lock_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, const_cast (this->lock_), -1); return this->current_size_; } @@ -32,7 +31,7 @@ ACE_INLINE int ACE_Framework_Repository::total_size (void) const { ACE_TRACE ("ACE_Framework_Repository::total_size"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->lock_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, const_cast (this->lock_), -1); return this->total_size_; } diff --git a/dep/ACE_wrappers/ace/Framework_Component_T.h b/dep/ACE_wrappers/ace/Framework_Component_T.h index 2dcef43e3..a3deaf8fc 100644 --- a/dep/ACE_wrappers/ace/Framework_Component_T.h +++ b/dep/ACE_wrappers/ace/Framework_Component_T.h @@ -4,7 +4,7 @@ /** * @file Framework_Component_T.h * - * $Id: Framework_Component_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Framework_Component_T.h 92208 2010-10-13 06:20:39Z johnnyw $ * * @author Don Hinton */ @@ -52,9 +52,9 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL -// This macro should be called in the instance() method -// of the Concrete class that will be managed. Along -// with the appropriate template instantiation. +/// This macro should be called in the instance() method +/// of the Concrete class that will be managed. Along +/// with the appropriate template instantiation. #define ACE_REGISTER_FRAMEWORK_COMPONENT(CLASS, INSTANCE) \ ACE_Framework_Repository::instance ()->register_component \ (new ACE_Framework_Component_T (INSTANCE)); diff --git a/dep/ACE_wrappers/ace/Free_List.h b/dep/ACE_wrappers/ace/Free_List.h index 7f2ce593c..24495d03b 100644 --- a/dep/ACE_wrappers/ace/Free_List.h +++ b/dep/ACE_wrappers/ace/Free_List.h @@ -4,7 +4,7 @@ /** * @file Free_List.h * - * $Id: Free_List.h 84619 2009-02-26 12:26:16Z johnnyw $ + * $Id: Free_List.h 92298 2010-10-21 11:15:17Z johnnyw $ * * @author Darrell Brunsch (brunsch@cs.wustl.edu) */ @@ -61,7 +61,7 @@ public: * @brief Implements a free list. * * This class maintains a free list of nodes of type T. It - * depends on the type T having a and + * depends on the type T having a get_next() and set_next() * method. It maintains a mutex so the freelist can be used in * a multithreaded program . */ diff --git a/dep/ACE_wrappers/ace/Functor.h b/dep/ACE_wrappers/ace/Functor.h index ec1d28506..cb01630e2 100644 --- a/dep/ACE_wrappers/ace/Functor.h +++ b/dep/ACE_wrappers/ace/Functor.h @@ -4,7 +4,7 @@ /** * @file Functor.h * - * $Id: Functor.h 86698 2009-09-13 15:58:17Z johnnyw $ + * $Id: Functor.h 92069 2010-09-28 11:38:59Z johnnyw $ * * Non-templatized classes and class template specializations for * implementing function objects that are used in various places @@ -121,67 +121,6 @@ public: unsigned long operator () (unsigned char t) const; }; -#if 0 -// @@ ADD HASHES FOR ACE TYPES - -/** - * @brief Function object for hashing a 16-bit signed number - */ -template<> -class ACE_Export ACE_Hash -{ -public: - /// Simply returns t - unsigned long operator () (ACE_INT16 t) const; -}; - -/** - * @brief Function object for hashing a 16-bit unsigned number - */ -template<> -class ACE_Export ACE_Hash -{ -public: - /// Simply returns t - unsigned long operator () (ACE_UINT16 t) const; -}; - -/** - * @brief Function object for hashing a 32-bit signed number - */ -template<> -class ACE_Export ACE_Hash -{ -public: - /// Simply returns t - unsigned long operator () (ACE_INT32 t) const; -}; - -/** - * @brief Function object for hashing a 32-bit unsigned number - */ -template<> -class ACE_Export ACE_Hash -{ -public: - /// Simply returns t - unsigned long operator () (ACE_UINT32 t) const; -}; - -/** - * @brief Function object for hashing a 64-bit unsigned number - */ -template<> -class ACE_Export ACE_Hash -{ -public: - /// Simply returns t - unsigned long operator () (ACE_UINT64 t) const; -}; - -// @@ DONE ADDING HASHES FOR ACE TYPES -#endif - /** * @brief Function object for hashing a short number */ diff --git a/dep/ACE_wrappers/ace/Functor.inl b/dep/ACE_wrappers/ace/Functor.inl index 30e539459..46fb00217 100644 --- a/dep/ACE_wrappers/ace/Functor.inl +++ b/dep/ACE_wrappers/ace/Functor.inl @@ -4,7 +4,7 @@ /** * @file Functor.inl * - * $Id: Functor.inl 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Functor.inl 92069 2010-09-28 11:38:59Z johnnyw $ * * Inlinable method definitions for non-templatized classes * and template specializations implementing the GOF Command Pattern, @@ -71,42 +71,6 @@ ACE_Hash::operator () (unsigned char t) const return t; } -#if 0 -ACE_INLINE unsigned long -ACE_Hash::operator () (ACE_INT16 t) const -{ - return t; -} - -ACE_INLINE unsigned long -ACE_Hash::operator () (ACE_UINT16 t) const -{ - return t; -} - -ACE_INLINE unsigned long -ACE_Hash::operator () (ACE_INT32 t) const -{ - return static_cast (t); -} - -ACE_INLINE unsigned long -ACE_Hash::operator () (ACE_UINT32 t) const -{ - return t; -} - -ACE_INLINE unsigned long -ACE_Hash::operator () (ACE_UINT64 t) const -{ -#if (ACE_SIZEOF_LONG == 4) - return ACE_U64_TO_U32 (t); -#else - return static_cast (t); -#endif /* ACE_SIZEOF_LONG */ -} -#endif - ACE_INLINE unsigned long ACE_Hash::operator () (short t) const { diff --git a/dep/ACE_wrappers/ace/Future.cpp b/dep/ACE_wrappers/ace/Future.cpp index e38ec06d6..5ebb550a6 100644 --- a/dep/ACE_wrappers/ace/Future.cpp +++ b/dep/ACE_wrappers/ace/Future.cpp @@ -1,4 +1,4 @@ - // $Id: Future.cpp 91286 2010-08-05 09:04:31Z johnnyw $ + // $Id: Future.cpp 91626 2010-09-07 10:59:20Z johnnyw $ #ifndef ACE_FUTURE_CPP #define ACE_FUTURE_CPP @@ -98,7 +98,7 @@ ACE_Future_Rep::attach (ACE_Future_Rep*& rep) { ACE_ASSERT (rep != 0); // Use value_ready_mutex_ for both condition and ref count management - ACE_MT (ACE_Guard r_mon (rep->value_ready_mutex_)); +// ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, r_mon, rep->value_ready_mutex_, 0); ++rep->ref_count_; return rep; } @@ -108,7 +108,7 @@ ACE_Future_Rep::detach (ACE_Future_Rep*& rep) { ACE_ASSERT (rep != 0); // Use value_ready_mutex_ for both condition and ref count management - ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, r_mon, rep->value_ready_mutex_)); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, r_mon, rep->value_ready_mutex_); if (rep->ref_count_-- == 0) { @@ -126,7 +126,7 @@ ACE_Future_Rep::assign (ACE_Future_Rep*& rep, ACE_Future_Rep* new_rep) ACE_ASSERT (rep != 0); ACE_ASSERT (new_rep != 0); // Use value_ready_mutex_ for both condition and ref count management - ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, r_mon, rep->value_ready_mutex_)); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, r_mon, rep->value_ready_mutex_); ACE_Future_Rep* old = rep; rep = new_rep; @@ -169,10 +169,10 @@ ACE_Future_Rep::set (const T &r, // If the value is already produced, ignore it... if (this->value_ == 0) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, - ace_mon, - this->value_ready_mutex_, - -1)); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, + ace_mon, + this->value_ready_mutex_, + -1); // Otherwise, create a new result value. Note the use of the // Double-checked locking pattern to avoid multiple allocations. @@ -210,9 +210,9 @@ ACE_Future_Rep::get (T &value, // If the value is already produced, return it. if (this->value_ == 0) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - this->value_ready_mutex_, - -1)); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, + this->value_ready_mutex_, + -1); // If the value is not yet defined we must block until the // producer writes to it. @@ -232,7 +232,7 @@ template int ACE_Future_Rep::attach (ACE_Future_Observer *observer, ACE_Future &caller) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->value_ready_mutex_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->value_ready_mutex_, -1); // Otherwise, create a new result value. Note the use of the // Double-checked locking pattern to avoid corrupting the list. @@ -251,7 +251,7 @@ ACE_Future_Rep::attach (ACE_Future_Observer *observer, template int ACE_Future_Rep::detach (ACE_Future_Observer *observer) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->value_ready_mutex_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->value_ready_mutex_, -1); // Remove all occurrences of the specified observer from this // objects hash map. @@ -265,7 +265,7 @@ ACE_Future_Rep::operator T () if (this->value_ == 0) { // Constructor of ace_mon acquires the mutex. - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->value_ready_mutex_, 0)); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->value_ready_mutex_, 0); // If the value is not yet defined we must block until the // producer writes to it. diff --git a/dep/ACE_wrappers/ace/Future.h b/dep/ACE_wrappers/ace/Future.h index e30159eaf..0246263f1 100644 --- a/dep/ACE_wrappers/ace/Future.h +++ b/dep/ACE_wrappers/ace/Future.h @@ -4,7 +4,7 @@ /** * @file Future.h * - * $Id: Future.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Future.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Andres Kruse * @author Douglas C. Schmidt @@ -27,6 +27,7 @@ #if defined (ACE_HAS_THREADS) +#include "ace/Synch_Traits.h" #include "ace/Recursive_Thread_Mutex.h" #include "ace/Condition_Recursive_Thread_Mutex.h" @@ -107,7 +108,7 @@ private: friend class ACE_Future; /** - * Set the result value. The specified represents the + * Set the result value. The specified @a caller represents the * future that invoked this method, which is used to notify * the list of future observers. Returns 0 for success, -1 on error. * This function only has an effect the first time it is called for @@ -214,8 +215,8 @@ private: OBSERVER_COLLECTION observer_collection_; // = Condition variable and mutex that protect the . - mutable ACE_Recursive_Thread_Mutex value_ready_mutex_; - mutable ACE_Condition_Recursive_Thread_Mutex value_ready_; + mutable ACE_SYNCH_RECURSIVE_MUTEX value_ready_mutex_; + mutable ACE_SYNCH_RECURSIVE_CONDITION value_ready_; private: @@ -303,8 +304,7 @@ public: * @retval 0 Success; @a value contains the value of the ACE_Future. * @retval -1 Error; check ACE_OS::last_error() for an error code. */ - int get (T &value, - ACE_Time_Value *tv = 0) const; + int get (T &value, ACE_Time_Value *tv = 0) const; /** * @deprecated Note that this method is going away in a subsequent @@ -364,7 +364,7 @@ public: private: - // the ACE_Future_Rep + /// The ACE_Future_Rep /// Protect operations on the . typedef ACE_Future_Rep FUTURE_REP; FUTURE_REP *future_rep_; diff --git a/dep/ACE_wrappers/ace/Future_Set.cpp b/dep/ACE_wrappers/ace/Future_Set.cpp index a40b0700d..986ce948c 100644 --- a/dep/ACE_wrappers/ace/Future_Set.cpp +++ b/dep/ACE_wrappers/ace/Future_Set.cpp @@ -1,4 +1,4 @@ -// $Id: Future_Set.cpp 88128 2009-12-14 02:17:22Z schmidt $ +// $Id: Future_Set.cpp 91626 2010-09-07 10:59:20Z johnnyw $ #ifndef ACE_FUTURE_SET_CPP #define ACE_FUTURE_SET_CPP @@ -83,7 +83,7 @@ ACE_Future_Set::insert (ACE_Future &future) template void ACE_Future_Set::update (const ACE_Future &future) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; FUTURE &local_future = const_cast &> (future); ACE_NEW (mb, diff --git a/dep/ACE_wrappers/ace/Future_Set.h b/dep/ACE_wrappers/ace/Future_Set.h index 3d07f4f73..d85152420 100644 --- a/dep/ACE_wrappers/ace/Future_Set.h +++ b/dep/ACE_wrappers/ace/Future_Set.h @@ -4,7 +4,7 @@ /** * @file Future_Set.h * - * $Id: Future_Set.h 88128 2009-12-14 02:17:22Z schmidt $ + * $Id: Future_Set.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author John Tucker */ @@ -41,7 +41,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * using the ACE_Future_Set::next_readable() method. */ template -class ACE_Future_Set : public ACE_Future_Observer +class ACE_Future_Set : public ACE_Future_Observer, + private ACE_Copy_Disabled { public: // = Initialization and termination methods. @@ -99,10 +100,6 @@ public: ACE_ALLOC_HOOK_DECLARE; private: - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Future_Set &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Future_Set (const ACE_Future_Set &)) - typedef ACE_Future FUTURE; typedef ACE_Future_Rep FUTURE_REP; diff --git a/dep/ACE_wrappers/ace/Global_Macros.h b/dep/ACE_wrappers/ace/Global_Macros.h index 9e3190270..bce0544e1 100644 --- a/dep/ACE_wrappers/ace/Global_Macros.h +++ b/dep/ACE_wrappers/ace/Global_Macros.h @@ -4,7 +4,7 @@ /** * @file Global_Macros.h * - * $Id: Global_Macros.h 91459 2010-08-25 09:51:01Z mcorino $ + * $Id: Global_Macros.h 91685 2010-09-09 09:35:14Z johnnyw $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -106,9 +106,11 @@ ACE_END_VERSIONED_NAMESPACE_DECL // ---------------------------------------------------------------- +// FUZZ: disable check_for_ACE_Guard + // Convenient macro for testing for deadlock, as well as for detecting // when mutexes fail. -/* WARNING: +/* @warning * Use of ACE_GUARD() is rarely correct. ACE_GUARD() causes the current * function to return if the lock is not acquired. Since merely returning * (no value) almost certainly fails to handle the acquisition failure @@ -118,28 +120,45 @@ ACE_END_VERSIONED_NAMESPACE_DECL * ACE_GUARD_REACTION() is better because it lets you specify error * handling code. */ +#if !defined (ACE_GUARD_ACTION) #define ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ACTION, REACTION) \ ACE_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () != 0) { ACTION; } \ else { REACTION; } +#endif /* !ACE_GUARD_ACTION */ +#if !defined (ACE_GUARD_REACTION) #define ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, REACTION) \ ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ;, REACTION) +#endif /* !ACE_GUARD_REACTION */ +#if !defined (ACE_GUARD) #define ACE_GUARD(MUTEX, OBJ, LOCK) \ ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, return) +#endif /* !ACE_GUARD */ +#if !defined (ACE_GUARD_RETURN) #define ACE_GUARD_RETURN(MUTEX, OBJ, LOCK, RETURN) \ ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, return RETURN) +#endif /* !ACE_GUARD_RETURN */ +#if !defined (ACE_WRITE_GUARD) # define ACE_WRITE_GUARD(MUTEX,OBJ,LOCK) \ ACE_Write_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) return; +#endif /* !ACE_WRITE_GUARD */ +#if !defined (ACE_WRITE_GUARD_RETURN) # define ACE_WRITE_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \ ACE_Write_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) return RETURN; +#endif /* ACE_WRITE_GUARD_RETURN */ +#if !defined (ACE_READ_GUARD) # define ACE_READ_GUARD(MUTEX,OBJ,LOCK) \ ACE_Read_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) return; +#endif /* !ACE_READ_GUARD */ +#if !defined (ACE_READ_GUARD_RETURN) # define ACE_READ_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \ ACE_Read_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) return RETURN; +#endif /* !ACE_READ_GUARD_RETURN */ +// FUZZ: enable check_for_ACE_Guard // ---------------------------------------------------------------- @@ -908,15 +927,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC # define ACE_SEH_FINALLY if (1) #endif /* ACE_WIN32 */ -// These should probably be put into a seperate header. - -// The following is necessary since many C++ compilers don't support -// typedef'd types inside of classes used as formal template -// arguments... ;-(. Luckily, using the C++ preprocessor I can hide -// most of this nastiness! - -# if defined (ACE_HAS_TEMPLATE_TYPEDEFS) - // Handle ACE_Message_Queue. # define ACE_SYNCH_DECL class _ACE_SYNCH # define ACE_SYNCH_USE _ACE_SYNCH @@ -987,10 +997,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC # define ACE_UPIPE_CONNECTOR ACE_UPIPE_Connector # define ACE_UPIPE_STREAM ACE_UPIPE_Stream -// Handle ACE_FILE_* -# define ACE_FILE_CONNECTOR ACE_FILE_Connector -# define ACE_FILE_STREAM ACE_FILE_IO - // Handle ACE_*_Memory_Pool. # define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool # define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool @@ -999,96 +1005,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC # define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool # define ACE_PAGEFILE_MEMORY_POOL ACE_Pagefile_Memory_Pool -# else /* TEMPLATES are broken in some form or another (i.e., most C++ compilers) */ - -// Handle ACE_Message_Queue. -# if defined (ACE_HAS_OPTIMIZED_MESSAGE_QUEUE) -# define ACE_SYNCH_DECL class _ACE_SYNCH_MUTEX_T, class _ACE_SYNCH_CONDITION_T, class _ACE_SYNCH_SEMAPHORE_T -# define ACE_SYNCH_USE _ACE_SYNCH_MUTEX_T, _ACE_SYNCH_CONDITION_T, _ACE_SYNCH_SEMAPHORE_T -# else -# define ACE_SYNCH_DECL class _ACE_SYNCH_MUTEX_T, class _ACE_SYNCH_CONDITION_T -# define ACE_SYNCH_USE _ACE_SYNCH_MUTEX_T, _ACE_SYNCH_CONDITION_T -# endif /* ACE_HAS_OPTIMIZED_MESSAGE_QUEUE */ -# define ACE_SYNCH_MUTEX_T _ACE_SYNCH_MUTEX_T -# define ACE_SYNCH_CONDITION_T _ACE_SYNCH_CONDITION_T -# define ACE_SYNCH_SEMAPHORE_T _ACE_SYNCH_SEMAPHORE_T - -// Handle ACE_Malloc* -# define ACE_MEM_POOL_1 class _ACE_MEM_POOL, class _ACE_MEM_POOL_OPTIONS -# define ACE_MEM_POOL_2 _ACE_MEM_POOL, _ACE_MEM_POOL_OPTIONS -# define ACE_MEM_POOL _ACE_MEM_POOL -# define ACE_MEM_POOL_OPTIONS _ACE_MEM_POOL_OPTIONS - -// Handle ACE_Svc_Handler -# define ACE_PEER_STREAM_1 class _ACE_PEER_STREAM, class _ACE_PEER_ADDR -# define ACE_PEER_STREAM_2 _ACE_PEER_STREAM, _ACE_PEER_ADDR -# define ACE_PEER_STREAM _ACE_PEER_STREAM -# define ACE_PEER_STREAM_ADDR _ACE_PEER_ADDR - -// Handle ACE_Acceptor -# define ACE_PEER_ACCEPTOR_1 class _ACE_PEER_ACCEPTOR, class _ACE_PEER_ADDR -# define ACE_PEER_ACCEPTOR_2 _ACE_PEER_ACCEPTOR, _ACE_PEER_ADDR -# define ACE_PEER_ACCEPTOR _ACE_PEER_ACCEPTOR -# define ACE_PEER_ACCEPTOR_ADDR _ACE_PEER_ADDR - -// Handle ACE_Connector -# define ACE_PEER_CONNECTOR_1 class _ACE_PEER_CONNECTOR, class _ACE_PEER_ADDR -# define ACE_PEER_CONNECTOR_2 _ACE_PEER_CONNECTOR, _ACE_PEER_ADDR -# define ACE_PEER_CONNECTOR _ACE_PEER_CONNECTOR -# define ACE_PEER_CONNECTOR_ADDR _ACE_PEER_ADDR -# define ACE_PEER_CONNECTOR_ADDR_ANY ACE_PEER_CONNECTOR_ADDR::sap_any - -// Handle ACE_SOCK_* -# define ACE_SOCK_ACCEPTOR ACE_SOCK_Acceptor, ACE_INET_Addr -# define ACE_SOCK_CONNECTOR ACE_SOCK_Connector, ACE_INET_Addr -# define ACE_SOCK_STREAM ACE_SOCK_Stream, ACE_INET_Addr -# define ACE_SOCK_DGRAM ACE_SOCK_Dgram, ACE_INET_Addr -# define ACE_SOCK_DGRAM_BCAST ACE_SOCK_Dgram_Bcast, ACE_INET_Addr -# define ACE_SOCK_DGRAM_MCAST ACE_SOCK_Dgram_Mcast, ACE_INET_Addr - -// Handle ACE_SOCK_SEQPACK_* -# define ACE_SOCK_SEQPACK_ACCEPTOR ACE_SOCK_SEQPACK_Acceptor, ACE_Multihomed_INET_Addr -# define ACE_SOCK_SEQPACK_CONNECTOR ACE_SOCK_SEQPACK_Connector, ACE_Multihomed_INET_Addr -# define ACE_SOCK_SEQPACK_ASSOCIATION ACE_SOCK_SEQPACK_Association, ACE_Multihomed_INET_Addr - -// Handle ACE_MEM_* -# define ACE_MEM_ACCEPTOR ACE_MEM_Acceptor, ACE_MEM_Addr -# define ACE_MEM_CONNECTOR ACE_MEM_Connector, ACE_INET_Addr -# define ACE_MEM_STREAM ACE_MEM_Stream, ACE_INET_Addr - -// Handle ACE_LSOCK_* -# define ACE_LSOCK_ACCEPTOR ACE_LSOCK_Acceptor, ACE_UNIX_Addr -# define ACE_LSOCK_CONNECTOR ACE_LSOCK_Connector, ACE_UNIX_Addr -# define ACE_LSOCK_STREAM ACE_LSOCK_Stream, ACE_UNIX_Addr - -// Handle ACE_TLI_* -# define ACE_TLI_ACCEPTOR ACE_TLI_Acceptor, ACE_INET_Addr -# define ACE_TLI_CONNECTOR ACE_TLI_Connector, ACE_INET_Addr -# define ACE_TLI_STREAM ACE_TLI_Stream, ACE_INET_Addr - -// Handle ACE_SPIPE_* -# define ACE_SPIPE_ACCEPTOR ACE_SPIPE_Acceptor, ACE_SPIPE_Addr -# define ACE_SPIPE_CONNECTOR ACE_SPIPE_Connector, ACE_SPIPE_Addr -# define ACE_SPIPE_STREAM ACE_SPIPE_Stream, ACE_SPIPE_Addr - -// Handle ACE_UPIPE_* -# define ACE_UPIPE_ACCEPTOR ACE_UPIPE_Acceptor, ACE_SPIPE_Addr -# define ACE_UPIPE_CONNECTOR ACE_UPIPE_Connector, ACE_SPIPE_Addr -# define ACE_UPIPE_STREAM ACE_UPIPE_Stream, ACE_SPIPE_Addr - -// Handle ACE_FILE_* -# define ACE_FILE_CONNECTOR ACE_FILE_Connector, ACE_FILE_Addr -# define ACE_FILE_STREAM ACE_FILE_IO, ACE_FILE_Addr - -// Handle ACE_*_Memory_Pool. -# define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool, ACE_MMAP_Memory_Pool_Options -# define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool, ACE_MMAP_Memory_Pool_Options -# define ACE_SBRK_MEMORY_POOL ACE_Sbrk_Memory_Pool, ACE_Sbrk_Memory_Pool_Options -# define ACE_SHARED_MEMORY_POOL ACE_Shared_Memory_Pool, ACE_Shared_Memory_Pool_Options -# define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool, ACE_Local_Memory_Pool_Options -# define ACE_PAGEFILE_MEMORY_POOL ACE_Pagefile_Memory_Pool, ACE_Pagefile_Memory_Pool_Options -# endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - // Work around compilers that don't like in-class static integral // constants. Constants in this case are meant to be compile-time // constants so that they may be used as template arguments, for diff --git a/dep/ACE_wrappers/ace/Guard_T.cpp b/dep/ACE_wrappers/ace/Guard_T.cpp index 2090ddda2..90321c6ac 100644 --- a/dep/ACE_wrappers/ace/Guard_T.cpp +++ b/dep/ACE_wrappers/ace/Guard_T.cpp @@ -1,8 +1,10 @@ -// $Id: Guard_T.cpp 85141 2009-04-22 08:48:30Z johnnyw $ +// $Id: Guard_T.cpp 92052 2010-09-27 14:20:22Z vzykov $ #ifndef ACE_GUARD_T_CPP #define ACE_GUARD_T_CPP +// FUZZ: disable check_for_ACE_Guard + #include "ace/Guard_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -32,7 +34,7 @@ ACE_Guard::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_ = %x\n"), this->lock_)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP, this)); + ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/dep/ACE_wrappers/ace/Guard_T.h b/dep/ACE_wrappers/ace/Guard_T.h index 844ed8288..5120d3f7a 100644 --- a/dep/ACE_wrappers/ace/Guard_T.h +++ b/dep/ACE_wrappers/ace/Guard_T.h @@ -4,7 +4,7 @@ /** * @file Guard_T.h * - * $Id: Guard_T.h 91459 2010-08-25 09:51:01Z mcorino $ + * $Id: Guard_T.h 91626 2010-09-07 10:59:20Z johnnyw $ * * Moved from Synch.h. * @@ -25,6 +25,8 @@ #include "ace/Global_Macros.h" #include "ace/OS_NS_Thread.h" +// FUZZ: disable check_for_ACE_Guard + ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -38,7 +40,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * the very least the , , , and * methods. * - * WARNING: A successfully constructed ACE_Guard does NOT mean that the + * @warning A successfully constructed ACE_Guard does NOT mean that the * lock was acquired! It is the caller's responsibility, after * constructing an ACE_Guard, to check whether the lock was successfully * acquired. Code like this is dangerous: @@ -138,7 +140,7 @@ private: * it is instantiated with must support the appropriate * API). * - * WARNING: See important "WARNING" in comments at top of ACE_Guard. + * @warning See important "WARNING" in comments at top of ACE_Guard. */ template class ACE_Write_Guard : public ACE_Guard @@ -184,7 +186,7 @@ public: * it is instantiated with must support the appropriate * API). * - * WARNING: See important "WARNING" in comments at top of ACE_Guard. + * @warning See important "WARNING" in comments at top of ACE_Guard. */ template class ACE_Read_Guard : public ACE_Guard @@ -241,7 +243,7 @@ public: * is released even if a thread exits via ! */ template -class ACE_TSS_Guard +class ACE_TSS_Guard : private ACE_Copy_Disabled { public: // = Initialization and termination methods. @@ -288,9 +290,9 @@ protected: ACE_thread_key_t key_; private: - // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS_Guard &)) - ACE_UNIMPLEMENTED_FUNC (ACE_TSS_Guard (const ACE_TSS_Guard &)) + // FUZZ: disable check_for_ACE_Guard + typedef ACE_Guard Guard_Type; + // FUZZ: enable check_for_ACE_Guard }; /** @@ -331,6 +333,11 @@ public: // ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. +private: + // FUZZ: disable check_for_ACE_Guard + typedef ACE_Guard Guard_Type; + typedef ACE_Write_Guard Write_Guard_Type; + // FUZZ: enable check_for_ACE_Guard }; /** @@ -370,6 +377,11 @@ public: // ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. +private: + // FUZZ: disable check_for_ACE_Guard + typedef ACE_Guard Guard_Type; + typedef ACE_Read_Guard Read_Guard_Type; + // FUZZ: enable check_for_ACE_Guard }; #endif /* !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) */ diff --git a/dep/ACE_wrappers/ace/Guard_T.inl b/dep/ACE_wrappers/ace/Guard_T.inl index 3e7d5b61f..9c313a0fa 100644 --- a/dep/ACE_wrappers/ace/Guard_T.inl +++ b/dep/ACE_wrappers/ace/Guard_T.inl @@ -1,6 +1,8 @@ // -*- C++ -*- // -// $Id: Guard_T.inl 82723 2008-09-16 09:35:44Z johnnyw $ +// $Id: Guard_T.inl 91626 2010-09-07 10:59:20Z johnnyw $ + +// FUZZ: disable check_for_ACE_Guard #include "ace/RW_Thread_Mutex.h" diff --git a/dep/ACE_wrappers/ace/Handle_Set.h b/dep/ACE_wrappers/ace/Handle_Set.h index 11188f9fc..0de5c98ea 100644 --- a/dep/ACE_wrappers/ace/Handle_Set.h +++ b/dep/ACE_wrappers/ace/Handle_Set.h @@ -4,7 +4,7 @@ /** * @file Handle_Set.h * - * $Id: Handle_Set.h 82723 2008-09-16 09:35:44Z johnnyw $ + * $Id: Handle_Set.h 92298 2010-10-21 11:15:17Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -196,10 +196,10 @@ public: ACE_ALLOC_HOOK_DECLARE; private: - /// The we are iterating through. + /// The Handle_Set we are iterating through. const ACE_Handle_Set &handles_; - /// Index of the bit we're examining in the current word. + /// Index of the bit we're examining in the current word_num_() word. #if defined (ACE_WIN32) u_int handle_index_; #elif !defined (ACE_HAS_BIG_FD_SET) diff --git a/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.cpp b/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.cpp index 2d9f163c5..ad333543a 100644 --- a/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.cpp +++ b/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.cpp @@ -1,4 +1,4 @@ -// $Id: Hash_Cache_Map_Manager_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Hash_Cache_Map_Manager_T.cpp 92097 2010-09-30 05:41:49Z msmit $ #ifndef ACE_HASH_CACHE_MAP_MANAGER_T_CPP #define ACE_HASH_CACHE_MAP_MANAGER_T_CPP @@ -54,7 +54,7 @@ ACE_Hash_Cache_Map_Manager::bind (const KEY &key, { int result = this->caching_strategy_.notify_bind (bind_result, - cache_value.second ()); + cache_value.second); if (result == -1) { @@ -164,7 +164,7 @@ ACE_Hash_Cache_Map_Manager::find (const KEY &key, { int result = this->caching_strategy_.notify_find (find_result, - entry->int_id_.second ()); + entry->int_id_.second); // Unless the find and notification operations go thru, this // method is not successful. @@ -189,7 +189,7 @@ ACE_Hash_Cache_Map_Manager::find (const KEY &key, if (result != -1) { - value = entry->int_id_.first (); + value = entry->int_id_.first; } return result; @@ -214,7 +214,7 @@ ACE_Hash_Cache_Map_Manager::unbind (CACHE_ENTRY *entry) { int result = this->caching_strategy_.notify_unbind (unbind_result, - entry->int_id_.second ()); + entry->int_id_.second); if (result == -1) unbind_result = -1; diff --git a/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.h b/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.h index 7d54e1fba..0bc64a5a9 100644 --- a/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.h +++ b/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.h @@ -4,7 +4,7 @@ /** * @file Hash_Cache_Map_Manager_T.h * - * $Id: Hash_Cache_Map_Manager_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Hash_Cache_Map_Manager_T.h 92097 2010-09-30 05:41:49Z msmit $ * * @author Kirthika Parameswaran */ @@ -33,9 +33,9 @@ class ACE_Allocator; #define ACE_CACHE_MAP_MANAGER \ ACE_Cache_Map_Manager, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \ - ACE_Hash_Map_Iterator_Ex, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \ - ACE_Hash_Map_Reverse_Iterator_Ex, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \ + ACE_Hash_Map_Manager_Ex, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \ + ACE_Hash_Map_Iterator_Ex, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \ + ACE_Hash_Map_Reverse_Iterator_Ex, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \ CACHING_STRATEGY, \ ATTRIBUTES> @@ -71,7 +71,7 @@ class ACE_Hash_Cache_Map_Manager : public ACE_CACHE_MAP_MANAGER * are used by the strategy and is transparent to the user of this * class. */ - typedef ACE_Pair CACHE_VALUE; + typedef std::pair CACHE_VALUE; typedef ACE_Hash_Map_Manager_Ex HASH_MAP; typedef ACE_Hash_Map_Entry CACHE_ENTRY; typedef KEY key_type; diff --git a/dep/ACE_wrappers/ace/Hash_Map_Manager_T.h b/dep/ACE_wrappers/ace/Hash_Map_Manager_T.h index de2fde623..6b754341a 100644 --- a/dep/ACE_wrappers/ace/Hash_Map_Manager_T.h +++ b/dep/ACE_wrappers/ace/Hash_Map_Manager_T.h @@ -1,10 +1,10 @@ -// -*- C++ -*- +// // -*- C++ -*- //============================================================================= /** * @file Hash_Map_Manager_T.h * - * $Id: Hash_Map_Manager_T.h 84477 2009-02-16 13:30:38Z johnnyw $ + * $Id: Hash_Map_Manager_T.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -765,8 +765,8 @@ protected: * ACE_Hash_Map_Manager_Ex it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Hash_Map_Manager_Ex's - * internal lock, which is accessible via its method. + * ACE_GUARD or ACE_READ_GUARD on the ACE_Hash_Map_Manager_Ex's + * internal lock, which is accessible via its mutex() method. */ template class ACE_Hash_Map_Iterator_Ex : public ACE_Hash_Map_Iterator_Base_Ex @@ -835,8 +835,8 @@ public: * ACE_Hash_Map_Manager_Ex it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Hash_Map_Manager_Ex's - * internal lock, which is accessible via its method. + * ACE_GUARD or ACE_READ_GUARD on the ACE_Hash_Map_Manager_Ex's + * internal lock, which is accessible via its mutex() method. */ template class ACE_Hash_Map_Const_Iterator_Ex : public ACE_Hash_Map_Const_Iterator_Base_Ex @@ -894,8 +894,8 @@ public: * ACE_Hash_Map_Manager_Ex it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Hash_Map_Manager_Ex's - * internal lock, which is accessible via its method. + * ACE_GUARD or ACE_READ_GUARD on the ACE_Hash_Map_Manager_Ex's + * internal lock, which is accessible via its mutex() method. * * Note that a creation method for this new iterator cannot be added * to the hash map, since this would require adding explicit template @@ -979,8 +979,8 @@ protected: * ACE_Hash_Map_Manager_Ex it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Hash_Map_Manager_Ex's - * internal lock, which is accessible via its method. + * ACE_GUARD or ACE_READ_GUARD on the ACE_Hash_Map_Manager_Ex's + * internal lock, which is accessible via its mutex() method. */ template class ACE_Hash_Map_Reverse_Iterator_Ex : public ACE_Hash_Map_Iterator_Base_Ex @@ -1036,7 +1036,7 @@ public: * ACE_Hash_Map_Manager_Ex it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Hash_Map_Manager_Ex's + * ACE_GUARD or ACE_READ_GUARD on the ACE_Hash_Map_Manager_Ex's * internal lock, which is accessible via its method. */ template diff --git a/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.h b/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.h index 8ac9a41ef..bdfba00fb 100644 --- a/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.h +++ b/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.h @@ -4,7 +4,7 @@ /** * @file Hash_Map_With_Allocator_T.h * - * $Id: Hash_Map_With_Allocator_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Hash_Map_With_Allocator_T.h 91743 2010-09-13 18:24:51Z johnnyw $ * * @author Marina Spivak * @author Irfan Pyarali @@ -42,7 +42,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * is meaningful! That is why we need this wrapper, which * insures that appropriate allocator pointer is in place for * each call. - * + * * At some point it would be a good idea to update this class to * use the new "two allocator" technique provided by @c * ACE_Hash_Map_Manager_Ex. diff --git a/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.cpp b/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.cpp index f4ea66fbb..db79e0187 100644 --- a/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.cpp +++ b/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.cpp @@ -3,7 +3,7 @@ /** * @file Hash_Multi_Map_Manager_T.cpp * - * $Id: Hash_Multi_Map_Manager_T.cpp 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Hash_Multi_Map_Manager_T.cpp 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Shanshan Jiang */ @@ -48,12 +48,10 @@ ACE_Hash_Multi_Map_Entry::ACE_Hash_Multi_Map_Entry (const EXT_ID { } -# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS) template ACE_Hash_Multi_Map_Entry::~ACE_Hash_Multi_Map_Entry (void) { } -# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */ template EXT_ID & ACE_Hash_Multi_Map_Entry::key () diff --git a/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.h b/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.h index dadfd19d8..ddbb093bf 100644 --- a/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.h +++ b/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.h @@ -4,7 +4,7 @@ /** * @file Hash_Multi_Map_Manager_T.h * - * $Id: Hash_Multi_Map_Manager_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Hash_Multi_Map_Manager_T.h 91693 2010-09-09 12:57:54Z johnnyw $ * * The code in Hash_Multi_Map_Manager_T.* was based on the code in * Hash_Map_Manager_T.*. @@ -65,10 +65,8 @@ public: ACE_Hash_Multi_Map_Entry (ACE_Hash_Multi_Map_Entry *next, ACE_Hash_Multi_Map_Entry *prev); - # if ! defined (ACE_HAS_BROKEN_NOOP_DTORS) /// Destructor. ~ACE_Hash_Multi_Map_Entry (void); - #endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */ /// Key accessor. EXT_ID& key (void); @@ -76,12 +74,13 @@ public: /// Item accessor. ACE_Unbounded_Set& item (void); +public: /// Key used to look up an entry. - /// @deprecated Use key() + /// @todo Should be private EXT_ID ext_id_; /// The contents of the entry itself. - /// @deprecated Use item() + /// @todo Should be private ACE_Unbounded_Set int_id_set_; /// Pointer to the next item in the bucket of overflow nodes. @@ -553,7 +552,7 @@ protected: ACE_Allocator *table_allocator_; /// Addidtional allocator for entries, so it should be able to - /// allocate 'size' / chunks of sizeof + /// allocate 'size' / chunks of sizeof /// (@c ACE_Hash_Multi_Map_Entry<@c EXT_ID, @c INT_ID>) bytes each. ACE_Allocator *entry_allocator_; @@ -744,7 +743,7 @@ protected: * @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * @c ACE_Guard or @c ACE_Read_Guard on the @c ACE_Hash_Multi_Map_Manager's + * @c ACE_GUARD or @c ACE_READ_GUARD on the @c ACE_Hash_Multi_Map_Manager's * internal lock, which is accessible via its @c mutex method. */ template @@ -790,8 +789,8 @@ public: * @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * @c ACE_Guard or @c ACE_Read_Guard on the @c ACE_Hash_Multi_Map_Manager's - * internal lock, which is accessible via its @c mutex method. + * @c ACE_GUARD or @c ACE_READ_GUARD on the @c ACE_Hash_Multi_Map_Manager's + * internal lock, which is accessible via its @c mutex() method. */ template class ACE_Hash_Multi_Map_Const_Iterator : public ACE_Hash_Multi_Map_Const_Iterator_Base @@ -838,7 +837,7 @@ public: * @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * @c ACE_Guard or @c ACE_Read_Guard on the @c ACE_Hash_Multi_Map_Manager's + * @c ACE_GUARD or @c ACE_READ_GUARD on the @c ACE_Hash_Multi_Map_Manager's * internal lock, which is accessible via its @c mutex method. * * Note that a creation method for this new iterator cannot be added @@ -912,7 +911,7 @@ protected: * @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * @c ACE_Guard or @c ACE_Read_Guard on the @c ACE_Hash_Multi_Map_Manager's + * @c ACE_GUARD or @c ACE_READ_GUARD on the @c ACE_Hash_Multi_Map_Manager's * internal lock, which is accessible via its @c mutex method. */ template diff --git a/dep/ACE_wrappers/ace/INET_Addr.cpp b/dep/ACE_wrappers/ace/INET_Addr.cpp index 63ececb6e..6dba7150f 100644 --- a/dep/ACE_wrappers/ace/INET_Addr.cpp +++ b/dep/ACE_wrappers/ace/INET_Addr.cpp @@ -1,4 +1,4 @@ -// $Id: INET_Addr.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ +// $Id: INET_Addr.cpp 91683 2010-09-09 09:07:49Z johnnyw $ // Defines the Internet domain address family address format. @@ -871,10 +871,6 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const } # endif /* ACE_HAS_IPV6 */ -# if defined (DIGITAL_UNIX) && defined (__GNUC__) - hostent * const hp = - ACE_OS::gethostbyaddr (static_cast (addr), size, type); -# else int h_error; // Not the same as errno! hostent hentry; ACE_HOSTENT_DATA buf; @@ -885,7 +881,6 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const &hentry, buf, &h_error); -# endif /* DIGITAL_UNIX */ if (hp == 0 || hp->h_name == 0) return -1; diff --git a/dep/ACE_wrappers/ace/INET_Addr.h b/dep/ACE_wrappers/ace/INET_Addr.h index ba8978c25..fcd26d0de 100644 --- a/dep/ACE_wrappers/ace/INET_Addr.h +++ b/dep/ACE_wrappers/ace/INET_Addr.h @@ -4,7 +4,7 @@ /** * @file INET_Addr.h * - * $Id: INET_Addr.h 91064 2010-07-12 10:11:24Z johnnyw $ + * $Id: INET_Addr.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -133,7 +133,7 @@ public: * are converted into network byte order, otherwise they are assumed to be * in network byte order already and are passed straight through. * - * If is non-zero and IPv6 support has been compiled in, + * If @a map is non-zero and IPv6 support has been compiled in, * then this address will be set to the IPv4-mapped IPv6 address of it. */ int set (u_short port_number, @@ -141,15 +141,15 @@ public: int encode = 1, int map = 0); - /// Uses to initialize an ACE_INET_Addr from a - /// , the remote @a host_name, and the @a protocol. + /// Uses getservbyname() to initialize an ACE_INET_Addr from a + /// @a port_name, the remote @a host_name, and the @a protocol. int set (const char port_name[], const char host_name[], const char protocol[] = "tcp"); /** - * Uses to initialize an ACE_INET_Addr from a - * , an @a ip_addr, and the @a protocol. This assumes that + * Uses getservbyname() to initialize an ACE_INET_Addr from a + * @a port_name, an @a ip_addr, and the @a protocol. This assumes that * @a ip_addr is already in network byte order. */ int set (const char port_name[], diff --git a/dep/ACE_wrappers/ace/INET_Addr.inl b/dep/ACE_wrappers/ace/INET_Addr.inl index be3d8e642..06460cb78 100644 --- a/dep/ACE_wrappers/ace/INET_Addr.inl +++ b/dep/ACE_wrappers/ace/INET_Addr.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: INET_Addr.inl 88218 2009-12-17 12:32:14Z mcorino $ +// $Id: INET_Addr.inl 91685 2010-09-09 09:35:14Z johnnyw $ #include "ace/OS_NS_string.h" @@ -71,14 +71,7 @@ ACE_INET_Addr::ip_addr_size (void) const else return static_cast (sizeof this->inet_addr_.in6_.sin6_addr); #else - // These _UNICOS changes were picked up from pre-IPv6 code in - // get_host_name_i... the IPv6 section above may need something - // similar, so keep an eye out for it. -# if !defined(_UNICOS) return static_cast (sizeof this->inet_addr_.in4_.sin_addr.s_addr); -# else /* _UNICOS */ - return static_cast (sizeof this->inet_addr_.in4_.sin_addr); -# endif /* ! _UNICOS */ #endif /* ACE_HAS_IPV6 */ } diff --git a/dep/ACE_wrappers/ace/IOStream.h b/dep/ACE_wrappers/ace/IOStream.h index 8a135a5e4..de154cd1b 100644 --- a/dep/ACE_wrappers/ace/IOStream.h +++ b/dep/ACE_wrappers/ace/IOStream.h @@ -4,7 +4,7 @@ /** * @file IOStream.h * - * $Id: IOStream.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: IOStream.h 92102 2010-09-30 08:14:15Z johnnyw $ * * @author James CE Johnson * @author Jim Crossley @@ -64,14 +64,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL # endif /* ! ACE_HAS_STDCPP_STL_INCLUDES */ # endif /* ACE_WIN32 && defined (_MSC_VER) */ -# if defined (__DECCXX_VER) -# if __DECCXX_VER < 50700000 -# include /**/ -# else -# include /**/ -# endif /* __DECCXX_VER < 50700000 */ -# endif /* __DECCXX_VER */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Quoted_String : public ACE_IOStream_String diff --git a/dep/ACE_wrappers/ace/IO_Cntl_Msg.cpp b/dep/ACE_wrappers/ace/IO_Cntl_Msg.cpp index 44fcc75b2..b9badd5c1 100644 --- a/dep/ACE_wrappers/ace/IO_Cntl_Msg.cpp +++ b/dep/ACE_wrappers/ace/IO_Cntl_Msg.cpp @@ -1,51 +1,7 @@ -// $Id: IO_Cntl_Msg.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: IO_Cntl_Msg.cpp 92069 2010-09-28 11:38:59Z johnnyw $ #include "ace/IO_Cntl_Msg.h" #if !defined (__ACE_INLINE__) #include "ace/IO_Cntl_Msg.inl" #endif /* __ACE_INLINE__ */ - - - -#if 0 -// This is not meant to be used, it's just a place holder... - -#if !defined (__ACE_INLINE__) -#include "ace/Intrusive_List.inl" -#endif /* __ACE_INLINE__ */ - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -// Forward decl -template class ACE_Module; - -/** - * @class ACE_Module_Link - * - * @brief Data structure used to link two modules together - */ -class ACE_Module_Link -{ -public: - ACE_Module_Link (ACE_Module *m1, ACE_Module *m2): mod_upper_ (m1), mod_lower_ (m2), count_ (0) {} - - ACE_Module *upper (void) { return this->mod_upper_; } - void upper (ACE_Module *u) { this->mod_upper_ = u; } - - ACE_Module *lower (void) { return this->mod_lower_; } - void lower (ACE_Module *l) { this->mod_lower_ = l; } - - int count (void) const { return this->count_; } - void count (int c) { this->count_ = c; } - -private: - ACE_Module *mod_upper_; - ACE_Module *mod_lower_; - int count_; -}; - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif - diff --git a/dep/ACE_wrappers/ace/Intrusive_List.cpp b/dep/ACE_wrappers/ace/Intrusive_List.cpp index 90ed82de2..4b64ef1e8 100644 --- a/dep/ACE_wrappers/ace/Intrusive_List.cpp +++ b/dep/ACE_wrappers/ace/Intrusive_List.cpp @@ -1,4 +1,4 @@ -// $Id: Intrusive_List.cpp 84273 2009-01-30 12:55:25Z johnnyw $ +// $Id: Intrusive_List.cpp 92069 2010-09-28 11:38:59Z johnnyw $ #ifndef ACE_INTRUSIVE_LIST_CPP #define ACE_INTRUSIVE_LIST_CPP @@ -117,41 +117,6 @@ ACE_Intrusive_List::unsafe_remove (T *node) node->prev (0); } -#if 0 -template void -ACE_Intrusive_List_Node::check_invariants (void) -{ - ACE_ASSERT ((this->next () == 0) || (this->next ()->prev () == this)); - ACE_ASSERT ((this->prev () == 0) || (this->prev ()->next () == this)); -} - -template void -ACE_Intrusive_List::check_invariants (void) -{ - ACE_ASSERT ((this->tail_ == 0) || (this->tail_->next () == 0)); - ACE_ASSERT ((this->head_ == 0) || (this->head_->prev () == 0)); - ACE_ASSERT (!((this->head_ == 0) ^ (this->tail_ == 0))); - - int found_tail = 0; - for (T *i = this->head_; i != 0; i = i->next ()) - { - if (i == this->tail_) - found_tail = 1; - i->check_invariants (); - } - ACE_ASSERT (this->tail_ == 0 || found_tail == 1); - - int found_head = 0; - for (T *j = this->tail_; j != 0; j = j->prev ()) - { - if (j == this->head_) - found_head = 1; - j->check_invariants (); - } - ACE_ASSERT (this->head_ == 0 || found_head == 1); -} -#endif /* 0 */ - ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_INTRUSIVE_LIST_CPP */ diff --git a/dep/ACE_wrappers/ace/Intrusive_List.h b/dep/ACE_wrappers/ace/Intrusive_List.h index d93ec95ed..b5f32f683 100644 --- a/dep/ACE_wrappers/ace/Intrusive_List.h +++ b/dep/ACE_wrappers/ace/Intrusive_List.h @@ -4,7 +4,7 @@ /** * @file Intrusive_List.h * - * $Id: Intrusive_List.h 83968 2008-12-04 08:11:41Z johnnyw $ + * $Id: Intrusive_List.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Carlos O'Ryan */ @@ -71,10 +71,6 @@ public: /// Returns true if the container is empty, otherwise returns false. bool is_empty (void) const; - /// Returns true if the container is empty, otherwise returns false. - /// @deprecated Use is_empty() instead. - bool empty (void) const; - /// Insert an element at the beginning of the list void push_front (T *node); diff --git a/dep/ACE_wrappers/ace/Intrusive_List.inl b/dep/ACE_wrappers/ace/Intrusive_List.inl index 028a1aef3..851400937 100644 --- a/dep/ACE_wrappers/ace/Intrusive_List.inl +++ b/dep/ACE_wrappers/ace/Intrusive_List.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Intrusive_List.inl 83952 2008-12-02 20:01:24Z johnnyw $ +// $Id: Intrusive_List.inl 91688 2010-09-09 11:21:50Z johnnyw $ #include @@ -12,12 +12,6 @@ ACE_Intrusive_List::is_empty (void) const return this->head_ == 0; } -template ACE_INLINE bool -ACE_Intrusive_List::empty (void) const -{ - return this->is_empty (); -} - template ACE_INLINE T * ACE_Intrusive_List::head (void) const { diff --git a/dep/ACE_wrappers/ace/LSOCK_Stream.h b/dep/ACE_wrappers/ace/LSOCK_Stream.h index 3476a51df..bdaed30a3 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Stream.h +++ b/dep/ACE_wrappers/ace/LSOCK_Stream.h @@ -4,7 +4,7 @@ /** * @file LSOCK_Stream.h * - * $Id: LSOCK_Stream.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: LSOCK_Stream.h 92140 2010-10-04 12:37:52Z johnnyw $ * * @author Doug Schmidt */ @@ -38,12 +38,12 @@ class ACE_Export ACE_LSOCK_Stream : public ACE_SOCK_Stream, public ACE_LSOCK { public: // = Send/recv methods. - /// Send iovecs via <::writev>. + /// Send iovecs via ::writev(). ssize_t send_msg (const iovec iov[], size_t n, ACE_HANDLE handle); - /// Send iovecs via <::writev>. + /// Send iovecs via ::writev(). ssize_t recv_msg (iovec iov[], size_t n, ACE_HANDLE &handle); @@ -51,7 +51,7 @@ public: /// Get handle. ACE_HANDLE get_handle (void) const; - /// Overrides set_handle from the base classes. + /// Overrides set_handle() from the base classes. void set_handle (ACE_HANDLE fd); // = Meta-type info diff --git a/dep/ACE_wrappers/ace/Local_Name_Space_T.h b/dep/ACE_wrappers/ace/Local_Name_Space_T.h index 9822a22a6..56b445b4d 100644 --- a/dep/ACE_wrappers/ace/Local_Name_Space_T.h +++ b/dep/ACE_wrappers/ace/Local_Name_Space_T.h @@ -4,7 +4,7 @@ /** * @file Local_Name_Space_T.h * - * $Id: Local_Name_Space_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Local_Name_Space_T.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Prashant Jain * @author Irfan Pyarali and @@ -35,26 +35,13 @@ typedef ACE_Unbounded_Set ACE_WSTRING_SET; ACE_END_VERSIONED_NAMESPACE_DECL -// Simplify later usage by defining typedefs. -#if (1) # include "ace/Hash_Map_Manager_T.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> MAP_MANAGER; ACE_END_VERSIONED_NAMESPACE_DECL -#else -# include "ace/Map_Manager.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -typedef ACE_Map_Manager MAP_MANAGER; -ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* 0 */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -/// @deprecated Deprecated typedefs. Use the map's traits instead. -typedef MAP_MANAGER::ITERATOR MAP_ITERATOR; -typedef MAP_MANAGER::ENTRY MAP_ENTRY; - - /** * @class ACE_Name_Space_Map * diff --git a/dep/ACE_wrappers/ace/Local_Tokens.h b/dep/ACE_wrappers/ace/Local_Tokens.h index 603d55626..a55537036 100644 --- a/dep/ACE_wrappers/ace/Local_Tokens.h +++ b/dep/ACE_wrappers/ace/Local_Tokens.h @@ -4,7 +4,7 @@ /** * @file Local_Tokens.h * - * $Id: Local_Tokens.h 84477 2009-02-16 13:30:38Z johnnyw $ + * $Id: Local_Tokens.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Karl-Heinz Dorn * @author Douglas C. Schmidt @@ -34,7 +34,7 @@ * mechanisms, such as mutexes or semaphores. Instead, you should * use the ACE_Recursive_Thread_Mutex, ACE_Thread_Mutex, * ACE_Thread_Semaphore, etc., that are defined in - * $ACE_ROOT/ace/Synch.h and $ACE_ROOT/ace/Synch_T.h or the + * $ACE_ROOT/ace/Synch.h or the * ACE_Token that's defined in $ACE_ROOT/ace/Token.h. * * @@ -79,6 +79,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * this class is necessary to fight the compiler with order of * declaration errors. */ +// FUZZ: disable check_for_ACE_Guard namespace ACE_TOKEN_CONST { #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) @@ -92,6 +93,7 @@ namespace ACE_TOKEN_CONST typedef ACE_Guard GUARD; #endif /* ACE_HAS_THREADS */ } +// FUZZ: enable check_for_ACE_Guard // Forward decl. class ACE_Token_Proxy; diff --git a/dep/ACE_wrappers/ace/Local_Tokens.inl b/dep/ACE_wrappers/ace/Local_Tokens.inl index 56b3cb764..0c599630f 100644 --- a/dep/ACE_wrappers/ace/Local_Tokens.inl +++ b/dep/ACE_wrappers/ace/Local_Tokens.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Local_Tokens.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Local_Tokens.inl 92069 2010-09-28 11:38:59Z johnnyw $ #if defined (ACE_HAS_TOKENS_LIBRARY) @@ -140,20 +140,6 @@ ACE_Tokens::name (void) return this->token_name_; } -#if 0 -ACE_INLINE ACE_Token_Proxy * -ACE_Tokens::current_owner (void) -{ - ACE_TRACE ("ACE_Tokens::current_owner"); - // ACE_GUARD_RETURN ??? - - if (this->owner () == 0) - return 0; - else - return this->owner ()->proxy (); -} -#endif /* 0 */ - // ************************************************************ ACE_INLINE int diff --git a/dep/ACE_wrappers/ace/Log_Msg.cpp b/dep/ACE_wrappers/ace/Log_Msg.cpp index 3640b23ad..3df89332a 100644 --- a/dep/ACE_wrappers/ace/Log_Msg.cpp +++ b/dep/ACE_wrappers/ace/Log_Msg.cpp @@ -1,4 +1,4 @@ -// $Id: Log_Msg.cpp 91446 2010-08-24 14:16:37Z mhengstmengel $ +// $Id: Log_Msg.cpp 92052 2010-09-27 14:20:22Z vzykov $ // We need this to get the status of ACE_NTRACE... #include "ace/config-all.h" @@ -40,6 +40,7 @@ #include "ace/Log_Record.h" #include "ace/Recursive_Thread_Mutex.h" #include "ace/Stack_Trace.h" +#include "ace/Atomic_Op.h" #if !defined (__ACE_INLINE__) #include "ace/Log_Msg.inl" @@ -1728,24 +1729,9 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_OS::sprintf (bp, format, static_cast (ACE_Thread::self ())); -#elif defined (DIGITAL_UNIX) - ACE_OS::strcpy (fp, ACE_TEXT ("u")); - { - int id = -# if defined (ACE_HAS_THREADS) - pthread_getselfseq_np (); -# else - ACE_Thread::self (); -# endif /* ACE_HAS_THREADS */ - - if (can_check) - this_len = ACE_OS::snprintf (bp, bspace, format, id); - else - this_len = ACE_OS::sprintf (bp, format, id); - } #else ACE_hthread_t t_id; - ACE_Thread::self (t_id); + ACE_OS::thr_self (t_id); # if defined (ACE_MVS) || defined (ACE_TANDEM_T1248_PTHREADS) // MVS's pthread_t is a struct... yuck. So use the ACE 5.0 @@ -2484,32 +2470,6 @@ ACE_Log_Msg::thr_desc (ACE_Thread_Descriptor *td) td->acquire_release (); } -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) && defined(ACE_LEGACY_MODE) -ACE_SEH_EXCEPT_HANDLER -ACE_Log_Msg::seh_except_selector (void) -{ - return ACE_OS_Object_Manager::seh_except_selector (); -} - -ACE_SEH_EXCEPT_HANDLER -ACE_Log_Msg::seh_except_selector (ACE_SEH_EXCEPT_HANDLER n) -{ - return ACE_OS_Object_Manager::seh_except_selector (n); -} - -ACE_SEH_EXCEPT_HANDLER -ACE_Log_Msg::seh_except_handler (void) -{ - return ACE_OS_Object_Manager::seh_except_handler (); -} - -ACE_SEH_EXCEPT_HANDLER -ACE_Log_Msg::seh_except_handler (ACE_SEH_EXCEPT_HANDLER n) -{ - return ACE_OS_Object_Manager::seh_except_handler (n); -} -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS && ACE_LEGACY_MODE */ - ACE_Log_Msg_Backend * ACE_Log_Msg::msg_backend (ACE_Log_Msg_Backend *b) { diff --git a/dep/ACE_wrappers/ace/Log_Msg.h b/dep/ACE_wrappers/ace/Log_Msg.h index ee75432ff..28b00325d 100644 --- a/dep/ACE_wrappers/ace/Log_Msg.h +++ b/dep/ACE_wrappers/ace/Log_Msg.h @@ -4,7 +4,7 @@ /** * @file Log_Msg.h * - * $Id: Log_Msg.h 91446 2010-08-24 14:16:37Z mhengstmengel $ + * $Id: Log_Msg.h 92298 2010-10-21 11:15:17Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -24,7 +24,6 @@ #include "ace/Default_Constants.h" #include "ace/Log_Priority.h" #include "ace/os_include/os_limits.h" -#include "ace/Atomic_Op.h" #include "ace/Synch_Traits.h" // The ACE_ASSERT macro used to be defined here, include ace/Assert.h @@ -124,7 +123,6 @@ // that #define STDERR or THREAD (e.g. LynxOS). We simply #undef // these macros as there is no way to save the macro definition using // the pre-processor. See Bugzilla Bug #299 for more info. - #if defined (STDERR) # undef STDERR #endif /* STDERR */ @@ -145,6 +143,7 @@ class ACE_Log_Msg_Backend; // Forward declaration class ACE_Thread_Descriptor; class ACE_Log_Record; +template class ACE_Atomic_Op; /** * @class ACE_Log_Msg @@ -184,7 +183,7 @@ public: { /// Write messages to stderr. STDERR = 1, - /// Write messages to the local client logger deamon. + /// Write messages to the local client logger daemon. LOGGER = 2, /// Write messages to the ostream * stored in thread-specific /// storage. @@ -405,27 +404,6 @@ public: */ void thr_desc (ACE_Thread_Descriptor *td); -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) && defined(ACE_LEGACY_MODE) - // These functions are disabled without ACE_LEGACY_MODE - // because the *semantics* have changed (the objects are no longer - // TSS). - /// Get TSS exception action. - /// @note The action is no longer TSS, they are global! - ACE_SEH_EXCEPT_HANDLER seh_except_selector (void); - - /// Set TSS exception action. - /// @note The action is no longer TSS, they are global! - ACE_SEH_EXCEPT_HANDLER seh_except_selector (ACE_SEH_EXCEPT_HANDLER); - - /// Get TSS exception handler. - /// @note The handler is no longer TSS, they are global! - ACE_SEH_EXCEPT_HANDLER seh_except_handler (void); - - /// Set TSS exception handler. - /// @note The handler is no longer TSS, they are global! - ACE_SEH_EXCEPT_HANDLER seh_except_handler (ACE_SEH_EXCEPT_HANDLER); -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS && ACE_LEGACY_MODE */ - /// Stop tracing status on a per-thread basis... void stop_tracing (void); @@ -529,12 +507,12 @@ public: * - 'S': print out the appropriate signal message corresponding * to var-argument, e.g., as done by strsignal() * - 's': prints a ACE_TCHAR* character string (also see C and W) - * - 'T': print timestamp in hour:minute:sec:usec format (plain option, - * i.e. without any flags, prints system supplied timestamp; + * - 'T': print timestamp in hour:minute:sec:usec format (plain option, + * i.e. without any flags, prints system supplied timestamp; * with '#' flag added expects ACE_Time_Value* in argument list) * - 'D': print timestamp as Weekday Month day year hour:minute:sec.usec - * (plain option, i.e. without any flags, prints system supplied - * timestamp; with '#' flag added expects ACE_Time_Value* in + * (plain option, i.e. without any flags, prints system supplied + * timestamp; with '#' flag added expects ACE_Time_Value* in * argument list) * - 't': print thread id (1 if single-threaded) * - 'u': print as unsigned int @@ -765,10 +743,6 @@ ACE_TSS_CLEANUP_NAME (void *ptr); # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */ #endif /* ACE_MT_SAFE */ -#if defined(ACE_LEGACY_MODE) -#include "ace/Log_Msg_Callback.h" -#endif /* ACE_LEGACY_MODE */ - #if defined (__ACE_INLINE__) #include "ace/Log_Msg.inl" #endif /* __ACE_INLINE__ */ diff --git a/dep/ACE_wrappers/ace/Log_Record.cpp b/dep/ACE_wrappers/ace/Log_Record.cpp index 2d9bd6322..cea333a5c 100644 --- a/dep/ACE_wrappers/ace/Log_Record.cpp +++ b/dep/ACE_wrappers/ace/Log_Record.cpp @@ -1,4 +1,4 @@ -// $Id: Log_Record.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Log_Record.cpp 91764 2010-09-14 13:04:37Z johnnyw $ #include "ace/Log_Record.h" @@ -21,8 +21,6 @@ #include "ace/OS_Memory.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Log_Record) diff --git a/dep/ACE_wrappers/ace/Log_Record.h b/dep/ACE_wrappers/ace/Log_Record.h index aaf2a21ed..fb2e9ddcc 100644 --- a/dep/ACE_wrappers/ace/Log_Record.h +++ b/dep/ACE_wrappers/ace/Log_Record.h @@ -4,7 +4,7 @@ /** * @file Log_Record.h * - * $Id: Log_Record.h 91064 2010-07-12 10:11:24Z johnnyw $ + * $Id: Log_Record.h 91764 2010-09-14 13:04:37Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -103,27 +103,6 @@ public: /// IMPORTANT: @a name must be a statically allocated const ACE_TCHAR* static void priority_name (ACE_Log_Priority p, const ACE_TCHAR *name); - // = Marshall/demarshall - /** - * Encode the @c Log_Record for transmission on the network. - * @deprecated - * The encode() and decode() metods are deprecated; please use - * the CDR insertion and extraction operators to properly encode and decode - * ACE_Log_Record objects. - */ - void encode (void); - - /** - * Decode the @c Log_Record received from the network. - * @deprecated - * The encode() and decode() metods are deprecated; please use - * the CDR insertion and extraction operators to properly encode and decode - * ACE_Log_Record objects. - */ - void decode (void); - - // = Set/get methods - /// Get the type of the Log_Record. ACE_UINT32 type (void) const; diff --git a/dep/ACE_wrappers/ace/Log_Record.inl b/dep/ACE_wrappers/ace/Log_Record.inl index 50cfa70df..dda0993c2 100644 --- a/dep/ACE_wrappers/ace/Log_Record.inl +++ b/dep/ACE_wrappers/ace/Log_Record.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Log_Record.inl 84183 2009-01-19 08:50:16Z johnnyw $ +// $Id: Log_Record.inl 91764 2010-09-14 13:04:37Z johnnyw $ #include "ace/Global_Macros.h" #include "ace/os_include/arpa/os_inet.h" @@ -16,37 +16,6 @@ ACE_Log_Record::~ACE_Log_Record (void) delete [] this->msg_data_; } -ACE_INLINE void -ACE_Log_Record::encode (void) -{ - ACE_TRACE ("ACE_Log_Record::encode"); - this->length_ = ACE_HTONL (this->length_); - this->type_ = ACE_HTONL (this->type_); - // Make sure we don't enclose the sec() and usec() fields until - // they've been normalized. - // secs_ is commented out because it can be 64 bits. This method is - // deprecated; use the CDR operations instead. - // this->secs_ = ACE_HTONL (this->secs_); - this->usecs_ = ACE_HTONL (this->usecs_); - this->pid_ = ACE_HTONL (this->pid_); -} - -ACE_INLINE void -ACE_Log_Record::decode (void) -{ - ACE_TRACE ("ACE_Log_Record::decode"); -#if !defined (ACE_LACKS_NTOHL) - ACE_Time_Value tv (this->secs_, - ntohl (this->usecs_)); - - this->secs_ = tv.sec (); - this->usecs_ = tv.usec (); - this->type_ = ntohl (this->type_); - this->pid_ = ntohl (this->pid_); - this->length_ = ntohl (this->length_); -#endif /* ACE_LACKS_NTOHL */ -} - ACE_INLINE ACE_UINT32 ACE_Log_Record::type (void) const { diff --git a/dep/ACE_wrappers/ace/MEM_Acceptor.h b/dep/ACE_wrappers/ace/MEM_Acceptor.h index bc0b02d17..94ff5138d 100644 --- a/dep/ACE_wrappers/ace/MEM_Acceptor.h +++ b/dep/ACE_wrappers/ace/MEM_Acceptor.h @@ -4,7 +4,7 @@ /** * @file MEM_Acceptor.h * - * $Id: MEM_Acceptor.h 84834 2009-03-16 12:28:51Z johnnyw $ + * $Id: MEM_Acceptor.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Nanbor Wang */ @@ -120,10 +120,6 @@ public: /// Returns 0 if successful, else -1. int get_local_addr (ACE_MEM_Addr &) const; - /// Accessor to the mmap options. - /// @deprecated This method has been deprecated. - ACE_MEM_SAP::MALLOC_OPTIONS& malloc_options (void); - // = Meta-type info typedef ACE_MEM_Addr PEER_ADDR; typedef ACE_MEM_Stream PEER_STREAM; diff --git a/dep/ACE_wrappers/ace/MEM_Acceptor.inl b/dep/ACE_wrappers/ace/MEM_Acceptor.inl index 270d0ed3c..4e63e1067 100644 --- a/dep/ACE_wrappers/ace/MEM_Acceptor.inl +++ b/dep/ACE_wrappers/ace/MEM_Acceptor.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: MEM_Acceptor.inl 82723 2008-09-16 09:35:44Z johnnyw $ +// $Id: MEM_Acceptor.inl 91688 2010-09-09 11:21:50Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -91,13 +91,4 @@ ACE_MEM_Acceptor::init_buffer_size (ACE_OFF_T bytes) this->malloc_options_.minimum_bytes_ = bytes; } -ACE_INLINE ACE_MEM_SAP::MALLOC_OPTIONS & -ACE_MEM_Acceptor::malloc_options (void) -{ - // @@ This function has been deprecated and will be removed in the - // future. - - return this->malloc_options_; -} - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/MEM_Connector.h b/dep/ACE_wrappers/ace/MEM_Connector.h index b9f46f2d8..7301ac8fb 100644 --- a/dep/ACE_wrappers/ace/MEM_Connector.h +++ b/dep/ACE_wrappers/ace/MEM_Connector.h @@ -4,7 +4,7 @@ /** * @file MEM_Connector.h * - * $Id: MEM_Connector.h 84816 2009-03-13 08:16:32Z johnnyw $ + * $Id: MEM_Connector.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Nanbor Wang */ @@ -141,10 +141,6 @@ public: /// Set the preferred signaling strategy. void preferred_strategy (ACE_MEM_IO::Signal_Strategy strategy); - /// Accessor to underlying malloc options. - /// @deprecated This method has been deprecated. - ACE_MEM_SAP::MALLOC_OPTIONS &malloc_options (void); - // = Meta-type info typedef ACE_INET_Addr PEER_ADDR; typedef ACE_MEM_Stream PEER_STREAM; diff --git a/dep/ACE_wrappers/ace/MEM_Connector.inl b/dep/ACE_wrappers/ace/MEM_Connector.inl index e61399ea9..e11132b5b 100644 --- a/dep/ACE_wrappers/ace/MEM_Connector.inl +++ b/dep/ACE_wrappers/ace/MEM_Connector.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: MEM_Connector.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: MEM_Connector.inl 91688 2010-09-09 11:21:50Z johnnyw $ // Establish a connection. @@ -18,13 +18,4 @@ ACE_MEM_Connector::preferred_strategy (ACE_MEM_IO::Signal_Strategy strategy) this->preferred_strategy_ = strategy; } -ACE_INLINE ACE_MEM_SAP::MALLOC_OPTIONS & -ACE_MEM_Connector::malloc_options (void) -{ - // @@ This function has been deprecated and will be removed in the - // future. - - return this->malloc_options_; -} - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/MEM_IO.cpp b/dep/ACE_wrappers/ace/MEM_IO.cpp index 4b373488e..679c91d31 100644 --- a/dep/ACE_wrappers/ace/MEM_IO.cpp +++ b/dep/ACE_wrappers/ace/MEM_IO.cpp @@ -1,5 +1,5 @@ // MEM_IO.cpp -// $Id: MEM_IO.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: MEM_IO.cpp 92069 2010-09-28 11:38:59Z johnnyw $ #include "ace/MEM_IO.h" #include "ace/Handle_Set.h" @@ -89,7 +89,7 @@ ACE_Reactive_MEM_IO::send_buf (ACE_MEM_SAP_Node *buf, flags, timeout) != static_cast (sizeof (offset))) { - // unsucessful send, release the memory in the shared-memory. + // unsuccessful send, release the memory in the shared-memory. this->release_buffer (buf); return -1; @@ -433,142 +433,6 @@ ACE_MEM_IO::send (const ACE_Message_Block *message_block, return 0; } - -#if 0 -ssize_t -ACE_MEM_IO::recvv (iovec *io_vec, - const ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_MEM_IO::recvv"); -#if defined (FIONREAD) - ACE_Handle_Set handle_set; - handle_set.reset (); - handle_set.set_bit (this->get_handle ()); - - io_vec->iov_base = 0; - - // Check the status of the current socket. - switch (ACE_OS::select (int (this->get_handle ()) + 1, - handle_set, - 0, 0, - timeout)) - { - case -1: - return -1; - /* NOTREACHED */ - case 0: - errno = ETIME; - return -1; - /* NOTREACHED */ - default: - // Goes fine, fallthrough to get data - break; - } - - int inlen; - - if (ACE_OS::ioctl (this->get_handle (), - FIONREAD, - &inlen) == -1) - return -1; - else if (inlen > 0) - { - ACE_NEW_RETURN (io_vec->iov_base, - char[inlen], - -1); - io_vec->iov_len = this->recv (io_vec->iov_base, - inlen); - return io_vec->iov_len; - } - else - return 0; -#else - ACE_UNUSED_ARG (io_vec); - ACE_UNUSED_ARG (timeout); - ACE_NOTSUP_RETURN (-1); -#endif /* FIONREAD */ -} - -// Send N char *ptrs and int lengths. Note that the char *'s precede -// the ints (basically, an varargs version of writev). The count N is -// the *total* number of trailing arguments, *not* a couple of the -// number of tuple pairs! - -ssize_t -ACE_MEM_IO::send (size_t n, ...) const -{ - ACE_TRACE ("ACE_MEM_IO::send"); - - va_list argp; - size_t total_tuples = n / 2; - iovec *iovp; -#if defined (ACE_HAS_ALLOCA) - iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); -#else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); -#endif /* !defined (ACE_HAS_ALLOCA) */ - - va_start (argp, n); - - for (size_t i = 0; i < total_tuples; i++) - { - iovp[i].iov_base = va_arg (argp, char *); - iovp[i].iov_len = va_arg (argp, ssize_t); - } - - ssize_t result = ACE_OS::sendv (this->get_handle (), - iovp, - total_tuples); -#if !defined (ACE_HAS_ALLOCA) - delete [] iovp; -#endif /* !defined (ACE_HAS_ALLOCA) */ - va_end (argp); - return result; -} - -// This is basically an interface to ACE_OS::readv, that doesn't use -// the struct iovec_Base explicitly. The ... can be passed as an arbitrary -// number of (char *ptr, int len) tuples. However, the count N is the -// *total* number of trailing arguments, *not* a couple of the number -// of tuple pairs! - -ssize_t -ACE_MEM_IO::recv (size_t n, ...) const -{ - ACE_TRACE ("ACE_MEM_IO::recv"); - - va_list argp; - size_t total_tuples = n / 2; - iovec *iovp; -#if defined (ACE_HAS_ALLOCA) - iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); -#else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); -#endif /* !defined (ACE_HAS_ALLOCA) */ - - va_start (argp, n); - - for (size_t i = 0; i < total_tuples; i++) - { - iovp[i].iov_base = va_arg (argp, char *); - iovp[i].iov_len = va_arg (argp, ssize_t); - } - - ssize_t result = ACE_OS::recvv (this->get_handle (), - iovp, - total_tuples); -#if !defined (ACE_HAS_ALLOCA) - delete [] iovp; -#endif /* !defined (ACE_HAS_ALLOCA) */ - va_end (argp); - return result; -} -#endif /* 0 */ - ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ diff --git a/dep/ACE_wrappers/ace/MEM_IO.inl b/dep/ACE_wrappers/ace/MEM_IO.inl index e3ec07fc5..5edc0128b 100644 --- a/dep/ACE_wrappers/ace/MEM_IO.inl +++ b/dep/ACE_wrappers/ace/MEM_IO.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: MEM_IO.inl 82559 2008-08-07 20:23:07Z parsons $ +// $Id: MEM_IO.inl 91813 2010-09-17 07:52:52Z johnnyw $ #include "ace/OS_NS_string.h" #include "ace/Truncate.h" @@ -129,7 +129,7 @@ ACE_MEM_IO::send (const void *buf, const ACE_Time_Value *timeout) { ACE_TRACE ("ACE_MEM_IO::send"); - + if (this->deliver_strategy_ == 0) { return 0; @@ -138,12 +138,12 @@ ACE_MEM_IO::send (const void *buf, ACE_MEM_SAP_Node *sbuf = this->deliver_strategy_->acquire_buffer ( ACE_Utils::truncate_cast (len)); - + if (sbuf == 0) { return -1; // Memory buffer not initialized. } - + ACE_OS::memcpy (sbuf->data (), buf, len); /// @@ -166,17 +166,17 @@ ACE_MEM_IO::recv (void *buf, size_t count = 0; size_t buf_len = this->buf_size_ - this->cur_offset_; - + if (buf_len == 0) { ssize_t blen = // Buffer length this->fetch_recv_buf (flags, timeout); - + if (blen <= 0) { return blen; } - + buf_len = this->buf_size_; } diff --git a/dep/ACE_wrappers/ace/MEM_SAP.h b/dep/ACE_wrappers/ace/MEM_SAP.h index 8694481cc..4ca6b7336 100644 --- a/dep/ACE_wrappers/ace/MEM_SAP.h +++ b/dep/ACE_wrappers/ace/MEM_SAP.h @@ -4,7 +4,7 @@ /** * @file MEM_SAP.h * - * $Id: MEM_SAP.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: MEM_SAP.h 92090 2010-09-29 14:10:45Z johnnyw $ * * @author Nanbor Wang */ @@ -42,11 +42,6 @@ class ACE_MEM_IO; class ACE_MEM_SAP_Node { public: -// friend class ACE_MEM_SAP; -// friend class ACE_Reactive_MEM_IO; -// friend class ACE_MT_MEM_IO; -// friend class ACE_MEM_IO; - typedef ACE_Based_Pointer ACE_MEM_SAP_NODE_PTR; /// Initialize the node with its capacity. diff --git a/dep/ACE_wrappers/ace/MEM_Stream.h b/dep/ACE_wrappers/ace/MEM_Stream.h index f0a2380c3..63ad2736a 100644 --- a/dep/ACE_wrappers/ace/MEM_Stream.h +++ b/dep/ACE_wrappers/ace/MEM_Stream.h @@ -4,7 +4,7 @@ /** * @file MEM_Stream.h * - * $Id: MEM_Stream.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: MEM_Stream.h 92069 2010-09-28 11:38:59Z johnnyw $ * * @author Nanbor Wang */ @@ -79,48 +79,6 @@ public: ssize_t send_n (const void *buf, size_t n, int flags); ssize_t recv_n (void *buf, size_t n, int flags); -#if 0 - /** - * Try to send exactly @a len bytes into @a buf from (uses - * the call). If blocks for longer than @a timeout the - * number of bytes actually sent is returned with @c errno == ETIME. - * If a timeout does not occur, return @a len (i.e., the - * number of bytes requested to be sent). - */ - ssize_t send_n (const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout); - - /** - * Try to recv exactly @a len bytes into @a buf from (uses - * the call). The ACE_Time_Value indicates how long - * to blocking trying to receive. If @a timeout == 0, the caller - * will block until action is possible, else will wait until the - * relative time specified in *@a timeout elapses). If blocks - * for longer than @a timeout the number of bytes actually read is - * returned with @c errno == ETIME. If a timeout does not occur, - * return @a len (i.e., the number of bytes requested to be - * read). - */ - ssize_t recv_n (void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout); - - /** - * Send an of size @a n to the connected socket (uses - * ). Will block until all bytes are sent or an error - * occurs. - */ - ssize_t sendv_n (const iovec iov[], - size_t n) const; - - /// Receive an of size @a n to the connected socket. - ssize_t recvv_n (iovec iov[], - size_t n) const; -#endif /* 0 */ - // = Selectively close endpoints. /// Close down the reader. diff --git a/dep/ACE_wrappers/ace/MEM_Stream.inl b/dep/ACE_wrappers/ace/MEM_Stream.inl index e995db5c5..d7cff06cb 100644 --- a/dep/ACE_wrappers/ace/MEM_Stream.inl +++ b/dep/ACE_wrappers/ace/MEM_Stream.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: MEM_Stream.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: MEM_Stream.inl 92069 2010-09-28 11:38:59Z johnnyw $ #include "ace/MEM_Stream.h" #include "ace/OS_NS_sys_socket.h" @@ -73,108 +73,4 @@ ACE_MEM_Stream::recv_n (void *buf, size_t n, int flags) return this->recv (buf, n, flags); } -#if 0 -ACE_INLINE ssize_t -ACE_MEM_Stream::recv_n (void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_MEM_Stream::recv_n"); - return ACE::recv_n (this->get_handle (), - buf, - len, - flags, - timeout); -} - -ACE_INLINE ssize_t -ACE_MEM_Stream::recv_n (void *buf, - size_t len, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_MEM_Stream::recv_n"); - return ACE::recv_n (this->get_handle (), - buf, - len, - timeout); -} - -ACE_INLINE ssize_t -ACE_MEM_Stream::recvv_n (iovec iov[], - size_t n, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_MEM_Stream::recvv_n"); - return ACE::recvv_n (this->get_handle (), - iov, - n, - timeout); -} - -ACE_INLINE ssize_t -ACE_MEM_Stream::send_n (const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_MEM_Stream::send_n"); - return ACE::send_n (this->get_handle (), - buf, - len, - flags, - timeout); -} - -ACE_INLINE ssize_t -ACE_MEM_Stream::send_n (const void *buf, - size_t len, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_MEM_Stream::send_n"); - return ACE::send_n (this->get_handle (), - buf, - len, - timeout); -} - -ACE_INLINE ssize_t -ACE_MEM_Stream::sendv_n (iovec iov[], - size_t n, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_MEM_Stream::sendv_n"); - return ACE::sendv_n (this->get_handle (), - iov, - n, - timeout); -} - -ACE_INLINE ssize_t -ACE_MEM_Stream::send_urg (const void *ptr, - size_t len, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_MEM_Stream::send_urg"); - return ACE::send (this->get_handle (), - ptr, - len, - MSG_OOB, - timeout); -} - -ACE_INLINE ssize_t -ACE_MEM_Stream::recv_urg (void *ptr, - size_t len, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_MEM_Stream::recv_urg"); - return ACE::recv (this->get_handle (), - ptr, - len, - MSG_OOB, - timeout); -} -#endif /* 0 */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Makefile.am b/dep/ACE_wrappers/ace/Makefile.am index c3fb7e2c7..189cb2034 100644 --- a/dep/ACE_wrappers/ace/Makefile.am +++ b/dep/ACE_wrappers/ace/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in ## -## $Id: Makefile.am 91577 2010-08-30 19:13:22Z johnnyw $ +## $Id: Makefile.am 92140 2010-10-04 12:37:52Z johnnyw $ ## ## This file was generated by MPC. Any changes made directly to ## this file will be lost the next time it is generated. @@ -377,7 +377,6 @@ nobase_include_HEADERS += \ Arg_Shifter.h \ Argv_Type_Converter.h \ Argv_Type_Converter.inl \ - Array.h \ Array_Base.cpp \ Array_Base.h \ Array_Base.inl \ @@ -694,7 +693,6 @@ nobase_include_HEADERS += \ Message_Queue_T.h \ Message_Queue_Vx.h \ Message_Queue_Vx.inl \ - Method_Object.h \ Method_Request.h \ Min_Max.h \ Module.cpp \ @@ -735,9 +733,6 @@ nobase_include_HEADERS += \ Null_Semaphore.h \ Numeric_Limits.h \ Obstack.h \ - OS.h \ - OS.inl \ - OS_Dirent.h \ OS_Errno.h \ OS_Errno.inl \ OS_Log_Msg_Attributes.h \ @@ -812,7 +807,6 @@ nobase_include_HEADERS += \ OS_NS_wctype.inl \ OS_NS_wchar.inl \ OS_QoS.h \ - OS_String.h \ OS_TLI.h \ OS_TLI.inl \ OS_Thread_Adapter.h \ @@ -833,7 +827,6 @@ nobase_include_HEADERS += \ POSIX_Proactor.inl \ Pagefile_Memory_Pool.h \ Pagefile_Memory_Pool.inl \ - Pair.h \ Pair_T.cpp \ Pair_T.h \ Pair_T.inl \ @@ -879,7 +872,6 @@ nobase_include_HEADERS += \ Recursive_Thread_Mutex.inl \ Recyclable.h \ Recyclable.inl \ - Refcountable.h \ Refcountable_T.cpp \ Refcountable_T.h \ Refcountable_T.inl \ @@ -1009,8 +1001,6 @@ nobase_include_HEADERS += \ Svc_Handler.h \ Synch.h \ Synch_Options.h \ - Synch_T.cpp \ - Synch_T.h \ Synch_Traits.h \ System_Time.h \ TLI.h \ @@ -1144,7 +1134,6 @@ nobase_include_HEADERS += \ config-minimal.h \ config-win32-borland.h \ config-win32-common.h \ - config-win32-ghs.h \ config-win32-msvc-7.h \ config-win32-msvc-8.h \ config-win32-msvc.h \ diff --git a/dep/ACE_wrappers/ace/Malloc_Base.h b/dep/ACE_wrappers/ace/Malloc_Base.h index d800c7fe5..35e466851 100644 --- a/dep/ACE_wrappers/ace/Malloc_Base.h +++ b/dep/ACE_wrappers/ace/Malloc_Base.h @@ -4,7 +4,7 @@ /** * @file Malloc_Base.h * - * $Id: Malloc_Base.h 91058 2010-07-12 08:20:09Z johnnyw $ + * $Id: Malloc_Base.h 92085 2010-09-29 12:23:13Z johnnyw $ * * @author Doug Schmidt and Irfan Pyarali */ @@ -85,7 +85,7 @@ public: * Associate @a name with @a pointer. If @a duplicates == 0 then do * not allow duplicate @a name/@a pointer associations, else if * @a duplicates != 0 then allow duplicate @a name/@a pointer - * assocations. Returns 0 if successfully binds (1) a previously + * associations. Returns 0 if successfully binds (1) a previously * unbound @a name or (2) @a duplicates != 0, returns 1 if trying to * bind a previously bound @a name and @a duplicates == 0, else * returns -1 if a resource failure occurs. diff --git a/dep/ACE_wrappers/ace/Malloc_T.cpp b/dep/ACE_wrappers/ace/Malloc_T.cpp index 5a2a1852b..88b456d66 100644 --- a/dep/ACE_wrappers/ace/Malloc_T.cpp +++ b/dep/ACE_wrappers/ace/Malloc_T.cpp @@ -1,4 +1,4 @@ -// $Id: Malloc_T.cpp 84282 2009-01-30 15:04:29Z msmit $ +// $Id: Malloc_T.cpp 91809 2010-09-17 07:20:41Z johnnyw $ #ifndef ACE_MALLOC_T_CPP #define ACE_MALLOC_T_CPP @@ -299,6 +299,18 @@ ACE_Allocator_Adapter::ACE_Allocator_Adapter (const char *pool_name) ACE_TRACE ("ACE_Allocator_Adapter::ACE_Allocator_Adapter"); } +template +ACE_Allocator_Adapter::ACE_Allocator_Adapter ( + const char *pool_name, + const char *lock_name, + MEMORY_POOL_OPTIONS options) + : allocator_ (ACE_TEXT_CHAR_TO_TCHAR (pool_name), + ACE_TEXT_CHAR_TO_TCHAR (lock_name), + options) +{ + ACE_TRACE ("ACE_Allocator_Adapter::ACE_Allocator_Adapter"); +} + #if defined (ACE_HAS_WCHAR) template ACE_Allocator_Adapter::ACE_Allocator_Adapter (const wchar_t *pool_name) @@ -306,6 +318,18 @@ ACE_Allocator_Adapter::ACE_Allocator_Adapter (const wchar_t *pool_name) { ACE_TRACE ("ACE_Allocator_Adapter::ACE_Allocator_Adapter"); } + +template +ACE_Allocator_Adapter::ACE_Allocator_Adapter ( + const wchar_t *pool_name, + const wchar_t *lock_name, + MEMORY_POOL_OPTIONS options) + : allocator_ (ACE_TEXT_WCHAR_TO_TCHAR (pool_name), + ACE_TEXT_WCHAR_TO_TCHAR (lock_name), + options) +{ + ACE_TRACE ("ACE_Allocator_Adapter::ACE_Allocator_Adapter"); +} #endif /* ACE_HAS_WCHAR */ template @@ -544,32 +568,6 @@ ACE_Malloc_T::ACE_Malloc_T (const ACE_TCHAR *p ACE_TEXT ("ACE_Malloc_T::ACE_Malloc_T"))); } -#if !defined (ACE_HAS_TEMPLATE_TYPEDEFS) -template -ACE_Malloc_T::ACE_Malloc_T (const ACE_TCHAR *pool_name, - const ACE_TCHAR *lock_name, - const void *options) - : cb_ptr_ (0), - memory_pool_ (pool_name, - (const ACE_MEM_POOL_OPTIONS *) options), - bad_flag_ (0) -{ - ACE_TRACE ("ACE_Malloc_T::ACE_Malloc_T"); - - this->lock_ = ACE_Malloc_Lock_Adapter_T ()(lock_name); - if (this->lock_ == 0) - return; - - this->delete_lock_ = true; - this->bad_flag_ = this->open (); - if (this->bad_flag_ == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Malloc_T::ACE_Malloc_T"))); -} -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - - template ACE_Malloc_T::~ACE_Malloc_T (void) { diff --git a/dep/ACE_wrappers/ace/Malloc_T.h b/dep/ACE_wrappers/ace/Malloc_T.h index 2d610eb59..3d170b722 100644 --- a/dep/ACE_wrappers/ace/Malloc_T.h +++ b/dep/ACE_wrappers/ace/Malloc_T.h @@ -4,7 +4,7 @@ /** * @file Malloc_T.h * - * $Id: Malloc_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Malloc_T.h 92085 2010-09-29 12:23:13Z johnnyw $ * * @author Douglas C. Schmidt and * Irfan Pyarali @@ -213,14 +213,7 @@ class ACE_Allocator_Adapter : public ACE_Allocator public: // Trait. typedef MALLOC ALLOCATOR; - -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) - // The following code will break C++ compilers that don't support - // template typedefs correctly. typedef const typename MALLOC::MEMORY_POOL_OPTIONS *MEMORY_POOL_OPTIONS; -#else - typedef const void *MEMORY_POOL_OPTIONS; -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ // = Initialization. /** @@ -233,17 +226,10 @@ public: * Note that @a pool_name should be located in * a directory with the appropriate visibility and protection so * that all processes that need to access it can do so. - * This constructor must be inline to avoid bugs with some C++ - * compilers. */ + */ ACE_Allocator_Adapter (const char *pool_name, const char *lock_name, - MEMORY_POOL_OPTIONS options = 0) - : allocator_ (ACE_TEXT_CHAR_TO_TCHAR (pool_name), - ACE_TEXT_CHAR_TO_TCHAR (lock_name), - options) - { - ACE_TRACE ("ACE_Allocator_Adapter::ACE_Allocator_Adapter"); - } + MEMORY_POOL_OPTIONS options = 0); #if defined (ACE_HAS_WCHAR) /** @@ -256,17 +242,10 @@ public: * Note that @a pool_name should be located in * a directory with the appropriate visibility and protection so * that all processes that need to access it can do so. - * This constructor must be inline to avoid bugs with some C++ - * compilers. */ + */ ACE_Allocator_Adapter (const wchar_t *pool_name, const wchar_t *lock_name, - MEMORY_POOL_OPTIONS options = 0) - : allocator_ (ACE_TEXT_WCHAR_TO_TCHAR (pool_name), - ACE_TEXT_WCHAR_TO_TCHAR (lock_name), - options) - { - ACE_TRACE ("ACE_Allocator_Adapter::ACE_Allocator_Adapter"); - } + MEMORY_POOL_OPTIONS options = 0); #endif /* ACE_HAS_WCHAR */ /// Destructor. @@ -298,7 +277,7 @@ public: * Associate @a name with @a pointer. If @a duplicates == 0 then do * not allow duplicate @a name/pointer associations, else if * @a duplicates != 0 then allow duplicate @a name/pointer - * assocations. Returns 0 if successfully binds (1) a previously + * associations. Returns 0 if successfully binds (1) a previously * unbound @a name or (2) @a duplicates != 0, returns 1 if trying to * bind a previously bound @a name and @a duplicates == 0, else * returns -1 if a resource failure occurs. @@ -497,14 +476,6 @@ public: const ACE_MEM_POOL_OPTIONS *options, ACE_LOCK *lock); -#if !defined (ACE_HAS_TEMPLATE_TYPEDEFS) - /// This is necessary to work around template bugs with certain C++ - /// compilers. - ACE_Malloc_T (const ACE_TCHAR *pool_name, - const ACE_TCHAR *lock_name, - const void *options = 0); -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - /// Destructor ~ACE_Malloc_T (void); @@ -544,7 +515,7 @@ public: * Associate @a name with @a pointer. If @a duplicates == 0 then do * not allow duplicate name/pointer associations, else if * @a duplicates != 0 then allow duplicate name/pointer - * assocations. Returns 0 if successfully binds (1) a previously + * associations. Returns 0 if successfully binds (1) a previously * unbound @a name or (2) @a duplicates != 0, returns 1 if trying to * bind a previously bound @a name and @a duplicates == 0, else * returns -1 if a resource failure occurs. @@ -747,8 +718,7 @@ public: * the set that hasn't yet been visited. Returns 0 when all items * have been seen, else 1. */ - int next (void *&next_entry, - const char *&name); + int next (void *&next_entry, const char *&name); /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. @@ -767,8 +737,10 @@ private: /// Keeps track of how far we've advanced... NAME_NODE *curr_; +// FUZZ: disable check_for_ACE_Guard /// Lock Malloc for the lifetime of the iterator. ACE_Read_Guard guard_; +// FUZZ: enable check_for_ACE_Guard /// Name that we are searching for. const char *name_; @@ -792,7 +764,6 @@ public: typedef typename ACE_CB::ACE_Name_Node NAME_NODE; typedef typename ACE_CB::ACE_Malloc_Header MALLOC_HEADER; - // = Initialization method. /// If @a name = 0 it will iterate through everything else only /// through those entries whose @a name match. ACE_Malloc_FIFO_Iterator_T (ACE_Malloc_T &malloc, @@ -815,8 +786,7 @@ public: * the set that hasn't yet been visited. Returns 0 when all items * have been seen, else 1. */ - int next (void *&next_entry, - const char *&name); + int next (void *&next_entry, const char *&name); /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. @@ -839,8 +809,10 @@ private: /// Keeps track of how far we've advanced... NAME_NODE *curr_; +// FUZZ: disable check_for_ACE_Guard /// Lock Malloc for the lifetime of the iterator. ACE_Read_Guard guard_; +// FUZZ: enable check_for_ACE_Guard /// Name that we are searching for. const char *name_; @@ -874,21 +846,12 @@ public: ACE_Malloc (const ACE_TCHAR *pool_name, const ACE_TCHAR *lock_name, const ACE_MEM_POOL_OPTIONS *options = 0); - -#if !defined (ACE_HAS_TEMPLATE_TYPEDEFS) - /// This is necessary to work around template bugs with certain C++ - /// compilers. - ACE_Malloc (const ACE_TCHAR *pool_name, - const ACE_TCHAR *lock_name, - const void *options = 0); -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ }; template class ACE_Malloc_LIFO_Iterator : public ACE_Malloc_LIFO_Iterator_T { public: - // = Initialization method. /// If @a name = 0 it will iterate through everything else only /// through those entries whose @a name match. ACE_Malloc_LIFO_Iterator (ACE_Malloc &malloc, @@ -899,7 +862,6 @@ template class ACE_Malloc_FIFO_Iterator : public ACE_Malloc_FIFO_Iterator_T { public: - // = Initialization method. /// If @a name = 0 it will iterate through everything else only /// through those entries whose @a name match. ACE_Malloc_FIFO_Iterator (ACE_Malloc &malloc, diff --git a/dep/ACE_wrappers/ace/Malloc_T.inl b/dep/ACE_wrappers/ace/Malloc_T.inl index 46f6c0c14..af4c491f7 100644 --- a/dep/ACE_wrappers/ace/Malloc_T.inl +++ b/dep/ACE_wrappers/ace/Malloc_T.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Malloc_T.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Malloc_T.inl 92069 2010-09-28 11:38:59Z johnnyw $ #include "ace/OS_NS_string.h" @@ -63,10 +63,6 @@ ACE_Malloc_T::release (int close) { int const retv = --this->cb_ptr_->ref_counter_; -#if 0 - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P) ACE_Malloc_T::release ->%d\n"), - this->cb_ptr_->ref_counter_ - 1)); -#endif /* 0 */ if (close) this->memory_pool_.release (0); @@ -144,16 +140,6 @@ ACE_Malloc::ACE_Malloc (const ACE_TCHAR *pool_name, { } -#if !defined (ACE_HAS_TEMPLATE_TYPEDEFS) -template ACE_INLINE -ACE_Malloc::ACE_Malloc (const ACE_TCHAR *pool_name, - const ACE_TCHAR *lock_name, - const void *options) - : ACE_Malloc_T (pool_name, lock_name, options) -{ -} -#endif /* !ACE_HAS_TEMPLATE_TYPEDEFS */ - template ACE_INLINE ACE_Malloc_LIFO_Iterator::ACE_Malloc_LIFO_Iterator (ACE_Malloc &malloc, const char *name) @@ -168,17 +154,4 @@ ACE_Malloc_FIFO_Iterator::ACE_Malloc_FIFO_Iterator (AC { } - -#if 0 -template ACE_INLINE void -ACE_Malloc_T::init_malloc_header_ptr (void* ptr) -{ -#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) - new (ptr) ACE_MALLOC_HEADER_PTR (this->cb_ptr_, 0); -#else - ACE_UNUSED_ARG (ptr); -#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ -} -#endif /* 0 */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Map.h b/dep/ACE_wrappers/ace/Map.h deleted file mode 100644 index ec675fb1f..000000000 --- a/dep/ACE_wrappers/ace/Map.h +++ /dev/null @@ -1,32 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Map.h - * - * $Id: Map.h 80826 2008-03-04 14:51:23Z wotte $ - * - * Backward compatibility header. - * - * @author Irfan Pyarali - */ -//============================================================================= - - -#ifndef ACE_MAP_H -#define ACE_MAP_H - -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Include the templates here. -#include "ace/Map_T.h" - -#include /**/ "ace/post.h" - -#endif /* ACE_MAP_H */ diff --git a/dep/ACE_wrappers/ace/Map_Manager.cpp b/dep/ACE_wrappers/ace/Map_Manager.cpp index f1c8fbd63..54b7faf95 100644 --- a/dep/ACE_wrappers/ace/Map_Manager.cpp +++ b/dep/ACE_wrappers/ace/Map_Manager.cpp @@ -1,4 +1,4 @@ -// $Id: Map_Manager.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Map_Manager.cpp 91809 2010-09-17 07:20:41Z johnnyw $ #ifndef ACE_MAP_MANAGER_CPP #define ACE_MAP_MANAGER_CPP @@ -640,38 +640,6 @@ ACE_Map_Const_Iterator_Base::dump_i (void) const #endif /* ACE_HAS_DUMP */ } -template -ACE_Map_Entry& -ACE_Map_Iterator_Base::operator* (void) const -{ - // @@ This function should be inlined. We moved it here to avoid a - // compiler bug in SunCC 4.2. Once we know the correct patch to fix - // the compiler problem, it should be moved back to .i file again. - ACE_Map_Entry *retv = 0; - - int result = this->next (retv); - ACE_ASSERT (result != 0); - ACE_UNUSED_ARG (result); - - return *retv; -} - -template -ACE_Map_Entry& -ACE_Map_Const_Iterator_Base::operator* (void) const -{ - // @@ This function should be inlined. We moved it here to avoid a - // compiler bug in SunCC 4.2. Once we know the correct patch to fix - // the compiler problem, it should be moved back to .i file again. - ACE_Map_Entry *retv = 0; - - int result = this->next (retv); - ACE_ASSERT (result != 0); - ACE_UNUSED_ARG (result); - - return *retv; -} - template void ACE_Map_Iterator::dump (void) const { diff --git a/dep/ACE_wrappers/ace/Map_Manager.h b/dep/ACE_wrappers/ace/Map_Manager.h index 23fd343c2..4423fa026 100644 --- a/dep/ACE_wrappers/ace/Map_Manager.h +++ b/dep/ACE_wrappers/ace/Map_Manager.h @@ -4,7 +4,7 @@ /** * @file Map_Manager.h * - * $Id: Map_Manager.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: Map_Manager.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -569,8 +569,8 @@ protected: * ACE_Map_Manager it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Map_Manager's - * internal lock, which is accessible via its method. + * ACE_GUARD or ACE_READ_GUARD on the ACE_Map_Manager's + * internal lock, which is accessible via its mutex() method. */ template class ACE_Map_Iterator : public ACE_Map_Iterator_Base @@ -616,8 +616,8 @@ public: * ACE_Map_Manager it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Map_Manager's - * internal lock, which is accessible via its method. + * ACE_GUARD or ACE_READ_GUARD on the ACE_Map_Manager's + * internal lock, which is accessible via its mutex() method. */ template class ACE_Map_Const_Iterator : public ACE_Map_Const_Iterator_Base @@ -663,8 +663,8 @@ public: * ACE_Map_Manager it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Map_Manager's - * internal lock, which is accessible via its method. + * ACE_GUARD or ACE_READ_GUARD on the ACE_Map_Manager's + * internal lock, which is accessible via its mutex() method. */ template class ACE_Map_Reverse_Iterator : public ACE_Map_Iterator_Base diff --git a/dep/ACE_wrappers/ace/Map_Manager.inl b/dep/ACE_wrappers/ace/Map_Manager.inl index 62502c1c4..9aafdd854 100644 --- a/dep/ACE_wrappers/ace/Map_Manager.inl +++ b/dep/ACE_wrappers/ace/Map_Manager.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Map_Manager.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Map_Manager.inl 91809 2010-09-17 07:20:41Z johnnyw $ #include "ace/Guard_T.h" #include "ace/Log_Msg.h" @@ -726,4 +726,31 @@ ACE_Map_Reverse_Iterator::operator-- (int) return retv; } +template ACE_INLINE +ACE_Map_Entry& +ACE_Map_Iterator_Base::operator* (void) const +{ + ACE_Map_Entry *retv = 0; + + int const result = this->next (retv); + ACE_ASSERT (result != 0); + ACE_UNUSED_ARG (result); + + return *retv; +} + +template ACE_INLINE +ACE_Map_Entry& +ACE_Map_Const_Iterator_Base::operator* (void) const +{ + ACE_Map_Entry *retv = 0; + + int const result = this->next (retv); + ACE_ASSERT (result != 0); + ACE_UNUSED_ARG (result); + + return *retv; +} + + ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Map_T.cpp b/dep/ACE_wrappers/ace/Map_T.cpp index ef3184c5c..ff22dfa74 100644 --- a/dep/ACE_wrappers/ace/Map_T.cpp +++ b/dep/ACE_wrappers/ace/Map_T.cpp @@ -1,4 +1,4 @@ -// $Id: Map_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Map_T.cpp 92097 2010-09-30 05:41:49Z msmit $ #ifndef ACE_MAP_T_CPP #define ACE_MAP_T_CPP @@ -340,8 +340,8 @@ ACE_Active_Map_Manager_Iterator_Adapter::dereference () const { // The following syntax is necessary to work around certain broken compilers. // In particular, please do not prefix implementation_ with this-> - return T ((*implementation_).int_id_.first (), - (*implementation_).int_id_.second ()); + return T ((*implementation_).int_id_.first, + (*implementation_).int_id_.second); } template void @@ -386,8 +386,8 @@ ACE_Active_Map_Manager_Reverse_Iterator_Adapter::dereference () const { // The following syntax is necessary to work around certain broken compilers. // In particular, please do not prefix implementation_ with this-> - return T ((*implementation_).int_id_.first (), - (*implementation_).int_id_.second ()); + return T ((*implementation_).int_id_.first, + (*implementation_).int_id_.second); } template void @@ -443,13 +443,13 @@ ACE_Active_Map_Manager_Adapter::bind_modify_key (const // of . result = this->key_adapter_.encode (key, active_key, - internal_value->first ()); + internal_value->first); if (result == 0) { // Copy user value into . - internal_value->second (value); + internal_value->second = value; // Copy new, modified key back to the user key. - key = internal_value->first (); + key = internal_value->first; } else { @@ -479,15 +479,15 @@ ACE_Active_Map_Manager_Adapter::bind_create_key (const if (result == 0) { // Encode the active key into key part of . - result = this->key_adapter_.encode (internal_value->first (), + result = this->key_adapter_.encode (internal_value->first, active_key, - internal_value->first ()); + internal_value->first); if (result == 0) { // Copy user value into . - internal_value->second (value); + internal_value->second = value; // Copy new, modified key to the user key. - key = internal_value->first (); + key = internal_value->first; } else { @@ -510,13 +510,13 @@ ACE_Active_Map_Manager_Adapter::bind_create_key (const if (result == 0) { // Encode the active key into key part of . - result = this->key_adapter_.encode (internal_value->first (), + result = this->key_adapter_.encode (internal_value->first, active_key, - internal_value->first ()); + internal_value->first); if (result == 0) { // Copy user value into . - internal_value->second (value); + internal_value->second = value; } else { @@ -567,7 +567,7 @@ ACE_Active_Map_Manager_Adapter::find (const KEY &key, if (result == 0) { // Copy value. - value = internal_value->second (); + value = internal_value->second; } return result; @@ -592,7 +592,7 @@ ACE_Active_Map_Manager_Adapter::rebind (const KEY &key, if (result == 0) { // Reset value. - internal_value->second (value); + internal_value->second = value; } return result; @@ -610,10 +610,10 @@ ACE_Active_Map_Manager_Adapter::rebind (const KEY &key, if (result == 0) { // Copy old value. - old_value = internal_value->second (); + old_value = internal_value->second; // Reset to new value. - internal_value->second (value); + internal_value->second = value; } return result; @@ -632,11 +632,11 @@ ACE_Active_Map_Manager_Adapter::rebind (const KEY &key, if (result == 0) { // Copy old key and value. - old_key = internal_value->first (); - old_value = internal_value->second (); + old_key = internal_value->first; + old_value = internal_value->second; // Reset to new value. - internal_value->second (value); + internal_value->second = value; } return result; @@ -686,7 +686,7 @@ ACE_Active_Map_Manager_Adapter::unbind (const KEY &key, if (result == 0) { // Copy value. - value = internal_value->second (); + value = internal_value->second; } return result; diff --git a/dep/ACE_wrappers/ace/Map_T.h b/dep/ACE_wrappers/ace/Map_T.h index 0b400e20b..bb5965a76 100644 --- a/dep/ACE_wrappers/ace/Map_T.h +++ b/dep/ACE_wrappers/ace/Map_T.h @@ -4,7 +4,7 @@ /** * @file Map_T.h * - * $Id: Map_T.h 84316 2009-02-03 19:46:05Z johnnyw $ + * $Id: Map_T.h 92097 2010-09-30 05:41:49Z msmit $ * * @author Irfan Pyarali */ @@ -14,10 +14,10 @@ #define ACE_MAP_T_H #include /**/ "ace/pre.h" -#include "ace/Pair_T.h" #include "ace/Map_Manager.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/Active_Map_Manager.h" +#include "ace/Pair_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -830,7 +830,7 @@ class ACE_Active_Map_Manager_Adapter : public ACE_Map public: // = Traits. - typedef ACE_Pair + typedef std::pair expanded_value; typedef ACE_Active_Map_Manager_Iterator_Adapter, expanded_value> iterator_impl; @@ -983,7 +983,7 @@ public: virtual void dump (void) const; /// Accessor to implementation object. - ACE_Active_Map_Manager > &impl (void); + ACE_Active_Map_Manager > &impl (void); /// Accessor to key adapter. KEY_ADAPTER &key_adapter (void); @@ -999,7 +999,7 @@ protected: expanded_value *&internal_value); /// All implementation details are forwarded to this class. - ACE_Active_Map_Manager > implementation_; + ACE_Active_Map_Manager > implementation_; /// Adapts between the user key and the Active_Map_Manager_Key. KEY_ADAPTER key_adapter_; diff --git a/dep/ACE_wrappers/ace/Map_T.inl b/dep/ACE_wrappers/ace/Map_T.inl index adf32eb91..a9a0eb796 100644 --- a/dep/ACE_wrappers/ace/Map_T.inl +++ b/dep/ACE_wrappers/ace/Map_T.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Map_T.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Map_T.inl 92097 2010-09-30 05:41:49Z msmit $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -300,7 +300,7 @@ ACE_Active_Map_Manager_Adapter::ACE_Active_Map_Manager_ { } -template ACE_INLINE ACE_Active_Map_Manager > & +template ACE_INLINE ACE_Active_Map_Manager > & ACE_Active_Map_Manager_Adapter::impl (void) { return this->implementation_; diff --git a/dep/ACE_wrappers/ace/Message_Queue.h b/dep/ACE_wrappers/ace/Message_Queue.h index 348cccfaf..eca4a3760 100644 --- a/dep/ACE_wrappers/ace/Message_Queue.h +++ b/dep/ACE_wrappers/ace/Message_Queue.h @@ -4,7 +4,7 @@ /** * @file Message_Queue.h * - * $Id: Message_Queue.h 88560 2010-01-15 05:02:05Z schmidt $ + * $Id: Message_Queue.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -64,13 +64,9 @@ public: // and WAS_INACTIVE are defined to match previous semantics for // applications that don't use the PULSED state. - /// @deprecated Use ACTIVATED instead. - WAS_ACTIVE = 1, /// Message queue is active and processing normally ACTIVATED = 1, - /// @deprecated Use DEACTIVATED instead. - WAS_INACTIVE = 2, /// Queue is deactivated; no enqueue or dequeue operations allowed. DEACTIVATED = 2, diff --git a/dep/ACE_wrappers/ace/Message_Queue_T.cpp b/dep/ACE_wrappers/ace/Message_Queue_T.cpp index a33bac23e..922c5ab83 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_T.cpp +++ b/dep/ACE_wrappers/ace/Message_Queue_T.cpp @@ -1,4 +1,4 @@ -// $Id: Message_Queue_T.cpp 91016 2010-07-06 11:29:50Z johnnyw $ +// $Id: Message_Queue_T.cpp 91633 2010-09-07 14:27:13Z johnnyw $ #ifndef ACE_MESSAGE_QUEUE_T_CPP #define ACE_MESSAGE_QUEUE_T_CPP @@ -1699,7 +1699,7 @@ ACE_Message_Queue::peek_dequeue_head (ACE_Message_Block *&first_i // Wait for at least one item to become available. - if (this->wait_not_empty_cond (ace_mon, timeout) == -1) + if (this->wait_not_empty_cond (timeout) == -1) return -1; first_item = this->head_; @@ -1707,8 +1707,7 @@ ACE_Message_Queue::peek_dequeue_head (ACE_Message_Block *&first_i } template int -ACE_Message_Queue::wait_not_full_cond (ACE_Guard &, - ACE_Time_Value *timeout) +ACE_Message_Queue::wait_not_full_cond (ACE_Time_Value *timeout) { int result = 0; @@ -1734,8 +1733,7 @@ ACE_Message_Queue::wait_not_full_cond (ACE_Guard int -ACE_Message_Queue::wait_not_empty_cond - (ACE_Guard &, ACE_Time_Value *timeout) +ACE_Message_Queue::wait_not_empty_cond (ACE_Time_Value *timeout) { int result = 0; @@ -1779,7 +1777,7 @@ ACE_Message_Queue::enqueue_head (ACE_Message_Block *new_item, return -1; } - if (this->wait_not_full_cond (ace_mon, timeout) == -1) + if (this->wait_not_full_cond (timeout) == -1) return -1; queue_count = this->enqueue_head_i (new_item); @@ -1817,7 +1815,7 @@ ACE_Message_Queue::enqueue_prio (ACE_Message_Block *new_item, return -1; } - if (this->wait_not_full_cond (ace_mon, timeout) == -1) + if (this->wait_not_full_cond (timeout) == -1) return -1; queue_count = this->enqueue_i (new_item); @@ -1855,7 +1853,7 @@ ACE_Message_Queue::enqueue_deadline (ACE_Message_Block *new_item, return -1; } - if (this->wait_not_full_cond (ace_mon, timeout) == -1) + if (this->wait_not_full_cond (timeout) == -1) return -1; queue_count = this->enqueue_deadline_i (new_item); @@ -1900,7 +1898,7 @@ ACE_Message_Queue::enqueue_tail (ACE_Message_Block *new_item, return -1; } - if (this->wait_not_full_cond (ace_mon, timeout) == -1) + if (this->wait_not_full_cond (timeout) == -1) return -1; queue_count = this->enqueue_tail_i (new_item); @@ -1935,7 +1933,7 @@ ACE_Message_Queue::dequeue_head (ACE_Message_Block *&first_item, return -1; } - if (this->wait_not_empty_cond (ace_mon, timeout) == -1) + if (this->wait_not_empty_cond (timeout) == -1) return -1; return this->dequeue_head_i (first_item); @@ -1958,7 +1956,7 @@ ACE_Message_Queue::dequeue_prio (ACE_Message_Block *&dequeued, return -1; } - if (this->wait_not_empty_cond (ace_mon, timeout) == -1) + if (this->wait_not_empty_cond (timeout) == -1) return -1; return this->dequeue_prio_i (dequeued); @@ -1981,7 +1979,7 @@ ACE_Message_Queue::dequeue_tail (ACE_Message_Block *&dequeued, return -1; } - if (this->wait_not_empty_cond (ace_mon, timeout) == -1) + if (this->wait_not_empty_cond (timeout) == -1) return -1; return this->dequeue_tail_i (dequeued); @@ -2004,7 +2002,7 @@ ACE_Message_Queue::dequeue_deadline (ACE_Message_Block *&dequeued return -1; } - if (this->wait_not_empty_cond (ace_mon, timeout) == -1) + if (this->wait_not_empty_cond (timeout) == -1) return -1; return this->dequeue_deadline_i (dequeued); @@ -2215,7 +2213,7 @@ ACE_Dynamic_Message_Queue::dequeue_head (ACE_Message_Block *&firs return result; // *now* it's appropriate to wait for an enqueued item - result = this->wait_not_empty_cond (ace_mon, timeout); + result = this->wait_not_empty_cond (timeout); if (result == -1) return result; diff --git a/dep/ACE_wrappers/ace/Message_Queue_T.h b/dep/ACE_wrappers/ace/Message_Queue_T.h index e1e9953e8..73e462676 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_T.h +++ b/dep/ACE_wrappers/ace/Message_Queue_T.h @@ -4,7 +4,7 @@ /** * @file Message_Queue_T.h * - * $Id: Message_Queue_T.h 82289 2008-07-11 08:12:09Z hillj $ + * $Id: Message_Queue_T.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -557,12 +557,10 @@ protected: // = Helper methods to factor out common #ifdef code. /// Wait for the queue to become non-full. - virtual int wait_not_full_cond (ACE_Guard &mon, - ACE_Time_Value *timeout); + virtual int wait_not_full_cond (ACE_Time_Value *timeout); /// Wait for the queue to become non-empty. - virtual int wait_not_empty_cond (ACE_Guard &mon, - ACE_Time_Value *timeout); + virtual int wait_not_empty_cond (ACE_Time_Value *timeout); /// Inform any threads waiting to enqueue that they can procede. virtual int signal_enqueue_waiters (void); diff --git a/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp b/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp index 4357859f7..0c680b035 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp +++ b/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp @@ -1,4 +1,4 @@ -// $Id: Message_Queue_Vx.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Message_Queue_Vx.cpp 91626 2010-09-07 10:59:20Z johnnyw $ #include "ace/Message_Queue_Vx.h" #include "ace/Log_Msg.h" @@ -328,24 +328,16 @@ ACE_Message_Queue_Vx::dequeue_deadline_i (ACE_Message_Block *& /*dequeued*/) // Take a look at the first item without removing it. int -ACE_Message_Queue_Vx::wait_not_full_cond (ACE_Guard &mon, - ACE_Time_Value *tv) +ACE_Message_Queue_Vx::wait_not_full_cond (ACE_Time_Value *) { // Always return here, and let the VxWorks message queue handle blocking. - ACE_UNUSED_ARG (mon); - ACE_UNUSED_ARG (tv); - return 0; } int -ACE_Message_Queue_Vx::wait_not_empty_cond (ACE_Guard &mon, - ACE_Time_Value *tv) +ACE_Message_Queue_Vx::wait_not_empty_cond (ACE_Time_Value *) { // Always return here, and let the VxWorks message queue handle blocking. - ACE_UNUSED_ARG (mon); - ACE_UNUSED_ARG (tv); - return 0; } diff --git a/dep/ACE_wrappers/ace/Message_Queue_Vx.h b/dep/ACE_wrappers/ace/Message_Queue_Vx.h index 5dd65c124..39dac1321 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_Vx.h +++ b/dep/ACE_wrappers/ace/Message_Queue_Vx.h @@ -4,7 +4,7 @@ /** * @file Message_Queue_Vx.h * - * $Id: Message_Queue_Vx.h 85579 2009-06-08 18:46:54Z mitza $ + * $Id: Message_Queue_Vx.h 91743 2010-09-13 18:24:51Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -107,6 +107,7 @@ public: * the message block sizes. */ virtual void message_bytes (size_t new_size); + /** * New value of the number of total length on the queue, i.e., sum * of the message block lengths. @@ -136,10 +137,10 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// Enqueue an in accordance with its priority. + /// Enqueue an ACE_Message_Block * in accordance with its priority. virtual int enqueue_i (ACE_Message_Block *new_item); - /// Enqueue an in accordance with its deadline time. + /// Enqueue an ACE_Message_Block * in accordance with its deadline time. virtual int enqueue_deadline_i (ACE_Message_Block *new_item); /// Enqueue an at the end of the queue. @@ -177,12 +178,10 @@ protected: // = Helper methods to factor out common #ifdef code. /// Wait for the queue to become non-full. - virtual int wait_not_full_cond (ACE_Guard &mon, - ACE_Time_Value *tv); + virtual int wait_not_full_cond (ACE_Time_Value *tv); /// Wait for the queue to become non-empty. - virtual int wait_not_empty_cond (ACE_Guard &mon, - ACE_Time_Value *tv); + virtual int wait_not_empty_cond (ACE_Time_Value *tv); /// Inform any threads waiting to enqueue that they can procede. virtual int signal_enqueue_waiters (void); diff --git a/dep/ACE_wrappers/ace/Method_Object.h b/dep/ACE_wrappers/ace/Method_Object.h deleted file mode 100644 index 5af98f531..000000000 --- a/dep/ACE_wrappers/ace/Method_Object.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Method_Object.h - * - * $Id: Method_Object.h 80826 2008-03-04 14:51:23Z wotte $ - * - * This file just #includes "ace/Method_Request.h" and is just here - * for backwards compatibility with earlier versions of ACE. - * Please don't use it directly since it may go away at some point. - * - * - * @author Douglas C. Schmidt - */ -//============================================================================= - - -#ifndef ACE_METHOD_OBJECT_H -#define ACE_METHOD_OBJECT_H -#include /**/ "ace/pre.h" - -#include "ace/Method_Request.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -// Maintain backwards compatibility so that Steve Huston doesn't go -// postal... ;-) -typedef ACE_Method_Request ACE_Method_Object; - -ACE_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* ACE_METHOD_OBJECT_H */ diff --git a/dep/ACE_wrappers/ace/Metrics_Cache_T.cpp b/dep/ACE_wrappers/ace/Metrics_Cache_T.cpp index f94c3f063..a1bca24d7 100644 --- a/dep/ACE_wrappers/ace/Metrics_Cache_T.cpp +++ b/dep/ACE_wrappers/ace/Metrics_Cache_T.cpp @@ -1,4 +1,4 @@ -// $Id: Metrics_Cache_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Metrics_Cache_T.cpp 92090 2010-09-29 14:10:45Z johnnyw $ #ifndef ACE_METRICS_CACHE_CPP #define ACE_METRICS_CACHE_CPP @@ -15,8 +15,7 @@ #include "ace/Metrics_Cache_T.inl" #endif /* __ACE_INLINE__ */ -// Const strings for timeprobe event type descriptions. - +/// Const strings for timeprobe event type descriptions. static const char * event_description_strings [] = { "start", @@ -169,7 +168,7 @@ flush_ACE_Metrics_Timeprobe () template ACE_Metrics_Cache:: ACE_Metrics_Cache (u_long table_size, - u_long number_of_probes, + u_long, ALLOCATOR *alloc) : probe_set_size_ (0), enqueue_names_ (0), @@ -183,7 +182,6 @@ ACE_Metrics_Cache (u_long table_size, metrics_enabled_(1), allocator_ (alloc) { - ACE_UNUSED_ARG(number_of_probes); // Initialize probe and count arrays. // Ensure that the high res timer global scale factor @@ -207,7 +205,6 @@ ACE_Metrics_Cache::~ACE_Metrics_Cache () { } - // Obtain an allocator pointer correctly thunked for the current // address space. If there is no allocator stored in the instance, // the singleton allocator in the current process is used. diff --git a/dep/ACE_wrappers/ace/Metrics_Cache_T.h b/dep/ACE_wrappers/ace/Metrics_Cache_T.h index dba5c961c..5cf438a13 100644 --- a/dep/ACE_wrappers/ace/Metrics_Cache_T.h +++ b/dep/ACE_wrappers/ace/Metrics_Cache_T.h @@ -4,7 +4,7 @@ /** * @file Metrics_Cache_T.h * - * $Id: Metrics_Cache_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Metrics_Cache_T.h 92090 2010-09-29 14:10:45Z johnnyw $ * * @author Chris Gill */ @@ -64,43 +64,43 @@ public: WORK_RESUME = 3 }; - // Default constructor: plugs in the above event descriptions. + /// Default constructor: plugs in the above event descriptions. ACE_Metrics_Timeprobe (u_int id = 0, const char *name = 0, u_long size = METRICS_DEFAULT_TIMEPROBE_TABLE_SIZE); - // Constructor with allocator: plugs in the above event descriptions. + /// Constructor with allocator: plugs in the above event descriptions. ACE_Metrics_Timeprobe (ALLOCATOR *allocatorPtr, u_int id = 0, const char *name = 0, u_long size = METRICS_DEFAULT_TIMEPROBE_TABLE_SIZE); - // Destructor. + /// Destructor. virtual ~ACE_Metrics_Timeprobe (); - // Returns true if a timeprobe event matches the passed id. + /// Returns true if a timeprobe event matches the passed id. int is_event (const ACE_METRICS_TIMEPROBE_DATA_TYPE &t, ACE_Metrics_Timeprobe::event_id id); - // Accessor and mutator for probe name. + /// Accessor and mutator for probe name. const char * probe_name (void); void probe_name (char * name); - // Accessor for probe id. + /// Accessor for probe id. u_int probe_id (void); - // Mutator for probe id. + /// Mutator for probe id. void probe_id (u_int id); - // Flush the ACE metrics timeprobe into shared memory. + /// Flush the ACE metrics timeprobe into shared memory. void flush_ACE_Metrics_Timeprobe (); protected: - // Identifier for the timeprobe. + /// Identifier for the timeprobe. u_int id_; - // Name of the timeprobe. + /// Name of the timeprobe. char* name_; private: @@ -125,98 +125,98 @@ public: typedef ACE_Metrics_Cache ACE_METRICS_CACHE_TYPE; - // Default constructor. + /// Default constructor. ACE_Metrics_Cache (u_long table_size = METRICS_DEFAULT_TIMEPROBE_TABLE_SIZE, u_long number_of_probes = METRICS_DEFAULT_TIMEPROBE_COUNT, ALLOCATOR * allocatorPtr = (ALLOCATOR*)ALLOCATOR::instance()); - // Destructor. + /// Destructor. ~ACE_Metrics_Cache (); // = Dispatching metrics. - // Report start, stop, suspend, and resume times of a dispatch - // enqueue: stores data metrics on the supplier side. + /// Report start, stop, suspend, and resume times of a dispatch + /// enqueue: stores data metrics on the supplier side. void report_enqueue_start (u_long i); void report_enqueue_stop (u_long i); void report_enqueue_suspend (u_long i); void report_enqueue_resume (u_long i); - // Report start, stop, suspend, and resume times of a dispatch - // dequeue: stores data metrics on the supplier side.. + /// Report start, stop, suspend, and resume times of a dispatch + /// dequeue: stores data metrics on the supplier side.. void report_dequeue_start (u_long i); void report_dequeue_stop (u_long i); void report_dequeue_suspend (u_long i); void report_dequeue_resume (u_long i); - // Reset the metrics data on the consumer side. + /// Reset the metrics data on the consumer side. void reset_base_statistics (); - // Flips the supplier and consumer sides. + /// Flips the supplier and consumer sides. void flip_supplier_and_consumer (); - // Flush the ACE metrics cache into shared memory. + /// Flush the ACE metrics cache into shared memory. void flush_ACE_Metrics_Cache (); - // Set the enable state for metrics collection. + /// Set the enable state for metrics collection. void metrics_enabled(int enabled); - // Return the enable state for metrics collection. + /// Return the enable state for metrics collection. int metrics_enabled(void) const; protected: - // Obtain an allocator pointer correctly thunked for the current - // address space. If there is no allocator stored in the instance, - // the singleton allocator in the current process is used. + /// Obtain an allocator pointer correctly thunked for the current + /// address space. If there is no allocator stored in the instance, + /// the singleton allocator in the current process is used. ALLOCATOR * allocator (void); // = Implementation members. - // Number of probes in each supplier/consumer set. + /// Number of probes in each supplier/consumer set. u_long probe_set_size_; - // Probe data counts for each supplier/consumer set. + /// Probe data counts for each supplier/consumer set. u_long * enqueue_count_ [2]; u_long * dequeue_count_ [2]; - // Probes for each supplier/consumer set. + /// Probes for each supplier/consumer set. ACE_Metrics_Timeprobe ** enqueue_probes_ [2]; ACE_Metrics_Timeprobe ** dequeue_probes_ [2]; - // Names for the probes. + /// Names for the probes. char ** enqueue_names_; char ** dequeue_names_; - // Index from which probe events are being consumed. - // for WSOA, it's the data being sent to the logger + /// Index from which probe events are being consumed. + /// for WSOA, it's the data being sent to the logger int consumer_index_; - // Index to which probe events are being supplied. - // for WSOA, it's the data being recorded from the probes + /// Index to which probe events are being supplied. + /// for WSOA, it's the data being recorded from the probes int supplier_index_; - // Size of the timestamp table in each probe. + /// Size of the timestamp table in each probe. u_long table_size_; - // Interval start and stop timestamps. + /// Interval start and stop timestamps. ACE_Time_Value interval_start_; - // Interval start and stop timestamps. + /// Interval start and stop timestamps. ACE_Time_Value interval_end_; - // Flag to indicate whether or not start time of interval has been - // initialized since the last reset. + /// Flag to indicate whether or not start time of interval has been + /// initialized since the last reset. int interval_initialized_; - // Indicator of whether metrics is enabled. + /// Indicator of whether metrics is enabled. int metrics_enabled_; private: - // Allocation strategy object. + /// Allocation strategy object. ALLOCATOR* allocator_; // Declare but do not define. diff --git a/dep/ACE_wrappers/ace/Metrics_Cache_T.inl b/dep/ACE_wrappers/ace/Metrics_Cache_T.inl index 790aa3db0..d96df13f9 100644 --- a/dep/ACE_wrappers/ace/Metrics_Cache_T.inl +++ b/dep/ACE_wrappers/ace/Metrics_Cache_T.inl @@ -1,10 +1,12 @@ // -*- C++ -*- // -// $Id: Metrics_Cache_T.inl 83735 2008-11-14 09:41:52Z johnnyw $ +// $Id: Metrics_Cache_T.inl 92090 2010-09-29 14:10:45Z johnnyw $ #ifndef ACE_METRICS_CACHE_T_INL #define ACE_METRICS_CACHE_T_INL +#if defined (ACE_COMPILE_TIMEPROBES) + ACE_BEGIN_VERSIONED_NAMESPACE_DECL ///////////////////////////// @@ -237,4 +239,6 @@ ACE_Metrics_Cache::metrics_enabled(void) const ACE_END_VERSIONED_NAMESPACE_DECL +#endif + #endif /* ACE_METRICS_CACHE_T_INL */ diff --git a/dep/ACE_wrappers/ace/Module.h b/dep/ACE_wrappers/ace/Module.h index 4ae5c285d..a7e4575e5 100644 --- a/dep/ACE_wrappers/ace/Module.h +++ b/dep/ACE_wrappers/ace/Module.h @@ -4,7 +4,7 @@ /** * @file Module.h * - * $Id: Module.h 85417 2009-05-22 08:31:42Z johnnyw $ + * $Id: Module.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -43,22 +43,22 @@ public: /// Indicates that the flags have not been set M_FLAGS_NOT_SET = 0, - /// Indicates that should delete the writer Task. + /// Indicates that close() should delete the writer Task. M_DELETE_READER = 1, - /// Indicates that should delete the reader Task. + /// Indicates that close() should delete the reader Task. M_DELETE_WRITER = 2, - /// Indicates that deletes the Tasks. + /// Indicates that close() deletes the Tasks. /** * Don't change this value without updating the same enum in class * ACE_Stream... - * The and flags may be or'ed + * The M_DELETE_READER and M_DELETE_WRITER flags may be or'ed * together. */ M_DELETE = 3, - /// Indicates that should not delete any Tasks. + /// Indicates that close() should not delete any Tasks. M_DELETE_NONE = 4 }; }; diff --git a/dep/ACE_wrappers/ace/Monitor_Point_Registry.cpp b/dep/ACE_wrappers/ace/Monitor_Point_Registry.cpp index 4c3844f7e..81764432a 100644 --- a/dep/ACE_wrappers/ace/Monitor_Point_Registry.cpp +++ b/dep/ACE_wrappers/ace/Monitor_Point_Registry.cpp @@ -1,4 +1,4 @@ -// $Id: Monitor_Point_Registry.cpp 81833 2008-06-04 14:44:53Z parsons $ +// $Id: Monitor_Point_Registry.cpp 91813 2010-09-17 07:52:52Z johnnyw $ #include "ace/Monitor_Point_Registry.h" @@ -42,7 +42,7 @@ namespace ACE type->add_ref (); status = this->map_.bind (type->name (), type); - + /// Temporary debugging code. // ACE_DEBUG ((LM_DEBUG, "adding %s\n", type->name ())); } @@ -75,7 +75,7 @@ namespace ACE ACE_CString name_str (name, 0, false); status = this->map_.unbind (name_str, mp); - + /// Temporary debugging code. // ACE_DEBUG ((LM_DEBUG, "removing %s\n", name_str.c_str ())); } diff --git a/dep/ACE_wrappers/ace/Multihomed_INET_Addr.h b/dep/ACE_wrappers/ace/Multihomed_INET_Addr.h index 976ee813e..6be07a910 100644 --- a/dep/ACE_wrappers/ace/Multihomed_INET_Addr.h +++ b/dep/ACE_wrappers/ace/Multihomed_INET_Addr.h @@ -4,7 +4,7 @@ /** * @file Multihomed_INET_Addr.h * - * $Id: Multihomed_INET_Addr.h 84325 2009-02-04 22:46:30Z shuston $ + * $Id: Multihomed_INET_Addr.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Edward R. Mulholland */ @@ -51,7 +51,7 @@ public: /** * Constructs an ACE_Multihomed_INET_Addr from a @a port_number, a - * @a primary_host_name, and an array of . + * @a primary_host_name, and an array of @a secondary_host_names. * @a size is taken to be the length of the array. If @a encode is * non-zero, then @a port_number is converted into network byte * order; otherwise it is assumed to be in network byte order @@ -105,7 +105,7 @@ public: /// Use compiler-generated assignment operator. - /// Default dtor. + /// Default destructor. ~ACE_Multihomed_INET_Addr (void); // = Direct initialization methods. @@ -114,7 +114,7 @@ public: /** * Initializes an ACE_Multihomed_INET_Addr from a @a port_number, a - * @a primary_host_name, and an array of . + * @a primary_host_name, and an array of @a secondary_host_names. * @a size is taken to be the length of the array. If @a encode is * non-zero, then @a port_number is converted into network byte * order; otherwise it is assumed to be in network byte order @@ -174,14 +174,12 @@ public: * primary and secondary addresses. @a size is taken as the size of * this array. */ - void get_addresses(sockaddr_in *addrs, - size_t size) const; + void get_addresses(sockaddr_in *addrs, size_t size) const; #if defined (ACE_HAS_IPV6) /// IPV6 version of the above. - void get_addresses(sockaddr_in6 *addrs, - size_t size) const; + void get_addresses(sockaddr_in6 *addrs, size_t size) const; #endif /* ACE_HAS_IPV6 */ private: diff --git a/dep/ACE_wrappers/ace/Mutex.h b/dep/ACE_wrappers/ace/Mutex.h index e73874594..7183a2db3 100644 --- a/dep/ACE_wrappers/ace/Mutex.h +++ b/dep/ACE_wrappers/ace/Mutex.h @@ -4,7 +4,7 @@ /** * @file Mutex.h * - * $Id: Mutex.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Mutex.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -144,6 +144,7 @@ public: /// Return the underlying mutex. const ACE_mutex_t &lock (void) const; + ACE_mutex_t &lock (void); /// Dump the state of an object. void dump (void) const; diff --git a/dep/ACE_wrappers/ace/Mutex.inl b/dep/ACE_wrappers/ace/Mutex.inl index 8c6c73c86..5942808bd 100644 --- a/dep/ACE_wrappers/ace/Mutex.inl +++ b/dep/ACE_wrappers/ace/Mutex.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Mutex.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Mutex.inl 91626 2010-09-07 10:59:20Z johnnyw $ #include "ace/OS_NS_sys_mman.h" @@ -51,6 +51,17 @@ ACE_Mutex::lock (void) const return this->lock_; } +ACE_INLINE ACE_mutex_t & +ACE_Mutex::lock (void) +{ +// ACE_TRACE ("ACE_Mutex::lock"); +#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) + if (this->process_lock_) + return *this->process_lock_; +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ + return this->lock_; +} + ACE_INLINE int ACE_Mutex::tryacquire_write (void) { diff --git a/dep/ACE_wrappers/ace/Null_Barrier.h b/dep/ACE_wrappers/ace/Null_Barrier.h index 5cd9ef838..6ea89e7db 100644 --- a/dep/ACE_wrappers/ace/Null_Barrier.h +++ b/dep/ACE_wrappers/ace/Null_Barrier.h @@ -4,7 +4,7 @@ /** * @file Null_Barrier.h * - * $Id: Null_Barrier.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Null_Barrier.h 91626 2010-09-07 10:59:20Z johnnyw $ * * Moved from Synch.h. * @@ -18,9 +18,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -// All methods in this class are inline, so there is no -// need to import or export on Windows. -- CAE 12/18/2003 - /** * @class ACE_Null_Barrier * diff --git a/dep/ACE_wrappers/ace/Null_Condition.h b/dep/ACE_wrappers/ace/Null_Condition.h index 02131e213..5f6277d11 100644 --- a/dep/ACE_wrappers/ace/Null_Condition.h +++ b/dep/ACE_wrappers/ace/Null_Condition.h @@ -4,7 +4,7 @@ /** * @file Null_Condition.h * - * $Id: Null_Condition.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Null_Condition.h 91626 2010-09-07 10:59:20Z johnnyw $ * * Moved from Synch.h. * @@ -16,8 +16,6 @@ #define ACE_NULL_CONDITION_H #include /**/ "ace/pre.h" -// All methods in this class are inline, so there is no -// need to import or export on Windows. -- CAE 12/18/2003 #include "ace/Null_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/dep/ACE_wrappers/ace/Null_Mutex.h b/dep/ACE_wrappers/ace/Null_Mutex.h index 85aefb0e5..85d06688a 100644 --- a/dep/ACE_wrappers/ace/Null_Mutex.h +++ b/dep/ACE_wrappers/ace/Null_Mutex.h @@ -4,7 +4,7 @@ /** * @file Null_Mutex.h * - * $Id: Null_Mutex.h 86731 2009-09-17 12:23:48Z johnnyw $ + * $Id: Null_Mutex.h 91626 2010-09-07 10:59:20Z johnnyw $ * * Moved from Synch.h. * @@ -16,12 +16,6 @@ #define ACE_NULL_MUTEX_H #include /**/ "ace/pre.h" -// All methods in this class are inline, so there is no -// need to import or export on Windows. -- CAE 12/18/2003 -// Update... leaving off the ACE_Export causes compile warnings in some -// cases with Microsoft Visual Studio .NET 2005, so I added the ACE_Export -// to these class declarations. Steve Huston, 12/8/2006. - #include "ace/os_include/os_errno.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -90,35 +84,7 @@ public: int lock_; // A dummy lock. }; -#if defined (ACE_USES_OBSOLETE_GUARD_CLASSES) -/** - * @class ACE_Null_Mutex_Guard - * - * @brief This data structure is meant to be used within a method or - * function... It performs automatic aquisition and release of - * an ACE_Null_Mutex. - * - * This class is obsolete and should be replaced by - * ACE_Guard. - */ -class ACE_Export ACE_Null_Mutex_Guard -{ -public: - ACE_Null_Mutex_Guard (ACE_Null_Mutex &) {} - ~ACE_Null_Mutex_Guard (void) {} - int remove (void) {return 0;} - int locked (void) {return 1;} - int acquire (void) {return 0;} - int tryacquire (void) {return 0;} - int release (void) {return 0:} - void dump (void) const {} - -private: - // = Prevent assignment and initialization. - void operator= (const ACE_Null_Mutex_Guard &); - ACE_Null_Mutex_Guard (const ACE_Null_Mutex_Guard &); -}; -#endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */ +// FUZZ: disable check_for_ACE_Guard template class ACE_Guard; @@ -206,6 +172,8 @@ public: void dump (void) const {} }; +// FUZZ: enable check_for_ACE_Guard + template class ACE_Malloc_Lock_Adapter_T; /** diff --git a/dep/ACE_wrappers/ace/Null_Semaphore.h b/dep/ACE_wrappers/ace/Null_Semaphore.h index d7a48cce4..6d152e23a 100644 --- a/dep/ACE_wrappers/ace/Null_Semaphore.h +++ b/dep/ACE_wrappers/ace/Null_Semaphore.h @@ -4,7 +4,7 @@ /** * @file Null_Semaphore.h * - * $Id: Null_Semaphore.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Null_Semaphore.h 91626 2010-09-07 10:59:20Z johnnyw $ * * Moved from Synch.h. * @@ -16,8 +16,6 @@ #define ACE_NULL_SEMAPHORE_H #include /**/ "ace/pre.h" -// All methods in this class are inline, so there is no -// need to import or export on Windows. -- CAE 12/18/2003 #include "ace/os_include/os_errno.h" #include "ace/os_include/sys/os_types.h" diff --git a/dep/ACE_wrappers/ace/OS.cpp b/dep/ACE_wrappers/ace/OS.cpp deleted file mode 100644 index e748cfff2..000000000 --- a/dep/ACE_wrappers/ace/OS.cpp +++ /dev/null @@ -1,53 +0,0 @@ -// $Id: OS.cpp 91286 2010-08-05 09:04:31Z johnnyw $ - -// FUZZ: disable check_for_OS_h_include -#include "ace/OS.h" - -#if !defined (ACE_HAS_WINCE) -# include "ace/OS_QoS.h" -#endif // ACE_HAS_WINCE - -// Perhaps we should *always* include ace/OS.i in order to make sure -// we can always link against the OS symbols? -#if !defined (ACE_HAS_INLINED_OSCALLS) -# include "ace/OS.inl" -#endif /* ACE_HAS_INLINED_OSCALLS */ - - - -// include new cpps -#include "ace/Cleanup.cpp" -#include "ace/Object_Manager_Base.cpp" -#include "ace/OS_main.cpp" -#include "ace/OS_NS_arpa_inet.cpp" -#include "ace/OS_NS_ctype.cpp" -#include "ace/OS_NS_dirent.cpp" -#include "ace/OS_NS_dlfcn.cpp" -#include "ace/OS_NS_errno.cpp" -#include "ace/OS_NS_fcntl.cpp" -#include "ace/OS_NS_math.cpp" -#include "ace/OS_NS_netdb.cpp" -#include "ace/OS_NS_poll.cpp" -#include "ace/OS_NS_pwd.cpp" -#include "ace/OS_NS_regex.cpp" -#include "ace/OS_NS_signal.cpp" -#include "ace/OS_NS_stdio.cpp" -#include "ace/OS_NS_stdlib.cpp" -#include "ace/OS_NS_string.cpp" -#include "ace/OS_NS_strings.cpp" -#include "ace/OS_NS_stropts.cpp" -#include "ace/OS_NS_sys_mman.cpp" -#include "ace/OS_NS_sys_msg.cpp" -#include "ace/OS_NS_sys_resource.cpp" -#include "ace/OS_NS_sys_select.cpp" -#include "ace/OS_NS_sys_shm.cpp" -#include "ace/OS_NS_sys_socket.cpp" -#include "ace/OS_NS_sys_stat.cpp" -#include "ace/OS_NS_sys_time.cpp" -#include "ace/OS_NS_sys_uio.cpp" -#include "ace/OS_NS_sys_utsname.cpp" -#include "ace/OS_NS_sys_wait.cpp" -#include "ace/OS_NS_Thread.cpp" -#include "ace/OS_NS_time.cpp" -#include "ace/OS_NS_unistd.cpp" -#include "ace/OS_NS_wchar.cpp" diff --git a/dep/ACE_wrappers/ace/OS.h b/dep/ACE_wrappers/ace/OS.h deleted file mode 100644 index ec6c4ef9e..000000000 --- a/dep/ACE_wrappers/ace/OS.h +++ /dev/null @@ -1,329 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file OS.h - * - * $Id: OS.h 80826 2008-03-04 14:51:23Z wotte $ - * - * @author Douglas C. Schmidt - * @author Jesper S. M|ller - * @author and a cast of thousands... - */ -//============================================================================= - -#ifndef ACE_OS_H -#define ACE_OS_H - -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (DO_NOT_INCLUDE_OS_H) -#include "ace/Cleanup.h" -#include "ace/Object_Manager_Base.h" -#include "ace/OS_main.h" -#include "ace/OS_NS_arpa_inet.h" -#include "ace/OS_NS_ctype.h" -#include "ace/OS_NS_dirent.h" -#include "ace/OS_NS_dlfcn.h" -#include "ace/OS_NS_errno.h" -#include "ace/OS_NS_fcntl.h" -#include "ace/OS_NS_math.h" -#include "ace/OS_NS_netdb.h" -#include "ace/OS_NS_poll.h" -#include "ace/OS_NS_pwd.h" -#include "ace/OS_NS_regex.h" -#include "ace/OS_NS_signal.h" -#include "ace/OS_NS_stdio.h" -#include "ace/OS_NS_stdlib.h" -#include "ace/OS_NS_string.h" -#include "ace/OS_NS_strings.h" -#include "ace/OS_NS_stropts.h" -#include "ace/OS_NS_sys_mman.h" -#include "ace/OS_NS_sys_msg.h" -#include "ace/OS_NS_sys_resource.h" -#include "ace/OS_NS_sys_select.h" -#include "ace/OS_NS_sys_shm.h" -#include "ace/OS_NS_sys_socket.h" -#include "ace/OS_NS_sys_stat.h" -#include "ace/OS_NS_sys_time.h" -#include "ace/OS_NS_sys_uio.h" -#include "ace/OS_NS_sys_utsname.h" -#include "ace/OS_NS_sys_wait.h" -#include "ace/OS_NS_Thread.h" -#include "ace/OS_NS_time.h" -#include "ace/OS_NS_unistd.h" -#include "ace/OS_NS_wchar.h" - -// Include the split up ACE_OS classes -#include "ace/OS_Dirent.h" -#include "ace/OS_String.h" -#include "ace/OS_Memory.h" -#include "ace/OS_TLI.h" -#include "ace/OS_Errno.h" - -#include "ace/os_include/os_dlfcn.h" -#include "ace/os_include/sys/os_mman.h" -#include "ace/os_include/os_netdb.h" -#include "ace/os_include/sys/os_socket.h" -#include "ace/os_include/net/os_if.h" -#include "ace/os_include/sys/os_sem.h" - -#include "ace/Time_Value.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -class ACE_Timeout_Manager; - -ACE_END_VERSIONED_NAMESPACE_DECL - -// Here are all ACE-specific default constants, needed throughout ACE -// and its applications. The values can be over written by user -// specific values in config.h files. -#include "ace/Default_Constants.h" - -// Here are all ACE-specific global declarations needed throughout -// ACE. -#include "ace/Global_Macros.h" - -// include the ACE min()/max() functions. -# include "ace/Min_Max.h" - -/////////////////////////////////////////// -// // -// NOTE: Please do not add any #includes // -// before this point. On VxWorks, // -// vxWorks.h must be #included // -// first! // -// // -/////////////////////////////////////////// - -#include "ace/os_include/netinet/os_tcp.h" -#include "ace/os_include/sys/os_stat.h" -#include "ace/os_include/os_stropts.h" -#include "ace/os_include/os_unistd.h" -#include "ace/os_include/sys/os_wait.h" - - -// This needs to go here *first* to avoid problems with AIX. -# if defined (ACE_HAS_PTHREADS) -# include "ace/os_include/os_pthread.h" -# endif /* ACE_HAS_PTHREADS */ - -# if defined (ACE_HAS_PROC_FS) -# include /**/ -# endif /* ACE_HAS_PROC_FS */ - -# if defined (ACE_HAS_POSIX_SEM) -# include "ace/os_include/os_semaphore.h" -# endif /* ACE_HAS_POSIX_SEM */ - -#include "ace/os_include/sys/os_types.h" -#include "ace/os_include/os_stddef.h" -#if !defined (ACE_LACKS_UNISTD_H) -# include "ace/os_include/os_unistd.h" -#endif /* ACE_LACKS_UNISTD_H */ - -// Standard C Library includes -# if !defined (ACE_HAS_WINCE) -# include "ace/os_include/os_assert.h" -# include "ace/os_include/os_stdio.h" - -# if !defined (ACE_LACKS_NEW_H) -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# include /**/ -# else -# include /**/ -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ -# endif /* ! ACE_LACKS_NEW_H */ - -# if !defined (ACE_VXWORKS) -# define ACE_DONT_INCLUDE_ACE_SIGNAL_H -# include "ace/os_include/os_signal.h" -# undef ACE_DONT_INCLUDE_ACE_SIGNAL_H -# endif /* ! VXWORKS */ - -# include "ace/os_include/os_fcntl.h" -# endif /* ACE_HAS_WINCE */ - -# include "ace/os_include/os_limits.h" -# include "ace/os_include/os_ctype.h" -# include "ace/os_include/os_string.h" -# include "ace/os_include/os_stdlib.h" -# include "ace/os_include/os_float.h" - -# if defined (ACE_NEEDS_SCHED_H) -# include "ace/os_include/os_sched.h" -# endif /* ACE_NEEDS_SCHED_H */ - -# include "ace/iosfwd.h" - -# if !defined (ACE_HAS_WINCE) -# include "ace/os_include/os_fcntl.h" -# endif /* ACE_HAS_WINCE */ - -# if defined ACE_HAS_BYTESEX_H -# include /**/ -# endif /* ACE_HAS_BYTESEX_H */ -# include "ace/Basic_Types.h" - -# if defined (ACE_HAS_UTIME) -# include "ace/os_include/os_utime.h" -# endif /* ACE_HAS_UTIME */ - -# if defined (ACE_WIN32) - -# if !defined (ACE_HAS_WINCE) -# include "ace/os_include/sys/os_timeb.h" -# endif /* ACE_HAS_WINCE */ - -# if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) -# include "ace/os_include/netinet/os_in.h" // -# endif /* ACE_HAS_WINSOCK2 */ - -# if !defined (ACE_HAS_WINCE) -# include "ace/os_include/os_time.h" -# include "ace/os_include/sys/os_stat.h" // -# include "ace/os_include/os_unistd.h" // -# endif /* ACE_HAS_WINCE */ - -# include "ace/os_include/os_fcntl.h" - -# else /* !defined (ACE_WIN32) */ - -# if defined (CYGWIN32) -# include "ace/os_include/sys/os_uio.h" -# include "ace/os_include/os_fcntl.h" // -# include "ace/os_include/sys/os_time.h" -# include "ace/os_include/sys/os_resource.h" -# include "ace/os_include/sys/os_wait.h" -# include "ace/os_include/os_pwd.h" -# elif defined (__QNX__) -# include "ace/os_include/sys/os_uio.h" -# include "ace/os_include/sys/os_ipc.h" -# include "ace/os_include/sys/os_time.h" -# include "ace/os_include/sys/os_wait.h" -# include "ace/os_include/sys/os_resource.h" -# include "ace/os_include/os_pwd.h" - // sets O_NDELAY -# include /**/ -# include "ace/os_include/os_limits.h" // /* for NBBY */ -# elif defined(ACE_HAS_RTEMS) -# include "ace/os_include/os_fcntl.h" // -# include "ace/os_include/sys/os_resource.h" -# include "ace/os_include/sys/os_time.h" -# include "ace/os_include/sys/os_utsname.h" -# include "ace/os_include/sys/os_wait.h" -# include "ace/os_include/os_pwd.h" - -# elif ! defined (ACE_VXWORKS) && ! defined (INTEGRITY) -# include "ace/os_include/sys/os_uio.h" -# include "ace/os_include/sys/os_ipc.h" -# if !defined(ACE_LACKS_SYSV_SHMEM) -// No reason to #include this if the platform lacks support for SHMEM -# include "ace/os_include/sys/os_shm.h" -# endif /* ACE_LACKS_SYSV_SHMEM */ -# include "ace/os_include/os_fcntl.h" // -# include "ace/os_include/sys/os_time.h" -# include "ace/os_include/sys/os_resource.h" -# include "ace/os_include/sys/os_wait.h" -# include "ace/os_include/os_pwd.h" -# endif /* ! VXWORKS */ -# include "ace/os_include/os_stropts.h" // - -// IRIX5 defines bzero() in this odd file... -# if defined (ACE_HAS_BSTRING) -# include /**/ -# endif /* ACE_HAS_BSTRING */ - -// AIX defines bzero() in this odd file... -# if defined (ACE_HAS_STRINGS) -# include "ace/os_include/os_strings.h" -# endif /* ACE_HAS_STRINGS */ - -# if defined (ACE_HAS_TERMIOS) -# include "ace/os_include/os_termios.h" -# endif /* ACE_HAS_TERMIOS */ - -# if defined (ACE_HAS_AIO_CALLS) -# include "ace/os_include/os_aio.h" -# endif /* ACE_HAS_AIO_CALLS */ - -# include "ace/os_include/os_limits.h" // - -# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) -# include "ace/os_include/sys/os_un.h" -# endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ - -# if defined (ACE_HAS_POLL) -# include "ace/os_include/os_poll.h" -# endif /* ACE_HAS_POLL */ - -# if defined (ACE_HAS_SELECT_H) -# include "ace/os_include/sys/os_select.h" -# endif /* ACE_HAS_SELECT_H */ - -# include "ace/os_include/sys/os_msg.h" - -# if defined (ACE_HAS_PRIOCNTL) -# include /**/ -# endif /* ACE_HAS_PRIOCNTL */ - -# endif /* !defined (ACE_WIN32) */ - -# if !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SYSLOG) -# include "ace/os_include/os_syslog.h" -# endif /* !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SYSLOG) */ - - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @namespace ACE_OS - * - * @brief This namespace defines an OS independent programming API that - * shields developers from nonportable aspects of writing - * efficient system programs on Win32, POSIX and other versions - * of UNIX, and various real-time operating systems. - * - * This namespace encapsulates the differences between various OS - * platforms. When porting ACE to a new platform, this class is - * the place to focus on. Once this file is ported to a new - * platform, pretty much everything else comes for "free." See - * - * for instructions on porting ACE. Please see the README file - * in this directory for complete information on the meaning of - * the various macros. - */ -namespace ACE_OS -{ - // = A set of wrappers for miscellaneous operations. -} /* namespace ACE_OS */ - -ACE_END_VERSIONED_NAMESPACE_DECL - -# if defined (ACE_HAS_INLINED_OSCALLS) -# if defined (ACE_INLINE) -# undef ACE_INLINE -# endif /* ACE_INLINE */ -# define ACE_INLINE inline -# include "ace/OS.inl" -# endif /* ACE_HAS_INLINED_OSCALLS */ - -#if defined (ACE_LEGACY_MODE) -# include "ace/Log_Msg.h" -# include "ace/Thread_Hook.h" -# include "ace/Thread_Adapter.h" -# include "ace/Thread_Exit.h" -# include "ace/Thread_Control.h" -#endif /* ACE_LEGACY_MODE */ - -#endif /* 0 */ - -#include /**/ "ace/post.h" -#endif /* ACE_OS_H */ diff --git a/dep/ACE_wrappers/ace/OS.inl b/dep/ACE_wrappers/ace/OS.inl deleted file mode 100644 index 852542b5a..000000000 --- a/dep/ACE_wrappers/ace/OS.inl +++ /dev/null @@ -1,80 +0,0 @@ -// -*- C++ -*- -// $Id: OS.inl 87244 2009-10-27 20:15:48Z olli $ - -#if !defined (ACE_HAS_INLINED_OSCALLS) -# undef ACE_INLINE -# define ACE_INLINE -#endif /* ACE_HAS_INLINED_OSCALLS */ - -#if defined (ACE_HAS_XLI) -# include /**/ -#endif /* ACE_HAS_XLI */ - -#if !defined (ACE_HAS_CPLUSPLUS_HEADERS) -# include /**/ -# include /**/ -#endif /* ACE_HAS_CPLUSPLUS_HEADERS */ - -#if defined (ACE_HAS_SYSENT_H) -# include /**/ -#endif /* ACE_HAS_SYSENT_H */ - -#if defined (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB) && \ - (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB != 0) -using std::bsearch; -using std::qsort; -# if defined (ACE_WIN32) -using std::_tzset; -# else -using std::tzset; -# endif -using std::ctime; -using std::localtime; -using std::gmtime; -using std::asctime; -using std::strftime; -#endif /* ACE_USES_STD_NAMESPACE_FOR_STDC_LIB */ - -#if !defined (ACE_LACKS_MALLOC_H) -# include /**/ -#endif /* ACE_LACKS_MALLOC_H */ - -#if !defined (ACE_WIN32) - -// The following are #defines and #includes that must be visible for -// ACE to compile it's OS wrapper class implementation correctly. We -// put them inside of here to reduce compiler overhead if we're not -// inlining... - -# if defined (ACE_HAS_REGEX) -# include /**/ -# endif /* ACE_HAS_REGEX */ - -# if defined (ACE_HAS_SYS_SYSTEMINFO_H) -# include /**/ -# endif /* ACE_HAS_SYS_SYSTEMINFO_H */ - -# if defined (ACE_HAS_SYS_SYSCALL_H) -# include /**/ -# endif /* ACE_HAS_SYS_SYSCALL_H */ - -# if defined (UNIXWARE) /* See strcasecmp, below */ -# include /**/ -# endif /* UNIXWARE */ - -# if defined (ACE_HAS_GETIFADDRS) -# if defined (ACE_VXWORKS) -# include /**/ -# else -# include /**/ -# endif -# endif /* ACE_HAS_GETIFADDRS */ - - -#endif /* WIN32 */ - -#if defined (ACE_HAS_SHM_OPEN) && defined(INTEGRITY) -#include "ace/os_include/sys/os_mman.h" -#endif - -// **************************************************************** diff --git a/dep/ACE_wrappers/ace/OS_Dirent.h b/dep/ACE_wrappers/ace/OS_Dirent.h deleted file mode 100644 index d05dc1709..000000000 --- a/dep/ACE_wrappers/ace/OS_Dirent.h +++ /dev/null @@ -1,32 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file OS_Dirent.h - * - * $Id: OS_Dirent.h 80826 2008-03-04 14:51:23Z wotte $ - * - * @author Doug Schmidt - * @author Jesper S. M|ller - * @author and a cast of thousands... - */ -//============================================================================= - -#ifndef ACE_OS_DIRENT_H -#define ACE_OS_DIRENT_H -#include /**/ "ace/pre.h" - -#include /**/ "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS_Errno.h" -#include "ace/os_include/os_dirent.h" -#include "ace/os_include/sys/os_types.h" - -#include "ace/OS_NS_dirent.h" - -#include /**/ "ace/post.h" -#endif /* ACE_OS_DIRENT_H */ diff --git a/dep/ACE_wrappers/ace/OS_Errno.cpp b/dep/ACE_wrappers/ace/OS_Errno.cpp index 7c2866c22..3fe4a0a0a 100644 --- a/dep/ACE_wrappers/ace/OS_Errno.cpp +++ b/dep/ACE_wrappers/ace/OS_Errno.cpp @@ -1,10 +1,8 @@ // -*- C++ -*- -// $Id: OS_Errno.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: OS_Errno.cpp 91809 2010-09-17 07:20:41Z johnnyw $ #include "ace/OS_Errno.h" - - // Inlining this class on debug builds with gcc on Solaris can cause // deadlocks during static initialization. On non debug builds it // causes compilation errors. diff --git a/dep/ACE_wrappers/ace/OS_Memory.h b/dep/ACE_wrappers/ace/OS_Memory.h index 7a5d94afb..cf1f91fa2 100644 --- a/dep/ACE_wrappers/ace/OS_Memory.h +++ b/dep/ACE_wrappers/ace/OS_Memory.h @@ -4,7 +4,7 @@ /** * @file OS_Memory.h * - * $Id: OS_Memory.h 86400 2009-08-06 13:52:28Z schmidt $ + * $Id: OS_Memory.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Doug Schmidt * @author Jesper S. M|ller @@ -58,11 +58,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_OLD_MALLOC) -typedef char * ACE_MALLOC_T; -#else typedef void * ACE_MALLOC_T; -#endif /* ACE_HAS_OLD_MALLOC */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_NS_Thread.cpp b/dep/ACE_wrappers/ace/OS_NS_Thread.cpp index 48a661e36..c424e3f57 100644 --- a/dep/ACE_wrappers/ace/OS_NS_Thread.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_Thread.cpp @@ -1,4 +1,4 @@ -// $Id: OS_NS_Thread.cpp 91523 2010-08-27 14:18:02Z johnnyw $ +// $Id: OS_NS_Thread.cpp 91693 2010-09-09 12:57:54Z johnnyw $ #include "ace/OS_NS_Thread.h" @@ -59,24 +59,14 @@ ACE_Thread_ID::to_string (char *thr_string) const ACE_OS::strcpy (fp, "u"); ACE_OS::sprintf (thr_string, format, - static_cast (thread_id_)); -#elif defined (DIGITAL_UNIX) - ACE_OS::strcpy (fp, "u"); - ACE_OS::sprintf (thr_string, format, -# if defined (ACE_HAS_THREADS) - thread_id_ -# else - thread_id_ -# endif /* ACE_HAS_THREADS */ - ); + static_cast (this->thread_id_)); #else - -# if defined (ACE_MVS) || defined (ACE_TANDEM_T1248_PTHREADS) +# if defined (ACE_MVS) || defined (ACE_TANDEM_T1248_PTHREADS) // MVS's pthread_t is a struct... yuck. So use the ACE 5.0 // code for it. ACE_OS::strcpy (fp, "u"); ACE_OS::sprintf (thr_string, format, thread_handle_); -# else +# else // Yes, this is an ugly C-style cast, but the // correct C++ cast is different depending on // whether the t_id is an integral type or a pointer @@ -87,8 +77,7 @@ ACE_Thread_ID::to_string (char *thr_string) const ACE_OS::sprintf (thr_string, format, (unsigned long) thread_handle_); -# endif /* ACE_MVS || ACE_TANDEM_T1248_PTHREADS */ - +# endif /* ACE_MVS || ACE_TANDEM_T1248_PTHREADS */ #endif /* ACE_WIN32 */ } @@ -664,7 +653,7 @@ TSS_Cleanup_Instance::TSS_Cleanup_Instance (Purpose purpose) ACE_NEW (condition_, ACE_Thread_Condition (*mutex_)); } - ACE_Guard guard(*mutex_); + ACE_GUARD (ACE_Thread_Mutex, m, *mutex_); if (purpose == CREATE) { @@ -1151,7 +1140,7 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv) { return -1; } - + bool have_waiters = false; if (cv->waiters_ > 0) @@ -1163,13 +1152,13 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv) cv->was_broadcast_ = 1; have_waiters = true; } - + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) { // This is really bad, we have the lock but can't release it anymore return -1; } - + int result = 0; if (have_waiters) { @@ -1208,7 +1197,7 @@ ACE_OS::cond_destroy (ACE_cond_t *cv) int result = 0; if (ACE_OS::thread_mutex_destroy (&cv->waiters_lock_) != 0) result = -1; - + if (ACE_OS::sema_destroy (&cv->sema_) != 0) result = -1; @@ -1335,9 +1324,9 @@ ACE_OS::cond_wait (ACE_cond_t *cv, // Prevent race conditions on the count. if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) return -1; - + ++cv->waiters_; - + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) return -1; @@ -1446,9 +1435,9 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, // Prevent race conditions on the count. if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) return -1; - + ++cv->waiters_; - + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) return -1; @@ -1509,7 +1498,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, // Reacquire lock to avoid race conditions. if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) return -1; - + --cv->waiters_; bool const last_waiter = cv->was_broadcast_ && cv->waiters_ == 0; @@ -1648,9 +1637,9 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, // Prevent race conditions on the count. if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) return -1; - + ++cv->waiters_; - + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) return -1; @@ -1721,7 +1710,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, if (ACE_OS::event_signal (&cv->waiters_done_) != 0) return -1; } - + // We must always regain the , even when errors // occur because that's the guarantee that we give to our callers. if (ACE_OS::thread_mutex_lock (external_mutex) != 0) @@ -1755,7 +1744,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv, if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) return -1; ++cv->waiters_; - + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) return -1; @@ -3570,15 +3559,7 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, int result = ::sched_setscheduler (id == ACE_SELF ? 0 : id, sched_params.policy (), ¶m) == -1 ? -1 : 0; -# if defined (DIGITAL_UNIX) - return result == 0 - ? // Use priocntl (2) to set the process in the RT class, - // if using an RT policy. - ACE_OS::set_scheduling_params (sched_params) - : result; -# else /* ! DIGITAL_UNIX */ return result; -# endif /* ! DIGITAL_UNIX */ # endif /* ! ACE_TANDEM_T1248_PTHREADS */ } else if (sched_params.scope () == ACE_SCOPE_THREAD) @@ -4080,10 +4061,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, struct sched_param sparam; ACE_OS::memset ((void *) &sparam, 0, sizeof sparam); -# if defined (ACE_HAS_IRIX62_THREADS) - sparam.sched_priority = ACE_MIN (priority, - (long) PTHREAD_MAX_PRIORITY); -# elif defined (PTHREAD_MAX_PRIORITY) && !defined(ACE_HAS_PTHREADS) +# if defined (PTHREAD_MAX_PRIORITY) && !defined(ACE_HAS_PTHREADS) /* For MIT pthreads... */ sparam.prio = ACE_MIN (priority, PTHREAD_MAX_PRIORITY); # elif defined(ACE_HAS_PTHREADS) && !defined (ACE_HAS_STHREADS) @@ -4105,7 +4083,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, (long) PRIORITY_MAX); # else sparam.sched_priority = priority; -# endif /* ACE_HAS_IRIX62_THREADS */ +# endif /* PTHREAD_MAX_PRIORITY */ { # if defined (sun) && defined (ACE_HAS_ONLY_SCHED_OTHER) @@ -4666,7 +4644,7 @@ ACE_OS::thr_join (ACE_thread_t waiter_id, #endif /* ACE_HAS_VXTHREADS */ int -ACE_OS::thr_key_detach (ACE_thread_key_t key, void *) +ACE_OS::thr_key_detach (ACE_thread_key_t key) { #if defined (ACE_HAS_WTHREADS) || defined (ACE_HAS_TSS_EMULATION) TSS_Cleanup_Instance cleanup; @@ -4841,11 +4819,10 @@ ACE_OS::thr_keycreate_native (ACE_OS_thread_key_t *key, int ACE_OS::thr_keycreate (ACE_thread_key_t *key, # if defined (ACE_HAS_THR_C_DEST) - ACE_THR_C_DEST dest, + ACE_THR_C_DEST dest) # else - ACE_THR_DEST dest, + ACE_THR_DEST dest) # endif /* ACE_HAS_THR_C_DEST */ - void *) { // ACE_OS_TRACE ("ACE_OS::thr_keycreate"); #if defined (ACE_HAS_THREADS) diff --git a/dep/ACE_wrappers/ace/OS_NS_Thread.h b/dep/ACE_wrappers/ace/OS_NS_Thread.h index 1c3ddc4fd..414521088 100644 --- a/dep/ACE_wrappers/ace/OS_NS_Thread.h +++ b/dep/ACE_wrappers/ace/OS_NS_Thread.h @@ -4,7 +4,7 @@ /** * @file OS_NS_Thread.h * - * $Id: OS_NS_Thread.h 91536 2010-08-27 18:36:54Z johnnyw $ + * $Id: OS_NS_Thread.h 91693 2010-09-09 12:57:54Z johnnyw $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -762,18 +762,18 @@ typedef int ACE_pri_t; # else typedef int ACE_idtype_t; # endif /* ACE_HAS_IDTYPE_T */ -# if defined (ACE_HAS_STHREADS) || defined (DIGITAL_UNIX) +# if defined (ACE_HAS_STHREADS) # if defined (ACE_LACKS_PRI_T) typedef int pri_t; # endif /* ACE_LACKS_PRI_T */ typedef id_t ACE_id_t; # define ACE_SELF P_MYID typedef pri_t ACE_pri_t; -# else /* ! ACE_HAS_STHREADS && ! DIGITAL_UNIX */ +# else /* ! ACE_HAS_STHREADS */ typedef long ACE_id_t; # define ACE_SELF (-1) typedef short ACE_pri_t; -# endif /* ! ACE_HAS_STHREADS && ! DIGITAL_UNIX */ +# endif /* ! ACE_HAS_STHREADS */ #endif /* !defined (ACE_WIN32) */ # if defined (ACE_HAS_TSS_EMULATION) @@ -1631,11 +1631,8 @@ namespace ACE_OS { size_t cpu_set_size, const cpu_set_t * cpu_mask); - /** - * @note the "inst" arg is deprecated. It will be ignored. - */ extern ACE_Export - int thr_key_detach (ACE_thread_key_t key, void * inst); + int thr_key_detach (ACE_thread_key_t key); extern ACE_Export int thr_key_used (ACE_thread_key_t key); @@ -1644,17 +1641,12 @@ namespace ACE_OS { # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) /// @internal Applications should call thr_keycreate extern ACE_Export - int thr_keycreate_native (ACE_OS_thread_key_t *key, - ACE_THR_C_DEST); + int thr_keycreate_native (ACE_OS_thread_key_t *key, ACE_THR_C_DEST); # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */ - /** - * @note the "inst" arge is deprecated. It will be ignored. - */ extern ACE_Export - int thr_keycreate (ACE_thread_key_t *key, - ACE_THR_C_DEST, - void *inst = 0); + int thr_keycreate (ACE_thread_key_t *key, ACE_THR_C_DEST); + # else # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) /// @internal Applications should call thr_keycreate instead @@ -1662,13 +1654,9 @@ namespace ACE_OS { int thr_keycreate_native (ACE_OS_thread_key_t *key, ACE_THR_DEST); # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */ - /** - * @note the "inst" arge is deprecated. It will be ignored. - */ + extern ACE_Export - int thr_keycreate (ACE_thread_key_t *key, - ACE_THR_DEST, - void *inst = 0); + int thr_keycreate (ACE_thread_key_t *key, ACE_THR_DEST); # endif /* ACE_HAS_THR_C_DEST */ diff --git a/dep/ACE_wrappers/ace/OS_NS_Thread.inl b/dep/ACE_wrappers/ace/OS_NS_Thread.inl index ebc05aa26..a921e6907 100644 --- a/dep/ACE_wrappers/ace/OS_NS_Thread.inl +++ b/dep/ACE_wrappers/ace/OS_NS_Thread.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_Thread.inl 91544 2010-08-28 09:44:50Z johnnyw $ +// $Id: OS_NS_Thread.inl 92069 2010-09-28 11:38:59Z johnnyw $ #include "ace/OS_NS_macros.h" // for timespec_t, perhaps move it to os_time.h @@ -2500,27 +2500,17 @@ ACE_OS::sigwait (sigset_t *sset, int *sig) return *sig; #endif /* _POSIX_C_SOURCE - 0 >= 199506L || _POSIX_PTHREAD_SEMANTICS */ # elif defined (ACE_HAS_PTHREADS) - // Digital UNIX has own hoops to jump through. -# if defined (DIGITAL_UNIX) && defined (__DECCXX_VER) - // DEC cxx (but not g++) needs this direct call to its internal - // sigwait (). This allows us to #undef sigwait, so that we can - // have ACE_OS::sigwait. cxx gets confused by ACE_OS::sigwait - // if sigwait is _not_ #undef'ed. - errno = ::_Psigwait (sset, sig); +# if defined (CYGWIN32) + // Cygwin has sigwait definition, but it is not implemented + ACE_UNUSED_ARG (sset); + ACE_NOTSUP_RETURN (-1); +# elif defined (ACE_TANDEM_T1248_PTHREADS) + errno = ::spt_sigwait (sset, sig); return errno == 0 ? *sig : -1; -# else /* !(DIGITAL_UNIX && __DECCXX_VER) */ -# if defined (CYGWIN32) - // Cygwin has sigwait definition, but it is not implemented - ACE_UNUSED_ARG (sset); - ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_TANDEM_T1248_PTHREADS) - errno = ::spt_sigwait (sset, sig); - return errno == 0 ? *sig : -1; -# else /* this is draft 7 or std */ - errno = ::sigwait (sset, sig); - return errno == 0 ? *sig : -1; -# endif /* CYGWIN32 */ -# endif /* !(DIGITAL_UNIX && __DECCXX_VER) */ +# else /* this is draft 7 or std */ + errno = ::sigwait (sset, sig); + return errno == 0 ? *sig : -1; +# endif /* CYGWIN32 */ # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (sset); ACE_NOTSUP_RETURN (-1); @@ -3166,14 +3156,6 @@ ACE_OS::thr_sigsetmask (int how, //FUZZ: enable check_for_lack_ACE_OS # endif /* !ACE_LACKS_PTHREAD_SIGMASK */ -#if 0 - /* Don't know if any platform actually needs this... */ - // as far as I can tell, this is now pthread_sigaction() -- jwr - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_sigaction (how, nsm, osm), - result), int, -1); -#endif /* 0 */ - # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (osm); ACE_UNUSED_ARG (nsm); @@ -3600,7 +3582,7 @@ ACE_Thread_ID::ACE_Thread_ID (const ACE_Thread_ID &id) } ACE_INLINE -ACE_Thread_ID& +ACE_Thread_ID& ACE_Thread_ID::operator= (const ACE_Thread_ID &id) { if (this != &id) diff --git a/dep/ACE_wrappers/ace/OS_NS_arpa_inet.cpp b/dep/ACE_wrappers/ace/OS_NS_arpa_inet.cpp index ffb9e0d9e..537051cc1 100644 --- a/dep/ACE_wrappers/ace/OS_NS_arpa_inet.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_arpa_inet.cpp @@ -1,10 +1,8 @@ // -*- C++ -*- -// $Id: OS_NS_arpa_inet.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: OS_NS_arpa_inet.cpp 91781 2010-09-15 12:49:15Z johnnyw $ #include "ace/OS_NS_arpa_inet.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_arpa_inet.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/dep/ACE_wrappers/ace/OS_NS_arpa_inet.inl b/dep/ACE_wrappers/ace/OS_NS_arpa_inet.inl index 22083608e..4a5c0443e 100644 --- a/dep/ACE_wrappers/ace/OS_NS_arpa_inet.inl +++ b/dep/ACE_wrappers/ace/OS_NS_arpa_inet.inl @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: OS_NS_arpa_inet.inl 84249 2009-01-28 09:09:41Z johnnyw $ +// $Id: OS_NS_arpa_inet.inl 91781 2010-09-15 12:49:15Z johnnyw $ #include "ace/OS_NS_string.h" #include "ace/OS_NS_errno.h" @@ -29,9 +29,7 @@ ACE_OS::inet_ntoa (const struct in_addr addr) ACE_UNUSED_ARG (addr); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::inet_ntoa (addr), - char *, - 0); + ACE_OSCALL_RETURN (::inet_ntoa (addr), char *, 0); #endif } diff --git a/dep/ACE_wrappers/ace/OS_NS_ctype.cpp b/dep/ACE_wrappers/ace/OS_NS_ctype.cpp index 5b98b6279..614d0ae36 100644 --- a/dep/ACE_wrappers/ace/OS_NS_ctype.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_ctype.cpp @@ -1,10 +1,8 @@ // -*- C++ -*- -// $Id: OS_NS_ctype.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: OS_NS_ctype.cpp 91683 2010-09-09 09:07:49Z johnnyw $ #include "ace/OS_NS_ctype.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_ctype.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/dep/ACE_wrappers/ace/OS_NS_errno.cpp b/dep/ACE_wrappers/ace/OS_NS_errno.cpp index 9284e2c42..8526c391d 100644 --- a/dep/ACE_wrappers/ace/OS_NS_errno.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_errno.cpp @@ -1,10 +1,8 @@ // -*- C++ -*- -// $Id: OS_NS_errno.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: OS_NS_errno.cpp 91781 2010-09-15 12:49:15Z johnnyw $ #include "ace/OS_NS_errno.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_errno.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/dep/ACE_wrappers/ace/OS_NS_fcntl.cpp b/dep/ACE_wrappers/ace/OS_NS_fcntl.cpp index b266e5282..41cf76fcb 100644 --- a/dep/ACE_wrappers/ace/OS_NS_fcntl.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_fcntl.cpp @@ -1,9 +1,7 @@ -// $Id: OS_NS_fcntl.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: OS_NS_fcntl.cpp 91781 2010-09-15 12:49:15Z johnnyw $ #include "ace/OS_NS_fcntl.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_fcntl.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/dep/ACE_wrappers/ace/OS_NS_math.cpp b/dep/ACE_wrappers/ace/OS_NS_math.cpp index f6c61712c..c2692a44b 100644 --- a/dep/ACE_wrappers/ace/OS_NS_math.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_math.cpp @@ -1,9 +1,7 @@ -// $Id: OS_NS_math.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: OS_NS_math.cpp 91781 2010-09-15 12:49:15Z johnnyw $ #include "ace/OS_NS_math.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_math.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/dep/ACE_wrappers/ace/OS_NS_netdb.inl b/dep/ACE_wrappers/ace/OS_NS_netdb.inl index 55292ecc8..0888c72f9 100644 --- a/dep/ACE_wrappers/ace/OS_NS_netdb.inl +++ b/dep/ACE_wrappers/ace/OS_NS_netdb.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_netdb.inl 86295 2009-07-30 10:41:49Z shuston $ +// $Id: OS_NS_netdb.inl 91683 2010-09-09 09:07:49Z johnnyw $ #include "ace/OS_NS_macros.h" #include "ace/OS_NS_string.h" @@ -107,12 +107,12 @@ ACE_OS::gethostbyaddr_r (const char *addr, ACE_UNUSED_ARG (buffer); ACE_UNUSED_ARG (h_errnop); ACE_NOTSUP_RETURN (0); -# elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) +# elif defined (ACE_HAS_REENTRANT_FUNCTIONS) if (0 == addr || '\0' == addr[0]) return 0; -# if defined (AIX) || defined (DIGITAL_UNIX) +# if defined (AIX) ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); //FUZZ: disable check_for_lack_ACE_OS @@ -206,7 +206,7 @@ ACE_OS::gethostbyaddr_r (const char *addr, struct hostent *, 0); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -# endif /* defined (AIX) || defined (DIGITAL_UNIX) */ +# endif /* defined (AIX) */ # elif defined (ACE_HAS_NONCONST_GETBY) ACE_UNUSED_ARG (result); ACE_UNUSED_ARG (buffer); @@ -290,13 +290,12 @@ ACE_OS::gethostbyname_r (const char *name, ACE_UNUSED_ARG (buffer); ACE_UNUSED_ARG (h_errnop); ACE_NOTSUP_RETURN (0); -# elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) +# elif defined (ACE_HAS_REENTRANT_FUNCTIONS) if (0 == name || '\0' == name[0]) return (struct hostent *)0; -# if defined (DIGITAL_UNIX) || \ - (defined (ACE_AIX_MINOR_VERS) && (ACE_AIX_MINOR_VERS > 2)) +# if (defined (ACE_AIX_MINOR_VERS) && (ACE_AIX_MINOR_VERS > 2)) ACE_UNUSED_ARG (result); ACE_UNUSED_ARG (buffer); ACE_UNUSED_ARG (h_errnop); @@ -397,7 +396,7 @@ ACE_OS::gethostbyname_r (const char *name, 0); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -# endif /* defined (AIX) || defined (DIGITAL_UNIX) */ +# endif /* defined (AIX) */ # elif defined (ACE_HAS_NONCONST_GETBY) ACE_UNUSED_ARG (result); ACE_UNUSED_ARG (buffer); @@ -421,7 +420,7 @@ ACE_OS::gethostbyname_r (const char *name, *h_errnop = errno; return result2; //FUZZ: enable check_for_lack_ACE_OS -# endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) */ +# endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) */ } #endif @@ -524,8 +523,8 @@ ACE_OS::getprotobyname_r (const char *name, ACE_UNUSED_ARG (result); ACE_UNUSED_ARG (buffer); ACE_NOTSUP_RETURN (0); -#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) -# if defined (AIX) || defined (DIGITAL_UNIX) +#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) +# if defined (AIX) //FUZZ: disable check_for_lack_ACE_OS if (::getprotobyname_r (name, result, (struct protoent_data *) buffer) == 0) return result; @@ -561,7 +560,7 @@ ACE_OS::getprotobyname_r (const char *name, struct protoent *, 0); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -# endif /* defined (AIX) || defined (DIGITAL_UNIX) */ +# endif /* defined (AIX) */ #elif defined (ACE_HAS_NONCONST_GETBY) ACE_UNUSED_ARG (result); ACE_UNUSED_ARG (buffer); @@ -578,7 +577,7 @@ ACE_OS::getprotobyname_r (const char *name, struct protoent *, 0); //FUZZ: enable check_for_lack_ACE_OS -#endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) !defined (UNIXWARE) */ +#endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) */ } ACE_INLINE struct protoent * @@ -605,8 +604,8 @@ ACE_OS::getprotobynumber_r (int proto, ACE_UNUSED_ARG (result); ACE_UNUSED_ARG (buffer); ACE_NOTSUP_RETURN (0); -#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) -# if defined (AIX) || defined (DIGITAL_UNIX) +#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) +# if defined (AIX) //FUZZ: disable check_for_lack_ACE_OS if (::getprotobynumber_r (proto, result, (struct protoent_data *) buffer) == 0) return result; @@ -639,7 +638,7 @@ ACE_OS::getprotobynumber_r (int proto, struct protoent *, 0); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -# endif /* defined (AIX) || defined (DIGITAL_UNIX) */ +# endif /* defined (AIX) */ #else ACE_UNUSED_ARG (buffer); ACE_UNUSED_ARG (result); @@ -648,7 +647,7 @@ ACE_OS::getprotobynumber_r (int proto, ACE_SOCKCALL_RETURN (::getprotobynumber (proto), struct protoent *, 0); //FUZZ: enable check_for_lack_ACE_OS -#endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) */ +#endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) */ } ACE_INLINE struct servent * @@ -689,8 +688,8 @@ ACE_OS::getservbyname_r (const char *svc, ACE_UNUSED_ARG (result); ACE_UNUSED_ARG (buf); ACE_NOTSUP_RETURN (0); -#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) -# if defined (AIX) || defined (DIGITAL_UNIX) +#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) +# if defined (AIX) ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA)); //FUZZ: disable check_for_lack_ACE_OS @@ -729,7 +728,7 @@ ACE_OS::getservbyname_r (const char *svc, struct servent *, 0); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -# endif /* defined (AIX) || defined (DIGITAL_UNIX) */ +# endif /* defined (AIX) */ #elif defined (ACE_HAS_NONCONST_GETBY) ACE_UNUSED_ARG (buf); ACE_UNUSED_ARG (result); @@ -748,7 +747,7 @@ ACE_OS::getservbyname_r (const char *svc, struct servent *, 0); //FUZZ: enable check_for_lack_ACE_OS -#endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) */ +#endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) */ } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_NS_poll.cpp b/dep/ACE_wrappers/ace/OS_NS_poll.cpp index b25f006dc..954c59bc7 100644 --- a/dep/ACE_wrappers/ace/OS_NS_poll.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_poll.cpp @@ -1,9 +1,7 @@ -// $Id: OS_NS_poll.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: OS_NS_poll.cpp 91626 2010-09-07 10:59:20Z johnnyw $ #include "ace/OS_NS_poll.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_poll.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/dep/ACE_wrappers/ace/OS_NS_pwd.cpp b/dep/ACE_wrappers/ace/OS_NS_pwd.cpp index 1bed2d2b6..be191f62a 100644 --- a/dep/ACE_wrappers/ace/OS_NS_pwd.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_pwd.cpp @@ -1,9 +1,7 @@ -// $Id: OS_NS_pwd.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: OS_NS_pwd.cpp 91781 2010-09-15 12:49:15Z johnnyw $ #include "ace/OS_NS_pwd.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_pwd.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/dep/ACE_wrappers/ace/OS_NS_pwd.inl b/dep/ACE_wrappers/ace/OS_NS_pwd.inl index cb13fe8f2..6fcb076fd 100644 --- a/dep/ACE_wrappers/ace/OS_NS_pwd.inl +++ b/dep/ACE_wrappers/ace/OS_NS_pwd.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_pwd.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_pwd.inl 91781 2010-09-15 12:49:15Z johnnyw $ #include "ace/OS_NS_errno.h" @@ -57,13 +57,9 @@ ACE_OS::getpwnam_r (const char *name, struct passwd *pwent, # if !defined (ACE_LACKS_PWD_REENTRANT_FUNCTIONS) # if defined (ACE_HAS_PTHREADS) && \ !defined (ACE_HAS_STHREADS) || \ - defined (HPUX_11) || \ - defined (__USLC__) // Added by Roland Gigler for SCO UnixWare 7. - struct passwd *result; + defined (HPUX_11) + struct passwd *result = 0; int status; -# if defined (DIGITAL_UNIX) - ::_Pgetpwnam_r (name, pwent, buffer, buflen, &result); -# else // VAC++ doesn't correctly grok the ::getpwnam_r - the function is redefined // in pwd.h, and that redefinition is used here # if defined (__IBMCPP__) && (__IBMCPP__ >= 400) /* VAC++ 4 */ @@ -76,7 +72,6 @@ ACE_OS::getpwnam_r (const char *name, struct passwd *pwent, errno = status; result = 0; } -# endif /* (DIGITAL_UNIX) */ return result; # elif defined (AIX) if (::getpwnam_r (name, pwent, buffer, buflen) == -1) diff --git a/dep/ACE_wrappers/ace/OS_NS_regex.cpp b/dep/ACE_wrappers/ace/OS_NS_regex.cpp index f57e6787d..141d50ab2 100644 --- a/dep/ACE_wrappers/ace/OS_NS_regex.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_regex.cpp @@ -1,9 +1,7 @@ -// $Id: OS_NS_regex.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: OS_NS_regex.cpp 91781 2010-09-15 12:49:15Z johnnyw $ #include "ace/OS_NS_regex.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_regex.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/dep/ACE_wrappers/ace/OS_NS_regex.inl b/dep/ACE_wrappers/ace/OS_NS_regex.inl index 3f5a0aa93..0ffdcdfb2 100644 --- a/dep/ACE_wrappers/ace/OS_NS_regex.inl +++ b/dep/ACE_wrappers/ace/OS_NS_regex.inl @@ -1,6 +1,5 @@ // -*- C++ -*- -// -// $Id: OS_NS_regex.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_regex.inl 91781 2010-09-15 12:49:15Z johnnyw $ #include "ace/OS_NS_errno.h" #include "ace/os_include/os_regex.h" diff --git a/dep/ACE_wrappers/ace/OS_NS_signal.cpp b/dep/ACE_wrappers/ace/OS_NS_signal.cpp index 98f2152f0..e4690ce34 100644 --- a/dep/ACE_wrappers/ace/OS_NS_signal.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_signal.cpp @@ -1,9 +1,7 @@ -// $Id: OS_NS_signal.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: OS_NS_signal.cpp 91809 2010-09-17 07:20:41Z johnnyw $ #include "ace/OS_NS_signal.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_signal.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/dep/ACE_wrappers/ace/OS_NS_stdio.h b/dep/ACE_wrappers/ace/OS_NS_stdio.h index e70a4aa97..bf120229c 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdio.h +++ b/dep/ACE_wrappers/ace/OS_NS_stdio.h @@ -4,7 +4,7 @@ /** * @file OS_NS_stdio.h * - * $Id: OS_NS_stdio.h 87143 2009-10-17 10:29:01Z olli $ + * $Id: OS_NS_stdio.h 92178 2010-10-08 07:44:20Z olli $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -50,17 +50,15 @@ * using the pre-processor. * */ -#if !defined (ACE_LACKS_CLEARERR) inline void ace_clearerr_helper (FILE *stream) { -# if defined (clearerr) +#if defined (clearerr) clearerr (stream); -# undef clearerr -# else +#undef clearerr +#else ACE_STD_NAMESPACE::clearerr (stream); -# endif /* defined (clearerr) */ +#endif /* defined (clearerr) */ } -#endif /* !ACE_LACKS_CLEARERR */ inline int ace_fgetc_helper (FILE *fp) { @@ -123,7 +121,7 @@ inline ACE_HANDLE ace_fileno_helper (FILE *fp) # endif /* defined (fileno) */ } #endif /* !ACE_FILENO_EQUIVALENT */ - + #if !defined (ACE_LACKS_CUSERID) && !defined(ACE_HAS_ALT_CUSERID) \ && !defined(ACE_WIN32) && !defined (ACE_VXWORKS) /// Helper for the ACE_OS::cuserid() function @@ -199,10 +197,8 @@ namespace ACE_OS { void checkUnicodeFormat (FILE* fp); # endif // ACE_USES_WCHAR -# if !defined (ACE_LACKS_CLEARERR) ACE_NAMESPACE_INLINE_FUNCTION void clearerr (FILE* fp); -# endif /* !ACE_LACKS_CLEARERR */ //@{ @name Wrappers to obtain the current user id // Legacy as per SUSV3 diff --git a/dep/ACE_wrappers/ace/OS_NS_stdio.inl b/dep/ACE_wrappers/ace/OS_NS_stdio.inl index 64ffc18b9..22bd1fbe1 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdio.inl +++ b/dep/ACE_wrappers/ace/OS_NS_stdio.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_stdio.inl 87232 2009-10-26 13:25:55Z johnnyw $ +// $Id: OS_NS_stdio.inl 92182 2010-10-08 08:21:27Z olli $ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdlib.h" @@ -339,13 +339,11 @@ ACE_OS::flock_wrlock (ACE_OS::ace_flock_t *lock, #endif /* ACE_WIN32 */ } -#if !defined (ACE_LACKS_CLEARERR) ACE_INLINE void ACE_OS::clearerr (FILE* fp) { ace_clearerr_helper (fp); } -#endif /* !ACE_LACKS_CLEARERR */ #if !defined (ACE_LACKS_CUSERID) ACE_INLINE char * @@ -807,12 +805,7 @@ ACE_OS::rename (const char *old_name, const char *new_name, int flags) { -# if defined (ACE_LACKS_RENAME) - ACE_UNUSED_ARG (old_name); - ACE_UNUSED_ARG (new_name); - ACE_UNUSED_ARG (flags); - ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_HAS_WINCE) +# if defined (ACE_HAS_WINCE) // Win CE is always wide-char. ACE_UNUSED_ARG (flags); if (0 == ::MoveFile (ACE_TEXT_CHAR_TO_TCHAR (old_name), @@ -829,10 +822,10 @@ ACE_OS::rename (const char *old_name, if (::MoveFileExA (old_name, new_name, flags) == 0) ACE_FAIL_RETURN (-1); return 0; -# else /* ACE_LACKS_RENAME */ +# else ACE_UNUSED_ARG (flags); ACE_OSCALL_RETURN (::rename (old_name, new_name), int, -1); -# endif /* ACE_LACKS_RENAME */ +# endif /* ACE_HAS_WINCE */ } #if defined (ACE_HAS_WCHAR) @@ -841,12 +834,7 @@ ACE_OS::rename (const wchar_t *old_name, const wchar_t *new_name, int flags) { -# if defined (ACE_LACKS_RENAME) - ACE_UNUSED_ARG (old_name); - ACE_UNUSED_ARG (new_name); - ACE_UNUSED_ARG (flags); - ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_HAS_WINCE) +# if defined (ACE_HAS_WINCE) ACE_UNUSED_ARG (flags); if (::MoveFileW (old_name, new_name) == 0) ACE_FAIL_RETURN (-1); @@ -864,11 +852,11 @@ ACE_OS::rename (const wchar_t *old_name, # elif defined (ACE_WIN32) ACE_UNUSED_ARG (flags); ACE_OSCALL_RETURN (::_wrename (old_name, new_name), int, -1); -# else /* ACE_LACKS_RENAME */ +# else ACE_Wide_To_Ascii nold_name (old_name); ACE_Wide_To_Ascii nnew_name (new_name); return ACE_OS::rename (nold_name.char_rep (), nnew_name.char_rep (), flags); -# endif /* ACE_LACKS_RENAME */ +# endif /* ACE_HAS_WINCE */ } #endif /* ACE_HAS_WCHAR */ diff --git a/dep/ACE_wrappers/ace/OS_NS_stdlib.inl b/dep/ACE_wrappers/ace/OS_NS_stdlib.inl index 323149fb2..97d04e8d8 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdlib.inl +++ b/dep/ACE_wrappers/ace/OS_NS_stdlib.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_stdlib.inl 87347 2009-11-05 12:00:29Z olli $ +// $Id: OS_NS_stdlib.inl 91683 2010-09-09 09:07:49Z johnnyw $ #include "ace/config-all.h" /* Need ACE_TRACE */ #include "ace/Object_Manager_Base.h" @@ -411,13 +411,11 @@ ACE_OS::rand_r (ACE_RANDR_TYPE &seed) ACE_OS_TRACE ("ACE_OS::rand_r"); # if defined (ACE_HAS_REENTRANT_FUNCTIONS) && \ !defined (ACE_LACKS_RAND_REENTRANT_FUNCTIONS) -# if defined (DIGITAL_UNIX) - ACE_OSCALL_RETURN (::_Prand_r (&seed), int, -1); -# elif defined (ACE_HAS_BROKEN_RANDR) +# if defined (ACE_HAS_BROKEN_RANDR) ACE_OSCALL_RETURN (::rand_r (seed), int, -1); # else ACE_OSCALL_RETURN (::rand_r (&seed), int, -1); -# endif /* DIGITAL_UNIX */ +# endif /* ACE_HAS_BROKEN_RANDR */ # else ACE_UNUSED_ARG (seed); ACE_OSCALL_RETURN (::rand (), int, -1); diff --git a/dep/ACE_wrappers/ace/OS_NS_string.h b/dep/ACE_wrappers/ace/OS_NS_string.h index 2497f2c0c..54da02a8b 100644 --- a/dep/ACE_wrappers/ace/OS_NS_string.h +++ b/dep/ACE_wrappers/ace/OS_NS_string.h @@ -4,7 +4,7 @@ /** * @file OS_NS_string.h * - * $Id: OS_NS_string.h 87481 2009-11-11 11:46:10Z olli $ + * $Id: OS_NS_string.h 91995 2010-09-24 12:45:24Z johnnyw $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -97,24 +97,24 @@ namespace ACE_OS { wchar_t *strcat (wchar_t *s, const wchar_t *t); #endif /* ACE_HAS_WCHAR */ - /// Finds the first occurance of a character in a string (const char + /// Finds the first occurrence of a character in a string (const char /// version). ACE_NAMESPACE_INLINE_FUNCTION const char *strchr (const char *s, int c); #if defined (ACE_HAS_WCHAR) - /// Finds the first occurance of a character in a string (const wchar_t + /// Finds the first occurrence of a character in a string (const wchar_t /// version). ACE_NAMESPACE_INLINE_FUNCTION const wchar_t *strchr (const wchar_t *s, wchar_t c); #endif /* ACE_HAS_WCHAR */ - /// Finds the first occurance of a character in a string (char version). + /// Finds the first occurrence of a character in a string (char version). ACE_NAMESPACE_INLINE_FUNCTION char *strchr (char *s, int c); #if defined (ACE_HAS_WCHAR) - /// Finds the first occurance of a character in a string (wchar_t version). + /// Finds the first occurrence of a character in a string (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION wchar_t *strchr (wchar_t *s, wchar_t c); #endif /* ACE_HAS_WCHAR */ @@ -197,7 +197,7 @@ namespace ACE_OS { /// Returns a string describing the signal number passed in the - /// argument signum. If the supplied signal number is out of range, + /// argument @a signum. If the supplied signal number is out of range, /// a string of the form "Unknown signal %d" is used to format the string /// whose pointer is returned. extern ACE_Export @@ -219,21 +219,21 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION ACE_WCHAR_T *strncat (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len); - /// Finds the first occurance of a character in an array (const char + /// Finds the first occurrence of a character in an array (const char /// version). extern ACE_Export const char *strnchr (const char *s, int c, size_t len); - /// Finds the first occurance of a character in an array (const ACE_WCHAR_T + /// Finds the first occurrence of a character in an array (const ACE_WCHAR_T /// version). extern ACE_Export const ACE_WCHAR_T *strnchr (const ACE_WCHAR_T *s, ACE_WCHAR_T c, size_t len); - /// Finds the first occurance of a character in an array (char version). + /// Finds the first occurrence of a character in an array (char version). ACE_NAMESPACE_INLINE_FUNCTION char *strnchr (char *s, int c, size_t len); - /// Finds the first occurance of a character in an array (ACE_WCHAR_T version). + /// Finds the first occurrence of a character in an array (ACE_WCHAR_T version). ACE_NAMESPACE_INLINE_FUNCTION ACE_WCHAR_T *strnchr (ACE_WCHAR_T *s, ACE_WCHAR_T c, size_t len); @@ -277,23 +277,23 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION size_t strnlen (const ACE_WCHAR_T *s, size_t maxlen); - /// Finds the first occurance of a substring in an array (const char + /// Finds the first occurrence of a substring in an array (const char /// version). extern ACE_Export const char *strnstr (const char *s, const char *t, size_t len); - /// Finds the first occurance of a substring in an array (const wchar_t + /// Finds the first occurrence of a substring in an array (const wchar_t /// version). extern ACE_Export const ACE_WCHAR_T *strnstr (const ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len); - /// Finds the first occurance of a substring in an array (char version). + /// Finds the first occurrence of a substring in an array (char version). ACE_NAMESPACE_INLINE_FUNCTION char *strnstr (char *s, const char *t, size_t len); - /// Finds the first occurance of a substring in an array (wchar_t version). + /// Finds the first occurrence of a substring in an array (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION ACE_WCHAR_T *strnstr (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len); @@ -317,35 +317,35 @@ namespace ACE_OS { wchar_t *strpbrk (wchar_t *s1, const wchar_t *s2); #endif /* ACE_HAS_WCHAR */ - /// Finds the last occurance of a character in a string (const char + /// Finds the last occurrence of a character in a string (const char /// version). ACE_NAMESPACE_INLINE_FUNCTION const char *strrchr (const char *s, int c); #if defined (ACE_HAS_WCHAR) - /// Finds the last occurance of a character in a string (const wchar_t + /// Finds the last occurrence of a character in a string (const wchar_t /// version). ACE_NAMESPACE_INLINE_FUNCTION const wchar_t *strrchr (const wchar_t *s, wchar_t c); #endif /* ACE_HAS_WCHAR */ - /// Finds the last occurance of a character in a string (char version). + /// Finds the last occurrence of a character in a string (char version). ACE_NAMESPACE_INLINE_FUNCTION char *strrchr (char *s, int c); #if defined (ACE_HAS_WCHAR) - /// Finds the last occurance of a character in a string (wchar_t version). + /// Finds the last occurrence of a character in a string (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION wchar_t *strrchr (wchar_t *s, wchar_t c); #endif /* ACE_HAS_WCHAR */ #if defined (ACE_LACKS_STRRCHR) - /// Emulated strrchr (char version) - Finds the last occurance of a + /// Emulated strrchr (char version) - Finds the last occurrence of a /// character in a string. extern ACE_Export char *strrchr_emulation (char *s, int c); - /// Emulated strrchr (const char version) - Finds the last occurance of a + /// Emulated strrchr (const char version) - Finds the last occurrence of a /// character in a string. extern ACE_Export const char *strrchr_emulation (const char *s, int c); @@ -405,24 +405,24 @@ namespace ACE_OS { size_t strspn (const wchar_t *s1, const wchar_t *s2); #endif /* ACE_HAS_WCHAR */ - /// Finds the first occurance of a substring in a string (const char + /// Finds the first occurrence of a substring in a string (const char /// version). ACE_NAMESPACE_INLINE_FUNCTION const char *strstr (const char *s, const char *t); #if defined (ACE_HAS_WCHAR) - /// Finds the first occurance of a substring in a string (const wchar_t + /// Finds the first occurrence of a substring in a string (const wchar_t /// version). ACE_NAMESPACE_INLINE_FUNCTION const wchar_t *strstr (const wchar_t *s, const wchar_t *t); #endif /* ACE_HAS_WCHAR */ - /// Finds the first occurance of a substring in a string (char version). + /// Finds the first occurrence of a substring in a string (char version). ACE_NAMESPACE_INLINE_FUNCTION char *strstr (char *s, const char *t); #if defined (ACE_HAS_WCHAR) - /// Finds the first occurance of a substring in a string (wchar_t version). + /// Finds the first occurrence of a substring in a string (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION wchar_t *strstr (wchar_t *s, const wchar_t *t); #endif /* ACE_HAS_WCHAR */ diff --git a/dep/ACE_wrappers/ace/OS_NS_string.inl b/dep/ACE_wrappers/ace/OS_NS_string.inl index cb7b2c295..0e31a0aee 100644 --- a/dep/ACE_wrappers/ace/OS_NS_string.inl +++ b/dep/ACE_wrappers/ace/OS_NS_string.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_string.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_string.inl 92069 2010-09-28 11:38:59Z johnnyw $ // OS_NS_wchar.h is only needed to get the emulation methods. // Perhaps they should be moved. dhinton @@ -265,12 +265,7 @@ ACE_OS::strlen (const ACE_WCHAR_T *s) ACE_INLINE char * ACE_OS::strncat (char *s, const char *t, size_t len) { -#if 0 /* defined (ACE_HAS_TR24731_2005_CRT) */ - strncat_s (s, len + 1, t, _TRUNCATE); - return s; -#else return ::strncat (s, t, len); -#endif /* ACE_HAS_TR24731_2005_CRT */ } ACE_INLINE ACE_WCHAR_T * diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_resource.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_resource.cpp index fae8b0542..eea2c7d05 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_resource.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_resource.cpp @@ -1,9 +1,7 @@ -// $Id: OS_NS_sys_resource.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: OS_NS_sys_resource.cpp 91781 2010-09-15 12:49:15Z johnnyw $ #include "ace/OS_NS_sys_resource.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_sys_resource.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_select.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_select.cpp index 6ea47ea28..c644bc829 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_select.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_select.cpp @@ -1,9 +1,7 @@ -// $Id: OS_NS_sys_select.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: OS_NS_sys_select.cpp 91626 2010-09-07 10:59:20Z johnnyw $ #include "ace/OS_NS_sys_select.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_sys_select.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_socket.inl b/dep/ACE_wrappers/ace/OS_NS_sys_socket.inl index 925c340ae..f55ead2c3 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_socket.inl +++ b/dep/ACE_wrappers/ace/OS_NS_sys_socket.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_sys_socket.inl 85632 2009-06-12 19:28:00Z mitza $ +// $Id: OS_NS_sys_socket.inl 91626 2010-09-07 10:59:20Z johnnyw $ #include "ace/OS_NS_errno.h" #include "ace/OS_NS_macros.h" @@ -104,7 +104,7 @@ ACE_OS::bind (ACE_HANDLE handle, struct sockaddr *addr, int addrlen) ACE_UNUSED_ARG (addrlen); ACE_NOTSUP_RETURN (-1); #elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640) - // VxWorks clears the sin_port member after a succesfull bind when + // VxWorks clears the sin_port member after a successful bind when // sin_addr != INADDR_ANY, so after the bind we do retrieve the // original address so that user code can safely check the addr // after the bind. See bugzilla 3107 for more details diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_wait.inl b/dep/ACE_wrappers/ace/OS_NS_sys_wait.inl index f24c09267..02333b409 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_wait.inl +++ b/dep/ACE_wrappers/ace/OS_NS_sys_wait.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_sys_wait.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_sys_wait.inl 91781 2010-09-15 12:49:15Z johnnyw $ #include "ace/OS_NS_errno.h" #include "ace/Global_Macros.h" @@ -57,15 +57,13 @@ ACE_OS::waitpid (pid_t pid, // Don't try to get the process exit status if wait failed so we can // keep the original error code intact. - switch (::WaitForSingleObject (phandle, - blocking_period)) + switch (::WaitForSingleObject (phandle, blocking_period)) { case WAIT_OBJECT_0: if (status != 0) // The error status of is nonetheless // not tested because we don't know how to return the value. - ::GetExitCodeProcess (phandle, - status); + ::GetExitCodeProcess (phandle, status); break; case WAIT_TIMEOUT: errno = ETIME; diff --git a/dep/ACE_wrappers/ace/OS_NS_time.cpp b/dep/ACE_wrappers/ace/OS_NS_time.cpp index d62542621..2e7aedf23 100644 --- a/dep/ACE_wrappers/ace/OS_NS_time.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_time.cpp @@ -1,4 +1,4 @@ -// $Id: OS_NS_time.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: OS_NS_time.cpp 91683 2010-09-09 09:07:49Z johnnyw $ #include "ace/OS_NS_time.h" @@ -226,11 +226,7 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res) { ACE_OS_TRACE ("ACE_OS::localtime_r"); #if defined (ACE_HAS_REENTRANT_FUNCTIONS) -# if defined (DIGITAL_UNIX) - ACE_OSCALL_RETURN (::_Plocaltime_r (t, res), struct tm *, 0); -# else ACE_OSCALL_RETURN (::localtime_r (t, res), struct tm *, 0); -# endif /* DIGITAL_UNIX */ #elif defined (ACE_HAS_TR24731_2005_CRT) ACE_SECURECRTCALL (localtime_s (res, t), struct tm *, 0, res); return res; diff --git a/dep/ACE_wrappers/ace/OS_NS_time.inl b/dep/ACE_wrappers/ace/OS_NS_time.inl index ab8da37bb..c89fba5ac 100644 --- a/dep/ACE_wrappers/ace/OS_NS_time.inl +++ b/dep/ACE_wrappers/ace/OS_NS_time.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_time.inl 87270 2009-10-29 21:47:47Z olli $ +// $Id: OS_NS_time.inl 91683 2010-09-09 09:07:49Z johnnyw $ #include "ace/OS_NS_string.h" #include "ace/OS_NS_errno.h" @@ -28,12 +28,8 @@ ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen) ACE_OS_TRACE ("ACE_OS::asctime_r"); #if defined (ACE_HAS_REENTRANT_FUNCTIONS) # if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) - char *result; -# if defined (DIGITAL_UNIX) - ACE_OSCALL (::_Pasctime_r (t, buf), char *, 0, result); -# else + char *result = 0; ACE_OSCALL (::asctime_r (t, buf), char *, 0, result); -# endif /* DIGITAL_UNIX */ ACE_OS::strsncpy (buf, result, buflen); return buf; # else @@ -147,11 +143,7 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) return 0; } # if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) -# if defined (DIGITAL_UNIX) - ACE_OSCALL (::_Pctime_r (t, bufp), ACE_TCHAR *, 0, bufp); -# else /* DIGITAL_UNIX */ ACE_OSCALL (::ctime_r (t, bufp), char *, 0, bufp); -# endif /* DIGITAL_UNIX */ # else /* ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R */ # if defined (ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R) @@ -369,11 +361,7 @@ ACE_OS::gmtime_r (const time_t *t, struct tm *res) { ACE_OS_TRACE ("ACE_OS::gmtime_r"); #if defined (ACE_HAS_REENTRANT_FUNCTIONS) -# if defined (DIGITAL_UNIX) - ACE_OSCALL_RETURN (::_Pgmtime_r (t, res), struct tm *, 0); -# else ACE_OSCALL_RETURN (::gmtime_r (t, res), struct tm *, 0); -# endif /* DIGITAL_UNIX */ #elif defined (ACE_HAS_TR24731_2005_CRT) struct tm *tm_p = res; ACE_SECURECRTCALL (gmtime_s (res, t), struct tm *, 0, tm_p); diff --git a/dep/ACE_wrappers/ace/OS_NS_wchar.h b/dep/ACE_wrappers/ace/OS_NS_wchar.h index 4a9843ab8..dc7ddb579 100644 --- a/dep/ACE_wrappers/ace/OS_NS_wchar.h +++ b/dep/ACE_wrappers/ace/OS_NS_wchar.h @@ -4,7 +4,7 @@ /** * @file OS_NS_wchar.h * - * $Id: OS_NS_wchar.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_NS_wchar.h 91995 2010-09-24 12:45:24Z johnnyw $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -136,12 +136,12 @@ namespace ACE_OS #endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSPBRK */ #if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSRCHR) - /// Emulated wcsrchr (wchar_t version) - Finds the last occurance of a + /// Emulated wcsrchr (wchar_t version) - Finds the last occurrence of a /// character in a string. extern ACE_Export wchar_t *wcsrchr_emulation (wchar_t *string, wint_t c); - /// Emulated wcsrchr (const wchar_t version) - Finds the last occurance of a + /// Emulated wcsrchr (const wchar_t version) - Finds the last occurrence of a /// character in a string. extern ACE_Export const wchar_t *wcsrchr_emulation (const wchar_t *string, wint_t c); diff --git a/dep/ACE_wrappers/ace/OS_NS_wctype.cpp b/dep/ACE_wrappers/ace/OS_NS_wctype.cpp index d73b4c5fe..b5bb362dc 100644 --- a/dep/ACE_wrappers/ace/OS_NS_wctype.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_wctype.cpp @@ -1,10 +1,8 @@ // -*- C++ -*- -// $Id: OS_NS_wctype.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: OS_NS_wctype.cpp 91781 2010-09-15 12:49:15Z johnnyw $ #include "ace/OS_NS_wctype.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_wctype.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/dep/ACE_wrappers/ace/OS_NS_wctype.inl b/dep/ACE_wrappers/ace/OS_NS_wctype.inl index 7706471b1..79ce0812a 100644 --- a/dep/ACE_wrappers/ace/OS_NS_wctype.inl +++ b/dep/ACE_wrappers/ace/OS_NS_wctype.inl @@ -1,6 +1,5 @@ // -*- C++ -*- -// -// $Id: OS_NS_wctype.inl 83891 2008-11-28 11:01:50Z johnnyw $ +// $Id: OS_NS_wctype.inl 91781 2010-09-15 12:49:15Z johnnyw $ #if defined (ACE_LACKS_ISWCTYPE) #include "ace/OS_NS_errno.h" diff --git a/dep/ACE_wrappers/ace/OS_String.h b/dep/ACE_wrappers/ace/OS_String.h deleted file mode 100644 index 2d7aa86ad..000000000 --- a/dep/ACE_wrappers/ace/OS_String.h +++ /dev/null @@ -1,32 +0,0 @@ -// -*- C++ -*- -//============================================================================= -/** - * @file OS_String.h - * - * $Id: OS_String.h 80826 2008-03-04 14:51:23Z wotte $ - * - * @brief Contains definition of class ACE_OS_String. - * - * @author Doug Schmidt - * @author Jesper S. M|ller - * @author and a cast of thousands... - */ -//============================================================================= - -#ifndef ACE_OS_STRING_H -#define ACE_OS_STRING_H -#include /**/ "ace/pre.h" - -#include /**/ "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS_NS_string.h" -#include "ace/OS_NS_strings.h" -#include "ace/OS_NS_wchar.h" -#include "ace/OS_NS_ctype.h" - -#include /**/ "ace/post.h" -#endif /* ACE_OS_STRING_H */ diff --git a/dep/ACE_wrappers/ace/OS_TLI.h b/dep/ACE_wrappers/ace/OS_TLI.h index 61a6cd5c0..efc43ae4b 100644 --- a/dep/ACE_wrappers/ace/OS_TLI.h +++ b/dep/ACE_wrappers/ace/OS_TLI.h @@ -4,7 +4,7 @@ /** * @file OS_TLI.h * - * $Id: OS_TLI.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_TLI.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Doug Schmidt */ @@ -115,17 +115,11 @@ extern "C" } # endif /* !ACE_HAS_TLI_PROTOTYPES */ -# if defined (ACE_HAS_TIUSER_H_BROKEN_EXTERN_C) -extern "C" { -# endif /* ACE_HAS_TIUSER_H_BROKEN_EXTERN_C */ # if defined (ACE_HAS_TIUSER_H) # include /**/ # else /* What to do here??? Is there a tli.h? */ # endif /* ACE_HAS_TIUSER_H */ -# if defined (ACE_HAS_TIUSER_H_BROKEN_EXTERN_C) -} -# endif /* ACE_HAS_TIUSER_H_BROKEN_EXTERN_C */ # if defined (ACE_HAS_SVR4_TLI) // t_getname is a TLI extension added by some platforms before XTI diff --git a/dep/ACE_wrappers/ace/Object_Manager_Base.cpp b/dep/ACE_wrappers/ace/Object_Manager_Base.cpp index 400c891a2..fbc5864a9 100644 --- a/dep/ACE_wrappers/ace/Object_Manager_Base.cpp +++ b/dep/ACE_wrappers/ace/Object_Manager_Base.cpp @@ -1,4 +1,4 @@ -// $Id: Object_Manager_Base.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Object_Manager_Base.cpp 92069 2010-09-28 11:38:59Z johnnyw $ #include "ace/Object_Manager_Base.h" @@ -15,10 +15,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) int ACE_SEH_Default_Exception_Selector (void *) { -#if 0 - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Win32 structured exception exiting thread\n"))); -#endif /* 0 */ // this is only windows and only used here, // defined in ace/config-win32-common.h. return (DWORD) ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION; diff --git a/dep/ACE_wrappers/ace/Obstack_T.h b/dep/ACE_wrappers/ace/Obstack_T.h index d27d43b6e..f191934fd 100644 --- a/dep/ACE_wrappers/ace/Obstack_T.h +++ b/dep/ACE_wrappers/ace/Obstack_T.h @@ -4,7 +4,7 @@ /** * @file Obstack_T.h * - * $Id: Obstack_T.h 88793 2010-02-01 17:50:34Z cleeland $ + * $Id: Obstack_T.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Doug Schmidt * @author Nanbor Wang @@ -71,12 +71,7 @@ public: ACE_CHAR_T *copy (const ACE_CHAR_T *data, size_t len); - /// Return the maximum @a length or @a size of a string that can be put - /// into this Obstack. @a size = @a length * sizeof (ACE_CHAR_T). - /// - /// @deprecated No need to use this function as you can put objects of - /// arbitrary lengths into the obstack now. - size_t length (void) const; + /// Return the maximum @a size size_t size (void) const; /// "Unwind" the stack. If @a obj is a null pointer, everything allocated diff --git a/dep/ACE_wrappers/ace/Obstack_T.inl b/dep/ACE_wrappers/ace/Obstack_T.inl index dc5665cc7..4d93048b3 100644 --- a/dep/ACE_wrappers/ace/Obstack_T.inl +++ b/dep/ACE_wrappers/ace/Obstack_T.inl @@ -1,15 +1,8 @@ // -*- C++ -*- -// -// $Id: Obstack_T.inl 88793 2010-02-01 17:50:34Z cleeland $ +// $Id: Obstack_T.inl 91688 2010-09-09 11:21:50Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template ACE_INLINE size_t -ACE_Obstack_T::length () const -{ - return this->size_ / sizeof (ACE_CHAR_T); -} - template ACE_INLINE size_t ACE_Obstack_T::size () const { diff --git a/dep/ACE_wrappers/ace/POSIX_Asynch_IO.h b/dep/ACE_wrappers/ace/POSIX_Asynch_IO.h index 0f3ed30b4..ba1803037 100644 --- a/dep/ACE_wrappers/ace/POSIX_Asynch_IO.h +++ b/dep/ACE_wrappers/ace/POSIX_Asynch_IO.h @@ -4,7 +4,7 @@ /** * @file POSIX_Asynch_IO.h * - * $Id: POSIX_Asynch_IO.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: POSIX_Asynch_IO.h 91688 2010-09-09 11:21:50Z johnnyw $ * * The implementation classes for POSIX implementation of Asynch * Operations are defined here in this file. @@ -893,10 +893,6 @@ private: typedef ACE_Map_Manager MAP_MANAGER; - /// @deprecated (Two) Deprecated typedefs. Use the map traits instead. - typedef MAP_MANAGER::ITERATOR MAP_ITERATOR; - typedef MAP_MANAGER::ENTRY MAP_ENTRY; - /// Map of Result pointers that correspond to all the pending connects. MAP_MANAGER result_map_; diff --git a/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp b/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp index def961477..55d0fb79d 100644 --- a/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp +++ b/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp @@ -1,4 +1,4 @@ -// $Id: POSIX_CB_Proactor.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ +// $Id: POSIX_CB_Proactor.cpp 91683 2010-09-09 09:07:49Z johnnyw $ #include "ace/POSIX_CB_Proactor.h" @@ -83,10 +83,6 @@ ACE_POSIX_CB_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) // @@ TODO: This gets the completion method back to this proactor to // find the completed aiocb. It would be so much better to not only get // the proactor, but the aiocb as well. -#if defined(__sgi) - result->aio_sigevent.sigev_notify = SIGEV_CALLBACK; - result->aio_sigevent.sigev_func = aio_completion_func ; -#else result->aio_sigevent.sigev_notify = SIGEV_THREAD; # if defined (ACE_HAS_SIG_C_FUNC) result->aio_sigevent.sigev_notify_function = @@ -95,7 +91,6 @@ ACE_POSIX_CB_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) result->aio_sigevent.sigev_notify_function = aio_completion_func; # endif /* ACE_HAS_SIG_C_FUNC */ result->aio_sigevent.sigev_notify_attributes = 0; -#endif /* __sgi */ result->aio_sigevent.sigev_value.sival_ptr = this ; diff --git a/dep/ACE_wrappers/ace/POSIX_Proactor.cpp b/dep/ACE_wrappers/ace/POSIX_Proactor.cpp index 151aa26ab..635661d9e 100644 --- a/dep/ACE_wrappers/ace/POSIX_Proactor.cpp +++ b/dep/ACE_wrappers/ace/POSIX_Proactor.cpp @@ -1,4 +1,4 @@ -// $Id: POSIX_Proactor.cpp 86102 2009-07-18 04:15:48Z wotte $ +// $Id: POSIX_Proactor.cpp 92069 2010-09-28 11:38:59Z johnnyw $ #include "ace/POSIX_Proactor.h" @@ -82,10 +82,6 @@ ACE_POSIX_Proactor::ACE_POSIX_Proactor (void) os_id_ = ACE_OS_HPUX; // set family -#elif defined(__sgi) - - os_id_ = ACE_OS_IRIX; // set family - #elif defined(__OpenBSD) os_id_ = ACE_OS_OPENBSD; // set family @@ -520,39 +516,6 @@ ACE_POSIX_Proactor::create_asynch_timer return implementation; } -#if 0 -int -ACE_POSIX_Proactor::handle_signal (int, siginfo_t *, ucontext_t *) -{ - // Perform a non-blocking "poll" for all the I/O events that have - // completed in the I/O completion queue. - - ACE_Time_Value timeout (0, 0); - int result = 0; - - for (;;) - { - result = this->handle_events (timeout); - if (result != 0 || errno == ETIME) - break; - } - - // If our handle_events failed, we'll report a failure to the - // Reactor. - return result == -1 ? -1 : 0; -} - -int -ACE_POSIX_Proactor::handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask) -{ - ACE_UNUSED_ARG (close_mask); - ACE_UNUSED_ARG (handle); - - return this->close (); -} -#endif /* 0 */ - void ACE_POSIX_Proactor::application_specific_code (ACE_POSIX_Asynch_Result *asynch_result, size_t bytes_transferred, @@ -1428,7 +1391,7 @@ ACE_POSIX_AIOCB_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) const ACE_TCHAR *ptype = 0; // Start IO - // The following aio_ptr anathema is required to work around a bug in + // The following aio_ptr anathema is required to work around a bug in // the optimizer for GCC 4.1.2 aiocb * aio_ptr (result); switch (result->aio_lio_opcode ) diff --git a/dep/ACE_wrappers/ace/Pair.h b/dep/ACE_wrappers/ace/Pair.h deleted file mode 100644 index 39e857564..000000000 --- a/dep/ACE_wrappers/ace/Pair.h +++ /dev/null @@ -1,32 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Pair.h - * - * $Id: Pair.h 80826 2008-03-04 14:51:23Z wotte $ - * - * ACE_Pair<> convenience header. - * - * @author Irfan Pyarali - */ -//============================================================================= - - -#ifndef ACE_PAIR_H -#define ACE_PAIR_H - -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Include the templates here. -#include "ace/Pair_T.h" - -#include /**/ "ace/post.h" - -#endif /* ACE_PAIR_H */ diff --git a/dep/ACE_wrappers/ace/Pair_T.h b/dep/ACE_wrappers/ace/Pair_T.h index 2f744ec4d..604fcba71 100644 --- a/dep/ACE_wrappers/ace/Pair_T.h +++ b/dep/ACE_wrappers/ace/Pair_T.h @@ -4,7 +4,7 @@ /** * @file Pair_T.h * - * $Id: Pair_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Pair_T.h 92097 2010-09-30 05:41:49Z msmit $ * * @author Irfan Pyarali */ @@ -23,55 +23,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -/** - * @class ACE_Pair - * - * @brief Defines a pair. - * - * Similar to the STL pair. - */ -template -class ACE_Pair -{ -public: - - // = Traits. - typedef T1 first_type; - typedef T2 second_type; - - // = Initialization and termination methods. - /// Constructor. - ACE_Pair (const T1 &t1, - const T2 &t2); - - /// Default constructor. - ACE_Pair (void); - - /// Get first. - T1 &first (void); - const T1 &first (void) const; - - /// Set first. - void first (const T1 &t1); - - /// Get second. - T2 &second (void); - const T2 &second (void) const; - - /// Set second. - void second (const T2 &t2); - - // Compare pairs. - bool operator== (const ACE_Pair &rhs) const; - -protected: - /// First. - T1 first_; - - /// Second. - T2 second_; -}; - /** * @class ACE_Reference_Pair * diff --git a/dep/ACE_wrappers/ace/Pair_T.inl b/dep/ACE_wrappers/ace/Pair_T.inl index 99c5bcd19..cb362e1a3 100644 --- a/dep/ACE_wrappers/ace/Pair_T.inl +++ b/dep/ACE_wrappers/ace/Pair_T.inl @@ -1,65 +1,9 @@ // -*- C++ -*- // -// $Id: Pair_T.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Pair_T.inl 92097 2010-09-30 05:41:49Z msmit $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template ACE_INLINE -ACE_Pair::ACE_Pair (const T1 &t1, - const T2 &t2) - : first_ (t1), - second_ (t2) -{ -} - -template ACE_INLINE -ACE_Pair::ACE_Pair (void) -{ -} - -template ACE_INLINE T1 & -ACE_Pair::first (void) -{ - return this->first_; -} - -template ACE_INLINE const T1 & -ACE_Pair::first (void) const -{ - return this->first_; -} - -template ACE_INLINE void -ACE_Pair::first (const T1 &t1) -{ - this->first_ = t1; -} - -template ACE_INLINE T2 & -ACE_Pair::second (void) -{ - return this->second_; -} - -template ACE_INLINE const T2 & -ACE_Pair::second (void) const -{ - return this->second_; -} - -template ACE_INLINE void -ACE_Pair::second (const T2 &t2) -{ - this->second_ = t2; -} - -template ACE_INLINE bool -ACE_Pair::operator== (const ACE_Pair &rhs) const -{ - return (this->first_ == rhs.first_ && - this->second_ == rhs.second_); -} - template ACE_INLINE ACE_Reference_Pair::ACE_Reference_Pair (T1 &t1, T2 &t2) diff --git a/dep/ACE_wrappers/ace/Ping_Socket.cpp b/dep/ACE_wrappers/ace/Ping_Socket.cpp index 1ebb7d164..6fe92fb37 100644 --- a/dep/ACE_wrappers/ace/Ping_Socket.cpp +++ b/dep/ACE_wrappers/ace/Ping_Socket.cpp @@ -1,4 +1,4 @@ -// $Id: Ping_Socket.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ +// $Id: Ping_Socket.cpp 92069 2010-09-28 11:38:59Z johnnyw $ #include "ace/Ping_Socket.h" @@ -212,13 +212,9 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len) // Warning... using knowledge of IP header layout. This avoids a maze of // #if blocks for various systems. The first byte of the header has the // IP version in the left-most 4 bits and the length in the other 4 bits. -#if 0 - hlen1 = ip->ip_hl; // length of IP header -#else hlen1 = static_cast(*ptr); hlen1 <<= 4; // Bump the version off hlen1 >>= 4; // Zero-extended length remains -#endif hlen1 <<= 2; // Now it counts bytes, not words icmp = (struct icmp *) (ptr + hlen1); // start of ICMP header diff --git a/dep/ACE_wrappers/ace/Pipe.cpp b/dep/ACE_wrappers/ace/Pipe.cpp index 8286302a6..bb8a851ea 100644 --- a/dep/ACE_wrappers/ace/Pipe.cpp +++ b/dep/ACE_wrappers/ace/Pipe.cpp @@ -1,4 +1,4 @@ -// $Id: Pipe.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Pipe.cpp 92010 2010-09-24 14:54:19Z shuston $ #include "ace/Pipe.h" #include "ace/SOCK_Acceptor.h" @@ -254,23 +254,22 @@ ACE_Pipe::close (void) { ACE_TRACE ("ACE_Pipe::close"); - int result = 0; - - // Note that the following will work even if we aren't closing down - // sockets because will just call <::close> in - // that case! - - if (this->handles_[0] != ACE_INVALID_HANDLE) - result = ACE_OS::closesocket (this->handles_[0]); - this->handles_[0] = ACE_INVALID_HANDLE; - - if (this->handles_[1] != ACE_INVALID_HANDLE) - result |= ACE_OS::closesocket (this->handles_[1]); - this->handles_[1] = ACE_INVALID_HANDLE; - + int result = this->close_read (); + result |= this->close_write (); return result; } +int +ACE_Pipe::close_read (void) +{ + return this->close_handle (0); +} + +int ACE_Pipe::close_write (void) +{ + return this->close_handle (1); +} + // Send N char *ptrs and int lengths. Note that the char *'s precede // the ints (basically, an varargs version of writev). The count N is // the *total* number of trailing arguments, *not* a couple of the diff --git a/dep/ACE_wrappers/ace/Pipe.h b/dep/ACE_wrappers/ace/Pipe.h index b831769da..b305456eb 100644 --- a/dep/ACE_wrappers/ace/Pipe.h +++ b/dep/ACE_wrappers/ace/Pipe.h @@ -4,7 +4,7 @@ /** * @file Pipe.h * - * $Id: Pipe.h 87240 2009-10-27 15:54:10Z schmidt $ + * $Id: Pipe.h 92010 2010-09-24 14:54:19Z shuston $ * * @author Douglas C. Schmidt */ @@ -65,6 +65,8 @@ public: /// Close down the pipe HANDLEs; int close (void); + int close_read (void); + int close_write (void); // = Accessors. @@ -152,6 +154,7 @@ public: private: ACE_HANDLE handles_[2]; + int close_handle (int which); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Pipe.inl b/dep/ACE_wrappers/ace/Pipe.inl index 63e6ea5d4..3199bbf03 100644 --- a/dep/ACE_wrappers/ace/Pipe.inl +++ b/dep/ACE_wrappers/ace/Pipe.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Pipe.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Pipe.inl 92010 2010-09-24 14:54:19Z shuston $ #include "ace/Global_Macros.h" #include "ace/ACE.h" @@ -185,4 +185,19 @@ ACE_Pipe::recv (void *buf, size_t n, overlapped); } +ACE_INLINE int +ACE_Pipe::close_handle (int which) +{ + int result = 0; + + // Note that the following will work even if we aren't closing down + // sockets because will just call <::close> in + // that case! + + if (this->handles_[which] != ACE_INVALID_HANDLE) + result = ACE_OS::closesocket (this->handles_[which]); + this->handles_[which] = ACE_INVALID_HANDLE; + return result; +} + ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Process.cpp b/dep/ACE_wrappers/ace/Process.cpp index ce397b4c0..519802359 100644 --- a/dep/ACE_wrappers/ace/Process.cpp +++ b/dep/ACE_wrappers/ace/Process.cpp @@ -1,4 +1,4 @@ -// $Id: Process.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Process.cpp 92218 2010-10-14 13:18:15Z mcorino $ #include "ace/Process.h" @@ -796,7 +796,8 @@ ACE_Process::convert_env_buffer (const char* env) const ACE_Process_Options::ACE_Process_Options (bool inherit_environment, size_t command_line_buf_len, size_t env_buf_len, - size_t max_env_args) + size_t max_env_args, + size_t max_cmdline_args) : #if !defined (ACE_HAS_WINCE) inherit_environment_ (inherit_environment), @@ -830,6 +831,8 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, command_line_buf_ (0), command_line_copy_ (0), command_line_buf_len_ (command_line_buf_len), + max_command_line_args_ (max_cmdline_args), + command_line_argv_ (0), process_group_ (ACE_INVALID_PID), use_unicode_environment_ (false) { @@ -859,6 +862,8 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, this->startup_info_.cb = sizeof this->startup_info_; #endif /* ACE_WIN32 */ #endif /* !ACE_HAS_WINCE */ + ACE_NEW (command_line_argv_, + ACE_TCHAR *[max_cmdline_args]); } #if !defined (ACE_HAS_WINCE) @@ -1178,6 +1183,7 @@ ACE_Process_Options::~ACE_Process_Options (void) #endif /* !ACE_HAS_WINCE */ delete [] command_line_buf_; ACE::strdelete (command_line_copy_); + delete [] command_line_argv_; } int @@ -1315,12 +1321,12 @@ ACE_Process_Options::command_line_argv (void) parser.preserve_designators ('\"', '\"'); // " parser.preserve_designators ('\'', '\''); - int x = 0; + unsigned int x = 0; do command_line_argv_[x] = parser.next (); while (command_line_argv_[x] != 0 // substract one for the ending zero. - && ++x < MAX_COMMAND_LINE_OPTIONS - 1); + && ++x < max_command_line_args_ - 1); command_line_argv_[x] = 0; } diff --git a/dep/ACE_wrappers/ace/Process.h b/dep/ACE_wrappers/ace/Process.h index cdba43cb8..61a3802ec 100644 --- a/dep/ACE_wrappers/ace/Process.h +++ b/dep/ACE_wrappers/ace/Process.h @@ -4,7 +4,7 @@ /** * @file Process.h * - * $Id: Process.h 91571 2010-08-30 15:35:12Z shuston $ + * $Id: Process.h 92218 2010-10-14 13:18:15Z mcorino $ * * @author Tim Harrison */ @@ -84,7 +84,8 @@ public: ACE_Process_Options (bool inherit_environment = true, size_t command_line_buf_len = DEFAULT_COMMAND_LINE_BUF_LEN, size_t env_buf_len = ENVIRONMENT_BUFFER, - size_t max_env_args = MAX_ENVIRONMENT_ARGS); + size_t max_env_args = MAX_ENVIRONMENT_ARGS, + size_t max_cmdline_args = MAX_COMMAND_LINE_OPTIONS); /// Destructor. ~ACE_Process_Options (void); @@ -232,6 +233,13 @@ public: pid_t setgroup (pid_t pgrp); /// Allows disabling of handle inheritance, default is TRUE. + /// + /// @remarks @b Windows: the handle_inheritance value is passed as the + /// bInheritHandles value to the CreateProcess() system function. Therefore, + /// if you redirect standard input, output, or error via + /// ACE_Process_Options::set_handles() you must not call + /// handle_inheritance(false). Doing so will prevent the duplicated handles + /// from surviving in the created process. int handle_inheritance (void); void handle_inheritance (int); @@ -433,8 +441,11 @@ protected: /// Max length of command_line_buf_ size_t command_line_buf_len_; + /// Maximum number of command-line arguments. Configurable + size_t max_command_line_args_; + /// Argv-style command-line arguments. - ACE_TCHAR *command_line_argv_[MAX_COMMAND_LINE_OPTIONS]; + ACE_TCHAR **command_line_argv_; /// Process-group on Unix; unused on Win32. pid_t process_group_; diff --git a/dep/ACE_wrappers/ace/Process_Manager.cpp b/dep/ACE_wrappers/ace/Process_Manager.cpp index 572e7457a..e9be7773a 100644 --- a/dep/ACE_wrappers/ace/Process_Manager.cpp +++ b/dep/ACE_wrappers/ace/Process_Manager.cpp @@ -1,4 +1,4 @@ -// $Id: Process_Manager.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ +// $Id: Process_Manager.cpp 91688 2010-09-09 11:21:50Z johnnyw $ // Process_Manager.cpp #include "ace/Process_Manager.h" @@ -970,22 +970,6 @@ ACE_Process_Manager::wait (pid_t pid, return pid; } -// Legacy method: - -int -ACE_Process_Manager::reap (pid_t pid, - ACE_exitcode *stat_loc, - int options) -{ - ACE_TRACE ("ACE_Process_Manager::reap"); - - return this->wait (pid, - (ACE_BIT_ENABLED (options, WNOHANG) - ? ACE_Time_Value::zero - : ACE_Time_Value::max_time), - stat_loc); -} - // Notify either the process-specific handler or the generic handler. // If process-specific, call handle_close on the handler. Returns 1 // if process found, 0 if not. Must be called with locks held. diff --git a/dep/ACE_wrappers/ace/Process_Manager.h b/dep/ACE_wrappers/ace/Process_Manager.h index 26515476c..3956c18d0 100644 --- a/dep/ACE_wrappers/ace/Process_Manager.h +++ b/dep/ACE_wrappers/ace/Process_Manager.h @@ -4,7 +4,7 @@ /** * @file Process_Manager.h * - * $Id: Process_Manager.h 84619 2009-02-26 12:26:16Z johnnyw $ + * $Id: Process_Manager.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -269,17 +269,6 @@ public: */ pid_t wait (pid_t pid, ACE_exitcode *status = 0); - - /** - * @deprecated - * Reap the result of a single process by calling ACE_OS::waitpid(), - * therefore, this method is not portable to Windows. If the child is - * successfully reaped, remove() is called automatically. - * Use one of the wait() methods instead of this method. - */ - int reap (pid_t pid = -1, - ACE_exitcode *stat_loc = 0, - int options = WNOHANG); //@} /** diff --git a/dep/ACE_wrappers/ace/RB_Tree.cpp b/dep/ACE_wrappers/ace/RB_Tree.cpp index 57095be57..0a6c8a08c 100644 --- a/dep/ACE_wrappers/ace/RB_Tree.cpp +++ b/dep/ACE_wrappers/ace/RB_Tree.cpp @@ -1,4 +1,4 @@ -// $Id: RB_Tree.cpp 81768 2008-05-23 12:45:54Z sma $ +// $Id: RB_Tree.cpp 91813 2010-09-17 07:52:52Z johnnyw $ #ifndef ACE_RB_TREE_CPP #define ACE_RB_TREE_CPP @@ -1076,7 +1076,7 @@ ACE_RB_Tree::remove_i (ACE_RB_Tree_Node< y->color (z->color ()); z->color (yColor); - //Reassign the y pointer to z because the node that y points to will be + //Reassign the y pointer to z because the node that y points to will be //deleted y = z; } diff --git a/dep/ACE_wrappers/ace/README b/dep/ACE_wrappers/ace/README index aeec9f1eb..6afb534a2 100644 --- a/dep/ACE_wrappers/ace/README +++ b/dep/ACE_wrappers/ace/README @@ -1,4 +1,4 @@ -// $Id: README 91581 2010-08-31 13:18:11Z shuston $ +// $Id: README 92182 2010-10-08 08:21:27Z olli $ ACE Portability Macros ---------------------- @@ -833,8 +833,6 @@ ACE_LACKS_AUTO_MMAP_REPLACEMENT No system support for replacing any ACE_LACKS_BSEARCH Compiler/platform lacks the standard C library bsearch() function -ACE_LACKS_CLEARERR Platform lacks the clearerr system - call. ACE_LACKS_CLOSEDIR Platform lacks closedir and the closedir emulation must be used ACE_LACKS_OPENDIR Platform lacks opendir and the opendir @@ -890,8 +888,6 @@ ACE_LACKS_INET_ATON Platform lacks the inet_aton() ACE_LACKS_INET_ATON_PROTOTYPE Platform/compiler lacks the inet_aton() prototype (e.g., LynxOS) -ACE_LACKS_IOSTREAMS_TOTALLY Iostreams are not supported - adequately on the given platform. ACE_LACKS_IOSTREAM_FX iostream header does not declare ipfx (), opfx (), etc. @@ -977,7 +973,6 @@ ACE_LACKS_RAND_REENTRANT_FUNCTIONS Platform lacks rand_r() ACE_LACKS_READLINK Platform lacks the readlink() function. ACE_LACKS_READV Platform doesn't define readv, so use our own -ACE_LACKS_RENAME Platform lacks rename(). ACE_LACKS_RLIMIT Platform/compiler lacks {get,set}rlimit() function (e.g., VxWorks, Chorus, and diff --git a/dep/ACE_wrappers/ace/Reactor.h b/dep/ACE_wrappers/ace/Reactor.h index 6f0fdf350..6198b4ebc 100644 --- a/dep/ACE_wrappers/ace/Reactor.h +++ b/dep/ACE_wrappers/ace/Reactor.h @@ -4,7 +4,7 @@ /** * @file Reactor.h * - * $Id: Reactor.h 88832 2010-02-04 09:57:42Z johnnyw $ + * $Id: Reactor.h 92345 2010-10-24 12:39:33Z johnnyw $ * * @author Irfan Pyarali * @author Douglas C. Schmidt @@ -43,7 +43,7 @@ class ACE_Sig_Set; /* * Hook to specialize the Reactor implementation with the concrete - * Reactor type, for exmaple, select, thread pool reactor known + * Reactor type, for example, select, thread pool reactor known * at compile time. */ //@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK @@ -107,13 +107,13 @@ public: // = Singleton reactor event loop management methods. // Note that these method ONLY work on the "Singleton Reactor," - // i.e., the one returned from . + // i.e., the one returned from ACE_Reactor::instance(). /** * Run the event loop until the * - * method returns -1 or the method is invoked. + * method returns -1 or the end_event_loop() method is invoked. * Note that this method can only be used by the singleton - * . Thus, to run another reactor use + * ACE_Reactor::instance(). Thus, to run another reactor use * . * * @deprecated Use ACE_Reactor::instance()->run_reactor_event_loop() instead @@ -122,11 +122,11 @@ public: static int run_alertable_event_loop (void); /** - * Run the event loop until the or + * Run the event loop until the ACE_Reactor::handle_events() or * methods returns -1, the - * method is invoked, or the ACE_Time_Value + * end_event_loop() method is invoked, or the ACE_Time_Value * expires. Note that this method can only be used by the singleton - * . Thus, to run another reactor use + * ACE_Reactor::instance(). Thus, to run another reactor use * . * * @deprecated Use ACE_Reactor::instance()->run_reactor_event_loop() instead @@ -135,10 +135,10 @@ public: static int run_alertable_event_loop (ACE_Time_Value &tv); /** - * Instruct the to terminate its event loop - * and notifies the so that it can wake up + * Instruct the ACE_Reactor::instance() to terminate its event loop + * and notifies the ACE_Reactor::instance() so that it can wake up * and close down gracefully. Note that this method can only be - * used by the singleton . Thus, to + * used by the singleton ACE_Reactor::instance(). Thus, to * terminate another reactor, use * . * @@ -147,9 +147,9 @@ public: static int end_event_loop (void); /** - * Report if the 's event loop is finished. + * Report if the ACE_Reactor::instance()'s event loop is finished. * Note that this method can only be used by the singleton - * . Thus, to check another reactor use + * ACE_Reactor::instance(). Thus, to check another reactor use * . * * @deprecated Use ACE_Reactor::instance()->reactor_event_loop_done() instead @@ -157,10 +157,10 @@ public: static int event_loop_done (void); /** - * Resets the static so that the - * method can be restarted. Note that this method - * can only be used by the singleton . Thus, - * to reset another reactor use . + * Resets the ACE_Reactor::end_event_loop_ static so that the + * run_event_loop() method can be restarted. Note that this method + * can only be used by the singleton ACE_Reactor::instance(). Thus, + * to reset another reactor use ACE_Reactor::reset_reactor_event_loop(). * * @deprecated Use ACE_Reactor::instance()->reset_reactor_event_loop() * instead @@ -179,16 +179,16 @@ public: // These methods work with an instance of a reactor. /** * Run the event loop until the - * - * method returns -1 or the method is invoked. + * ACE_Reactor::handle_events()/ACE_Reactor::alertable_handle_events() + * method returns -1 or the end_reactor_event_loop() method is invoked. */ int run_reactor_event_loop (REACTOR_EVENT_HOOK = 0); int run_alertable_reactor_event_loop (REACTOR_EVENT_HOOK = 0); /** - * Run the event loop until the or + * Run the event loop until the ACE_Reactor::handle_events() or * methods returns -1, the - * method is invoked, or the ACE_Time_Value + * end_reactor_event_loop() method is invoked, or the ACE_Time_Value * expires. */ int run_reactor_event_loop (ACE_Time_Value &tv, @@ -212,8 +212,8 @@ public: /// Indicate if the Reactor's event loop has been ended. int reactor_event_loop_done (void); - /// Resets the static so that the - /// method can be restarted. + /// Resets the ACE_Reactor::end_event_loop_ static so that the + /// run_event_loop() method can be restarted. void reset_reactor_event_loop (void); /** @@ -232,9 +232,9 @@ public: virtual ~ACE_Reactor (void); /** - * Initialize the ACE_Reactor to manage . - * If @a restart is false then the ACE_Reactor's - * method will be restarted automatically when occurs. If + * Initialize the ACE_Reactor to manage @a max_number_of_handles. + * If @a restart is false then the ACE_Reactor's handle_events() + * method will be restarted automatically when @c EINTR occurs. If * @a signal_handler or @a timer_queue are non-0 they are used as the * signal handler and timer queue, respectively. */ @@ -544,7 +544,7 @@ public: /** * Schedule a timer event. * - * Schedule a timer event that will expire after an amount + * Schedule a timer event that will expire after an @a delay amount * of time. The return value of this method, a timer_id value, * uniquely identifies the @a event_handler in the ACE_Reactor's * internal list of timers. This timer_id value can be used to @@ -578,7 +578,7 @@ public: * * Resets the interval of the timer represented by @a timer_id to * @a interval, which is specified in relative time to the current - * . If @a interval is equal to + * gettimeofday(). If @a interval is equal to * ACE_Time_Value::zero, the timer will become a non-rescheduling * timer. Returns 0 if successful, -1 if not. * diff --git a/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.h b/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.h index 38e9f3bb4..1cfb83c77 100644 --- a/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.h +++ b/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.h @@ -4,7 +4,7 @@ /** * @file Reactor_Notification_Strategy.h * - * $Id: Reactor_Notification_Strategy.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Reactor_Notification_Strategy.h 92345 2010-10-24 12:39:33Z johnnyw $ * * @author Doug Schmidt */ @@ -28,7 +28,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @brief Used to notify an ACE_Reactor * * Integrates the ACE_Message_Queue notification into the - * method. + * ACE_Reactor::notify() method. */ class ACE_Export ACE_Reactor_Notification_Strategy : public ACE_Notification_Strategy { @@ -37,7 +37,7 @@ public: ACE_Event_Handler *eh, ACE_Reactor_Mask mask); - /// Default dtor. + /// Default destructor. virtual ~ACE_Reactor_Notification_Strategy (void); virtual int notify (void); diff --git a/dep/ACE_wrappers/ace/Read_Buffer.h b/dep/ACE_wrappers/ace/Read_Buffer.h index fafd42d65..967ec4dde 100644 --- a/dep/ACE_wrappers/ace/Read_Buffer.h +++ b/dep/ACE_wrappers/ace/Read_Buffer.h @@ -4,7 +4,7 @@ /** * @file Read_Buffer.h * - * $Id: Read_Buffer.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Read_Buffer.h 92345 2010-10-24 12:39:33Z johnnyw $ * * @author Douglas C. Schmidt * @author Seth Widoff @@ -32,7 +32,7 @@ class ACE_Allocator; /** * @class ACE_Read_Buffer * - * @brief Efficiently reads an artibrarily large buffer from an input + * @brief Efficiently reads an arbitrarily large buffer from an input * stream up to and including a termination character. Also * performs search/replace on single occurrences a character in * the buffer using the principles of Integrated Layer @@ -66,13 +66,13 @@ public: /** * Returns a pointer dynamically allocated with - * ACE_Allocator::malloc to data from the input stream up to (and + * ACE_Allocator::malloc() to data from the input stream up to (and * including) the @a terminator. If @a search is >= 0 then all * occurrences of the @a search value are substituted with the * @a replace value. The last of the byte of data is a 0, so that * @c strlen can be used on it. The caller is responsible for * freeing the pointer returned from this method using the - * ACE_Allocator::free. + * ACE_Allocator::free(). */ char *read (int terminator = EOF, int search = '\n', diff --git a/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.cpp b/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.cpp index c32c20010..6130642d5 100644 --- a/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.cpp +++ b/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.cpp @@ -1,7 +1,7 @@ /** * @file Recursive_Thread_Mutex.cpp * - * $Id: Recursive_Thread_Mutex.cpp 91286 2010-08-05 09:04:31Z johnnyw $ + * $Id: Recursive_Thread_Mutex.cpp 91688 2010-09-09 11:21:50Z johnnyw $ * * Originally in Synch.cpp * @@ -18,8 +18,6 @@ #include "ace/Log_Msg.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Recursive_Thread_Mutex) diff --git a/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.h b/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.h index 93a25a7bd..6ddd04bd6 100644 --- a/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.h +++ b/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.h @@ -4,7 +4,7 @@ /** * @file Recursive_Thread_Mutex.h * - * $Id: Recursive_Thread_Mutex.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: Recursive_Thread_Mutex.h 91688 2010-09-09 11:21:50Z johnnyw $ * * Moved from Synch.h. * @@ -153,9 +153,6 @@ public: /// Returns a reference to the recursive mutex; ACE_recursive_thread_mutex_t &lock (void); - /// @deprecated Returns a reference to the recursive mutex; - ACE_recursive_thread_mutex_t &mutex (void); - /// Returns a reference to the recursive mutex's internal mutex; ACE_thread_mutex_t &get_nesting_mutex (void); diff --git a/dep/ACE_wrappers/ace/Refcountable.h b/dep/ACE_wrappers/ace/Refcountable.h deleted file mode 100644 index eba916cd6..000000000 --- a/dep/ACE_wrappers/ace/Refcountable.h +++ /dev/null @@ -1,32 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Refcountable.h - * - * $Id: Refcountable.h 81402 2008-04-23 18:30:54Z johnnyw $ - * - * @author Doug Schmidt - */ -//============================================================================= -#ifndef ACE_REFCOUNTABLE_H -#define ACE_REFCOUNTABLE_H -#include /**/ "ace/pre.h" - -#include /**/ "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Refcountable_T.h" -#include "ace/Null_Mutex.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -typedef ACE_Refcountable_T ACE_Refcountable; - -ACE_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /*ACE_REFCOUNTABLE_H*/ diff --git a/dep/ACE_wrappers/ace/Refcountable_T.h b/dep/ACE_wrappers/ace/Refcountable_T.h index 36e4c508d..a8b0ec5f2 100644 --- a/dep/ACE_wrappers/ace/Refcountable_T.h +++ b/dep/ACE_wrappers/ace/Refcountable_T.h @@ -4,7 +4,7 @@ /** * @file Refcountable_T.h * - * $Id: Refcountable_T.h 81409 2008-04-24 08:30:48Z johnnyw $ + * $Id: Refcountable_T.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Doug Schmidt * @author Johnny Willemsen @@ -22,6 +22,7 @@ #include "ace/Atomic_Op.h" #include "ace/Synch_Traits.h" +#include "ace/Null_Mutex.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -32,8 +33,10 @@ public: /// Destructor. virtual ~ACE_Refcountable_T (void); - // = Increment/Decrement refcount + /// Increment refcount long increment (void); + + /// Decrement refcount long decrement (void); /// Returns the current refcount. @@ -47,8 +50,6 @@ protected: ACE_Atomic_Op refcount_; }; -typedef ACE_Refcountable_T ACE_Refcountable; - ACE_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/dep/ACE_wrappers/ace/Registry_Name_Space.h b/dep/ACE_wrappers/ace/Registry_Name_Space.h index 6e37419e8..eb9f77587 100644 --- a/dep/ACE_wrappers/ace/Registry_Name_Space.h +++ b/dep/ACE_wrappers/ace/Registry_Name_Space.h @@ -4,7 +4,7 @@ /** * @file Registry_Name_Space.h * - * $Id: Registry_Name_Space.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Registry_Name_Space.h 92345 2010-10-24 12:39:33Z johnnyw $ * * @author Irfan Pyarali (irfan@cs.wustl.edu) */ @@ -78,7 +78,7 @@ public: int unbind (const ACE_NS_WString &name_in); /// Get value and type of a given name binding (Wide chars). The - /// caller is responsible for deleting both and ! + /// caller is responsible for deleting both @a value_out and @a type_out! int resolve (const ACE_NS_WString &name_in, ACE_NS_WString &value_out, char *&type_out); diff --git a/dep/ACE_wrappers/ace/Remote_Tokens.h b/dep/ACE_wrappers/ace/Remote_Tokens.h index 0014a3f55..3c9ed94f5 100644 --- a/dep/ACE_wrappers/ace/Remote_Tokens.h +++ b/dep/ACE_wrappers/ace/Remote_Tokens.h @@ -4,7 +4,7 @@ /** * @file Remote_Tokens.h * - * $Id: Remote_Tokens.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Remote_Tokens.h 92345 2010-10-24 12:39:33Z johnnyw $ * * @author Douglas C. Schmidt (schmidt@cs.wustl.edu) * @author Tim Harrison (harrison@cs.wustl.edu) @@ -41,7 +41,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * The Remote_Token_Proxy class implements the mechanisms for * distributed token operations. It is similar to the * ACE_Token_Proxy. - * = BUGS + * @todo * Distributed sleep_hooks have not been implemented. * is not implemented. */ @@ -56,8 +56,8 @@ public: /** * Same as Token_Proxy. @a name is the string uniquely identifying - * the token. can be 1 to disable deadlock - * notifications. prints debug messages. + * the token. @a ignore_deadlock can be 1 to disable deadlock + * notifications. @a debug prints debug messages. */ int open (const ACE_TCHAR *name, int ignore_deadlock = 0, @@ -88,7 +88,7 @@ public: /** * Try to acquire the distributed token. If the token is already - * held, the call returns without queueing the caller as a waiter. + * held, the call returns without queuing the caller as a waiter. * Returns 0 on success (the token was acquired), and -1 with * EWOULDBLOCK if the token was already held. */ @@ -98,7 +98,7 @@ public: * Renew the token by offering to release it if there are any other * waiters, otherwise get the token back immediately. This renew * has the same semantics as ACE_Local_Mutex release. It is - * semantically equivalent to followed by , but + * semantically equivalent to release() followed by acquire(), but * it is faster. options contains the timeout value used if renew * blocks. As with acquire, the timer is maintained at the token * server. If there are waiters and requeue_position == -1, the @@ -120,10 +120,9 @@ public: virtual int release (ACE_Synch_Options &options = ACE_Synch_Options::synch); - /// Become interface compliant for ACE_Guard<>. This has no + /// Become interface compliant for our guards. This has no /// functionality. - virtual int remove (ACE_Synch_Options &options = - ACE_Synch_Options::synch); + virtual int remove (ACE_Synch_Options &options = ACE_Synch_Options::synch); /// Override the default to do nothing. virtual void token_acquired (ACE_TPQ_Entry *); @@ -288,7 +287,7 @@ public: /// Factory Method that creates a new SOCK Stream. virtual ACE_SOCK_Stream *make_TSS_TYPE (void) const; - /// Inheritence and operator overloading don't mix. Redefine this + /// Inheritance and operator overloading don't mix. Redefine this /// from ACE_TSS so that we can use it. operator ACE_SOCK_Stream *(void); diff --git a/dep/ACE_wrappers/ace/SOCK.h b/dep/ACE_wrappers/ace/SOCK.h index d37e68b29..124a4ea4a 100644 --- a/dep/ACE_wrappers/ace/SOCK.h +++ b/dep/ACE_wrappers/ace/SOCK.h @@ -4,7 +4,7 @@ /** * @file SOCK.h * - * $Id: SOCK.h 84834 2009-03-16 12:28:51Z johnnyw $ + * $Id: SOCK.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -63,7 +63,7 @@ public: */ int close (void); - /// Return the local endpoint address in the referenced . + /// Return the local endpoint address in the referenced ACE_Addr. /// Returns 0 if successful, else -1. int get_local_addr (ACE_Addr &) const; @@ -120,7 +120,7 @@ protected: /// Protected destructor. /** - * Not a virtual destructor. Protected destructor to prevent + * Not a virtual destructor. Protected destructor to prevent * operator delete() from being called through a base class ACE_SOCK * pointer/reference. */ diff --git a/dep/ACE_wrappers/ace/SOCK_Connector.cpp b/dep/ACE_wrappers/ace/SOCK_Connector.cpp index 838033792..2cb0ce577 100644 --- a/dep/ACE_wrappers/ace/SOCK_Connector.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Connector.cpp @@ -1,4 +1,4 @@ -// $Id: SOCK_Connector.cpp 91287 2010-08-05 10:30:49Z johnnyw $ +// $Id: SOCK_Connector.cpp 91626 2010-09-07 10:59:20Z johnnyw $ #include "ace/SOCK_Connector.h" #include "ace/INET_Addr.h" @@ -81,11 +81,9 @@ ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream, if (local_sap != ACE_Addr::sap_any) { sockaddr *laddr = reinterpret_cast (local_sap.get_addr ()); - int size = local_sap.get_size (); + int const size = local_sap.get_size (); - if (ACE_OS::bind (new_stream.get_handle (), - laddr, - size) == -1) + if (ACE_OS::bind (new_stream.get_handle (), laddr, size) == -1) { // Save/restore errno. ACE_Errno_Guard error (errno); @@ -148,9 +146,7 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream, #endif /* ACE_WIN32 */ } // Wait synchronously using timeout. - else if (this->complete (new_stream, - 0, - timeout) == -1) + else if (this->complete (new_stream, 0, timeout) == -1) error = errno; else return 0; @@ -177,7 +173,6 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream, } // Actively connect and produce a new ACE_SOCK_Stream if things go well... - int ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, const ACE_Addr &remote_sap, @@ -204,9 +199,7 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, reinterpret_cast (remote_sap.get_addr ()), remote_sap.get_size ()); - return this->shared_connect_finish (new_stream, - timeout, - result); + return this->shared_connect_finish (new_stream, timeout, result); } #if !defined (ACE_HAS_WINCE) @@ -242,9 +235,7 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, remote_sap.get_size (), qos_params); - return this->shared_connect_finish (new_stream, - timeout, - result); + return this->shared_connect_finish (new_stream, timeout, result); } #endif // ACE_HAS_WINCE @@ -256,8 +247,7 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream, const ACE_Time_Value *tv) { ACE_TRACE ("ACE_SOCK_Connector::complete"); - ACE_HANDLE h = ACE::handle_timed_complete (new_stream.get_handle (), - tv); + ACE_HANDLE h = ACE::handle_timed_complete (new_stream.get_handle (), tv); // We failed to get connected. if (h == ACE_INVALID_HANDLE) { @@ -268,8 +258,7 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream, // then retry to see if it's a real failure. ACE_Time_Value time (0, ACE_NON_BLOCKING_BUG_DELAY); ACE_OS::sleep (time); - h = ACE::handle_timed_complete (new_stream.get_handle (), - tv); + h = ACE::handle_timed_complete (new_stream.get_handle (), tv); if (h == ACE_INVALID_HANDLE) { #endif /* ACE_WIN32 */ diff --git a/dep/ACE_wrappers/ace/SOCK_Connector.h b/dep/ACE_wrappers/ace/SOCK_Connector.h index 98ec8862f..28e048e10 100644 --- a/dep/ACE_wrappers/ace/SOCK_Connector.h +++ b/dep/ACE_wrappers/ace/SOCK_Connector.h @@ -4,7 +4,7 @@ /** * @file SOCK_Connector.h * - * $Id: SOCK_Connector.h 84816 2009-03-13 08:16:32Z johnnyw $ + * $Id: SOCK_Connector.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Doug Schmidt */ @@ -43,7 +43,6 @@ class ACE_Time_Value; class ACE_Export ACE_SOCK_Connector { public: - // = Initialization and termination methods. /// Default constructor. ACE_SOCK_Connector (void); @@ -249,7 +248,7 @@ public: int perms = 0); #endif // ACE_HAS_WINCE - /// Default dtor. + /// Default destructor. ~ACE_SOCK_Connector (void); // = Completion routine. diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram.cpp b/dep/ACE_wrappers/ace/SOCK_Dgram.cpp index 7431475ed..0530584b0 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Dgram.cpp @@ -1,14 +1,12 @@ -// $Id: SOCK_Dgram.cpp 91604 2010-09-02 14:51:58Z vzykov $ +// $Id: SOCK_Dgram.cpp 91622 2010-09-06 08:26:30Z sma $ #include "ace/SOCK_Dgram.h" -#include "ace/Handle_Set.h" #include "ace/Log_Msg.h" #include "ace/INET_Addr.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" #include "ace/OS_Memory.h" -#include "ace/OS_NS_sys_select.h" #include "ace/OS_NS_ctype.h" #include "ace/os_include/net/os_if.h" #include "ace/Truncate.h" @@ -52,34 +50,9 @@ ACE_SOCK_Dgram::recv (iovec *io_vec, { ACE_TRACE ("ACE_SOCK_Dgram::recv"); #if defined (FIONREAD) - ACE_Handle_Set handle_set; - handle_set.reset (); - handle_set.set_bit (this->get_handle ()); - - // Check the status of the current socket to make sure there's data - // to recv (or time out). -# if defined (ACE_WIN32) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles. - int select_width = 0; -# else - int select_width = int (this->get_handle ()) + 1; -# endif /* ACE_WIN32 */ - switch (ACE_OS::select (select_width, - handle_set, - 0, 0, - timeout)) + if( ACE::handle_read_ready (this->get_handle (), timeout) != 1 ) { - case -1: return -1; - /* NOTREACHED */ - case 0: - errno = ETIME; - return -1; - /* NOTREACHED */ - default: - // Goes fine, fallthrough to get data - break; } sockaddr *saddr = (sockaddr *) addr.get_addr (); @@ -451,35 +424,15 @@ ACE_SOCK_Dgram::recv (void *buf, int flags, const ACE_Time_Value *timeout) const { - ACE_Handle_Set handle_set; - handle_set.reset (); - handle_set.set_bit (this->get_handle ()); - - // Check the status of the current socket. -#if defined (ACE_WIN32) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles. - int select_width = 0; -#else - int select_width = int (this->get_handle ()) + 1; -#endif /* ACE_WIN32 */ - switch (ACE_OS::select (select_width, - handle_set, - 0, - 0, - timeout)) + if( ACE::handle_read_ready (this->get_handle (), timeout) == 1 ) { - case -1: - return -1; - /* NOTREACHED */ - case 0: - errno = ETIME; - return -1; - /* NOTREACHED */ - default: // Goes fine, call to get data return this->recv (buf, n, addr, flags); } + else + { + return -1; + } } ssize_t @@ -489,35 +442,16 @@ ACE_SOCK_Dgram::send (const void *buf, int flags, const ACE_Time_Value *timeout) const { - ACE_Handle_Set handle_set; - handle_set.reset (); - handle_set.set_bit (this->get_handle ()); - // Check the status of the current socket. -#if defined (ACE_WIN32) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles. - int select_width = 0; -#else - int select_width = int (this->get_handle ()) + 1; -#endif /* ACE_WIN32 */ - switch (ACE_OS::select (select_width, - 0, - handle_set, - 0, - timeout)) + if( ACE::handle_write_ready (this->get_handle (), timeout) == 1 ) { - case -1: - return -1; - /* NOTREACHED */ - case 0: - errno = ETIME; - return -1; - /* NOTREACHED */ - default: // Goes fine, call to transmit the data. return this->send (buf, n, addr, flags); } + else + { + return -1; + } } int diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp b/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp index eac72a74a..fec4c39a2 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp @@ -1,4 +1,4 @@ -// $Id: SOCK_Dgram_Bcast.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: SOCK_Dgram_Bcast.cpp 91685 2010-09-09 09:35:14Z johnnyw $ #include "ace/SOCK_Dgram_Bcast.h" @@ -151,18 +151,9 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) if (hp == 0) return -1; else -#if defined(_UNICOS) - { - ACE_UINT64 haddr; // a place to put the address - char * haddrp = (char *) &haddr; // convert to char pointer - ACE_OS::memcpy(haddrp,(char *) hp->h_addr,hp->h_length); - host_addr.sin_addr.s_addr = haddr; - } -#else /* ! _UNICOS */ ACE_OS::memcpy ((char *) &host_addr.sin_addr.s_addr, (char *) hp->h_addr, hp->h_length); -#endif /* ! _UNICOS */ } diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h b/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h index a59b41bc4..7c42e46e7 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h +++ b/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h @@ -4,7 +4,7 @@ /** * @file SOCK_Dgram_Mcast.h * - * $Id: SOCK_Dgram_Mcast.h 83891 2008-11-28 11:01:50Z johnnyw $ + * $Id: SOCK_Dgram_Mcast.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Irfan Pyrali * @author Tim Harrison @@ -89,7 +89,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * Some platforms, such as pSoS, support only cardinal numbers as network * interface specifications; for these platforms, just give these numbers in * alphanumeric form and will convert them into numbers via - * . + * ACE_OS::atoi(). */ class ACE_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram { @@ -202,13 +202,13 @@ public: * This method is optional; if not explicitly invoked, it is invoked by * the first , using the subscribed address/port# and network * interface parameters. - * The parameter defines the default send address/port# and + * The @a mcast_addr parameter defines the default send address/port# and * also the port# and, if the OPT_BINDADDR_YES option is used, * the multicast address that is bound to this socket. * If the parameter != 0, it defines the network interface * used for all sends by this instance, otherwise the system "default" * interface is used. (The parameter is ignored if this - * feature is not supported by the envriornment.) + * feature is not supported by the environment.) * The port# in may be 0, in which case a system-assigned * (ephemeral) port# is used for sending and receiving. * If @a reuse_addr != 0, the SO_REUSEADDR option and, if it is supported, @@ -327,7 +327,7 @@ private: int reuse_addr); /// Do subscription processing w/out updating the subscription list. - // (Layered method for processing). + /// (Layered method for processing). int subscribe_i (const ACE_INET_Addr &mcast_addr, int reuse_addr = 1, const ACE_TCHAR *net_if = 0); @@ -337,7 +337,7 @@ private: const ACE_TCHAR *net_if = 0); /// Do unsubscription processing w/out udpating subscription list. - // (Layered method for processing). + /// (Layered method for processing). int unsubscribe_i (const ACE_INET_Addr &mcast_addr, const ACE_TCHAR *net_if = 0); @@ -353,7 +353,6 @@ protected: int clear_subs_list (void); private: - /// Per-instance options.. int opts_; diff --git a/dep/ACE_wrappers/ace/SOCK_IO.cpp b/dep/ACE_wrappers/ace/SOCK_IO.cpp index db08d4059..10af6460b 100644 --- a/dep/ACE_wrappers/ace/SOCK_IO.cpp +++ b/dep/ACE_wrappers/ace/SOCK_IO.cpp @@ -1,9 +1,7 @@ -// $Id: SOCK_IO.cpp 91604 2010-09-02 14:51:58Z vzykov $ +// $Id: SOCK_IO.cpp 91622 2010-09-06 08:26:30Z sma $ #include "ace/SOCK_IO.h" -#include "ace/Handle_Set.h" -#include "ace/OS_NS_sys_select.h" #include "ace/OS_NS_sys_socket.h" #include "ace/OS_Memory.h" #include "ace/Truncate.h" @@ -37,35 +35,10 @@ ACE_SOCK_IO::recvv (iovec *io_vec, { ACE_TRACE ("ACE_SOCK_IO::recvv"); #if defined (FIONREAD) - ACE_Handle_Set handle_set; - handle_set.reset (); - handle_set.set_bit (this->get_handle ()); - io_vec->iov_base = 0; - - // Check the status of the current socket. -# if defined (ACE_WIN32) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles. - int select_width = 0; -# else - int select_width = int (this->get_handle ()) + 1; -# endif /* ACE_WIN32 */ - switch (ACE_OS::select (select_width, - handle_set, - 0, 0, - timeout)) + if( ACE::handle_read_ready (this->get_handle (), timeout) != 1 ) { - case -1: return -1; - /* NOTREACHED */ - case 0: - errno = ETIME; - return -1; - /* NOTREACHED */ - default: - // Goes fine, fallthrough to get data - break; } int inlen = 0; diff --git a/dep/ACE_wrappers/ace/Select_Reactor.h b/dep/ACE_wrappers/ace/Select_Reactor.h index d72bf69b3..2dd96f349 100644 --- a/dep/ACE_wrappers/ace/Select_Reactor.h +++ b/dep/ACE_wrappers/ace/Select_Reactor.h @@ -4,7 +4,7 @@ /** * @file Select_Reactor.h * - * $Id: Select_Reactor.h 91432 2010-08-23 15:06:31Z mitza $ + * $Id: Select_Reactor.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -34,6 +34,7 @@ typedef ACE_Select_Reactor_T ACE_Select_Reactor; //@@ TAO_REACTOR_SPL_COMMENT_HOOK_END #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE == 0) +// FUZZ: disable check_for_ACE_Guard /** * @class ACE_Guard< ACE_Reactor_Token_T > * @@ -65,6 +66,7 @@ private: void operator= (const ACE_Guard< ACE_Reactor_Token_T > &); }; +// FUZZ: enable check_for_ACE_Guard #endif /* ACE_MT_SAFE && ACE_MT_SAFE == 0 */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Select_Reactor_T.cpp b/dep/ACE_wrappers/ace/Select_Reactor_T.cpp index b8fcbfe34..b70b2d427 100644 --- a/dep/ACE_wrappers/ace/Select_Reactor_T.cpp +++ b/dep/ACE_wrappers/ace/Select_Reactor_T.cpp @@ -1,4 +1,4 @@ -// $Id: Select_Reactor_T.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Select_Reactor_T.cpp 92201 2010-10-11 19:07:59Z johnnyw $ #ifndef ACE_SELECT_REACTOR_T_CPP #define ACE_SELECT_REACTOR_T_CPP @@ -1393,13 +1393,13 @@ ACE_Select_Reactor_T::handle_events { ACE_TRACE ("ACE_Select_Reactor_T::handle_events"); -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - // Stash the current time -- the destructor of this object will // automatically compute how much time elapsed since this method was // called. ACE_Countdown_Time countdown (max_wait_time); +#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) + ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1); if (ACE_OS::thr_equal (ACE_Thread::self (), diff --git a/dep/ACE_wrappers/ace/Service_Config.cpp b/dep/ACE_wrappers/ace/Service_Config.cpp index ead63e8b0..d63f46c1b 100644 --- a/dep/ACE_wrappers/ace/Service_Config.cpp +++ b/dep/ACE_wrappers/ace/Service_Config.cpp @@ -1,4 +1,4 @@ -// $Id: Service_Config.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ +// $Id: Service_Config.cpp 91693 2010-09-09 12:57:54Z johnnyw $ #include "ace/Service_Config.h" @@ -27,20 +27,20 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_Threading_Helper::~ACE_Threading_Helper () +ACE_Threading_Helper::~ACE_Threading_Helper (void) { - ACE_OS::thr_key_detach (this->key_, 0); + ACE_OS::thr_key_detach (this->key_); ACE_OS::thr_keyfree (this->key_); } -ACE_Threading_Helper::ACE_Threading_Helper () +ACE_Threading_Helper::ACE_Threading_Helper (void) : key_ (ACE_OS::NULL_key) { # if defined (ACE_HAS_TSS_EMULATION) ACE_Object_Manager::init_tss (); # endif - if (ACE_Thread::keycreate (&key_, 0, 0) == -1) + if (ACE_Thread::keycreate (&key_, 0) == -1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Failed to create thread key: %p\n"), diff --git a/dep/ACE_wrappers/ace/Service_Config.inl b/dep/ACE_wrappers/ace/Service_Config.inl index 35be0e84d..78e11bcfe 100644 --- a/dep/ACE_wrappers/ace/Service_Config.inl +++ b/dep/ACE_wrappers/ace/Service_Config.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Service_Config.inl 83302 2008-10-16 19:28:11Z mesnier_p $ +// $Id: Service_Config.inl 91813 2010-09-17 07:52:52Z johnnyw $ #include "ace/OS_NS_string.h" @@ -50,7 +50,7 @@ ACE_Service_Config::open (int argc, ignore_default_svc_conf, ignore_debug_flag) == -1) return -1; - + return current()->open (argc, argv, logger_key, diff --git a/dep/ACE_wrappers/ace/Service_Gestalt.cpp b/dep/ACE_wrappers/ace/Service_Gestalt.cpp index 7e3052937..29e2804b4 100644 --- a/dep/ACE_wrappers/ace/Service_Gestalt.cpp +++ b/dep/ACE_wrappers/ace/Service_Gestalt.cpp @@ -1,4 +1,4 @@ -// $Id: Service_Gestalt.cpp 91402 2010-08-20 13:32:02Z mesnier_p $ +// $Id: Service_Gestalt.cpp 92357 2010-10-25 14:11:44Z mesnier_p $ #include "ace/Svc_Conf.h" #include "ace/Get_Opt.h" @@ -201,6 +201,9 @@ ACE_Service_Gestalt::~ACE_Service_Gestalt (void) delete this->svc_conf_file_queue_; this->svc_conf_file_queue_ = 0; + + delete this->svc_queue_; + this->svc_queue_ = 0; } ACE_Service_Gestalt::ACE_Service_Gestalt (size_t size, @@ -1059,7 +1062,7 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[], if (!ignore_default_svc_conf_file) { bool add_default = true; - bool has_files = this->svc_conf_file_queue_ && + bool has_files = this->svc_conf_file_queue_ && !this->svc_conf_file_queue_->is_empty (); bool has_cmdline = this->svc_queue_ && !this->svc_queue_->is_empty (); if (has_files || has_cmdline) @@ -1109,7 +1112,12 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[], { result = this->process_directives (); if (result != -1) - result = this->process_commandline_directives (); + { + int temp = this->process_commandline_directives (); + if (temp == -1) + result = -1; + else result += temp; + } } // Reset debugging back to the way it was when we came into diff --git a/dep/ACE_wrappers/ace/Service_Gestalt.h b/dep/ACE_wrappers/ace/Service_Gestalt.h index 68a2ce7e7..1f2522a36 100644 --- a/dep/ACE_wrappers/ace/Service_Gestalt.h +++ b/dep/ACE_wrappers/ace/Service_Gestalt.h @@ -4,7 +4,7 @@ /** * @file Service_Gestalt.h * - * $Id: Service_Gestalt.h 91158 2010-07-21 15:54:12Z mesnier_p $ + * $Id: Service_Gestalt.h 91626 2010-09-07 10:59:20Z johnnyw $ * * @author Iliyan Jeliazkov */ @@ -67,15 +67,8 @@ class ACE_Svc_Conf_Param; * Service Config in particular. * */ -class ACE_Export ACE_Service_Gestalt +class ACE_Export ACE_Service_Gestalt : private ACE_Copy_Disabled { -private: - /// - /// Not implemented to enforce no copying - // - ACE_UNIMPLEMENTED_FUNC (ACE_Service_Gestalt(const ACE_Service_Gestalt&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Service_Gestalt& operator=(const ACE_Service_Gestalt&)) - public: enum { @@ -512,8 +505,10 @@ private: size_t repo_begin_; ACE_TCHAR const * const name_; -# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) +#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) +// FUZZ: disable check_for_ACE_Guard ACE_Guard< ACE_Recursive_Thread_Mutex > repo_monitor_; +// FUZZ: enable check_for_ACE_Guard #endif }; diff --git a/dep/ACE_wrappers/ace/Service_Templates.h b/dep/ACE_wrappers/ace/Service_Templates.h deleted file mode 100644 index d05d0d611..000000000 --- a/dep/ACE_wrappers/ace/Service_Templates.h +++ /dev/null @@ -1,29 +0,0 @@ - -//============================================================================= -/** - * @file Service_Templates.h - * - * $Id: Service_Templates.h 80826 2008-03-04 14:51:23Z wotte $ - * - * @author Priyanka Gontla - */ -//============================================================================= - - -#ifndef ACE_SERVICE_TEMPLATES_H -#define ACE_SERVICE_TEMPLATES_H -#include /**/ "ace/pre.h" - -#include "ace/Svc_Conf.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Auto_Ptr.h" -#include "ace/Thread_Manager.h" -#include "ace/Stream_Modules.h" -#include "ace/Stream.h" - -#include /**/ "ace/post.h" -#endif /* ACE_SERVICE_TEMPLATES_H */ diff --git a/dep/ACE_wrappers/ace/Service_Types.cpp b/dep/ACE_wrappers/ace/Service_Types.cpp index 3917b1d15..b3f7d0980 100644 --- a/dep/ACE_wrappers/ace/Service_Types.cpp +++ b/dep/ACE_wrappers/ace/Service_Types.cpp @@ -1,4 +1,4 @@ -// $Id: Service_Types.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Service_Types.cpp 91813 2010-09-17 07:52:52Z johnnyw $ #include "ace/Service_Types.h" @@ -375,7 +375,7 @@ ACE_Stream_Type::fini (void) const // Final arg is an indication to *not* delete the Module. str->remove (m->name (), - MT_Module::M_DELETE_NONE); + MT_Module::M_DELETE_NONE); m = t; } str->close (); diff --git a/dep/ACE_wrappers/ace/Shared_Memory_Pool.cpp b/dep/ACE_wrappers/ace/Shared_Memory_Pool.cpp index 5825b2e39..72e272517 100644 --- a/dep/ACE_wrappers/ace/Shared_Memory_Pool.cpp +++ b/dep/ACE_wrappers/ace/Shared_Memory_Pool.cpp @@ -1,4 +1,4 @@ -// $Id: Shared_Memory_Pool.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Shared_Memory_Pool.cpp 91685 2010-09-09 09:35:14Z johnnyw $ // Shared_Memory_Pool.cpp #include "ace/Shared_Memory_Pool.h" @@ -168,7 +168,6 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("in_use"))); -#if !defined(_UNICOS) else if (!(siginfo->si_code == SEGV_MAPERR && siginfo->si_addr < (((char *) this->base_addr_) + offset) && siginfo->si_addr >= ((char *) this->base_addr_))) @@ -176,15 +175,6 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) "(%P|%t) address %u out of range\n", siginfo->si_addr), -1); -#else /* ! _UNICOS */ - else if (!(siginfo->si_code == SEGV_MEMERR - && siginfo->si_addr < (((unsigned long) this->base_addr_) + offset) - && siginfo->si_addr >= ((unsigned long) this->base_addr_))) - ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) address %u out of range\n", - siginfo->si_addr), - -1); -#endif /* ! _UNICOS */ } // The above if case will check to see that the address is in the @@ -194,11 +184,7 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) size_t counter; // ret value to get shmid from the st table. -#if !defined(_UNICOS) if (this->find_seg (siginfo->si_addr, offset, counter) == -1) -#else /* ! _UNICOS */ - if (this->find_seg ((const void *)siginfo->si_addr, offset, counter) == -1) -#endif /* ! _UNICOS */ ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("in_use")), diff --git a/dep/ACE_wrappers/ace/Sig_Handler.cpp b/dep/ACE_wrappers/ace/Sig_Handler.cpp index bbfdaea09..82ff19ebf 100644 --- a/dep/ACE_wrappers/ace/Sig_Handler.cpp +++ b/dep/ACE_wrappers/ace/Sig_Handler.cpp @@ -1,4 +1,4 @@ -// $Id: Sig_Handler.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Sig_Handler.cpp 91626 2010-09-07 10:59:20Z johnnyw $ #include "ace/Sig_Handler.h" #include "ace/Sig_Adapter.h" @@ -71,7 +71,7 @@ ACE_Sig_Handler::sig_pending (void) ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard m (*lock)); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, 0)); return ACE_Sig_Handler::sig_pending_ != 0; } @@ -83,7 +83,7 @@ ACE_Sig_Handler::sig_pending (int pending) ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard m (*lock)); + ACE_GUARD (ACE_Recursive_Thread_Mutex, m, *lock)); ACE_Sig_Handler::sig_pending_ = pending; } @@ -94,7 +94,7 @@ ACE_Sig_Handler::handler (int signum) ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard m (*lock)); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, 0)); if (ACE_Sig_Handler::in_range (signum)) return ACE_Sig_Handler::signal_handlers_[signum]; @@ -127,7 +127,7 @@ ACE_Sig_Handler::handler (int signum, ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard m (*lock)); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, 0)); return ACE_Sig_Handler::handler_i (signum, new_sh); } @@ -185,7 +185,7 @@ ACE_Sig_Handler::register_handler (int signum, ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard m (*lock)); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1)); return ACE_Sig_Handler::register_handler_i (signum, new_sh, @@ -206,7 +206,7 @@ ACE_Sig_Handler::remove_handler (int signum, ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard m (*lock)); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1)); if (ACE_Sig_Handler::in_range (signum)) { @@ -221,7 +221,7 @@ ACE_Sig_Handler::remove_handler (int signum, return new_disp->register_action (signum, old_disp); } - return -1; + return -1; } // Master dispatcher function that gets called by a signal handler and @@ -270,8 +270,7 @@ ACE_Sig_Handler::dispatch (int signum, // dispatched. Therefore, to workaround this "feature" we // must re-register the with // explicitly. - ACE_Sig_Handler::register_handler_i (signum, - eh); + ACE_Sig_Handler::register_handler_i (signum, eh); #endif /* ACE_WIN32*/ } } @@ -345,7 +344,7 @@ ACE_Sig_Handlers::register_handler (int signum, ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard m (*lock)); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1)); if (ACE_Sig_Handler::in_range (signum)) { @@ -474,7 +473,7 @@ ACE_Sig_Handlers::remove_handler (int signum, ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard m (*lock)); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1)); if (ACE_Sig_Handler::in_range (signum)) { diff --git a/dep/ACE_wrappers/ace/Signal.inl b/dep/ACE_wrappers/ace/Signal.inl index 858c33c26..088d580aa 100644 --- a/dep/ACE_wrappers/ace/Signal.inl +++ b/dep/ACE_wrappers/ace/Signal.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Signal.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Signal.inl 92069 2010-09-28 11:38:59Z johnnyw $ #include "ace/OS_NS_signal.h" #include "ace/config-all.h" @@ -150,22 +150,6 @@ ACE_Sig_Action::handler (ACE_SignalHandler handler) #endif /* !ACE_HAS_TANDEM_SIGNALS */ } -#if 0 -ACE_INLINE ACE_SignalHandler -ACE_Sig_Action::sigaction (void) -{ - ACE_TRACE ("ACE_Sig_Action::sigaction"); - return ACE_SignalHandler (this->sa_.sa_sigaction); -} - -ACE_INLINE void -ACE_Sig_Action::sigaction (ACE_SignalHandler handler) -{ - ACE_TRACE ("ACE_Sig_Action::sigaction"); - this->sa_.sa_sigaction = (void (*)()) ACE_SignalHandlerV (handler); -} -#endif /* 0 */ - ACE_INLINE void ACE_Sig_Action::set (struct sigaction *sa) { diff --git a/dep/ACE_wrappers/ace/Sock_Connect.cpp b/dep/ACE_wrappers/ace/Sock_Connect.cpp index 915821b20..ce2a17d2b 100644 --- a/dep/ACE_wrappers/ace/Sock_Connect.cpp +++ b/dep/ACE_wrappers/ace/Sock_Connect.cpp @@ -1,4 +1,4 @@ -// $Id: Sock_Connect.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ +// $Id: Sock_Connect.cpp 91685 2010-09-09 09:35:14Z johnnyw $ #include "ace/Sock_Connect.h" #include "ace/INET_Addr.h" @@ -242,29 +242,16 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, if (hp == 0) return -1; else -#if !defined(_UNICOS) ACE_OS::memcpy ((char *) &ip_addr.sin_addr.s_addr, (char *) hp->h_addr, hp->h_length); -#else /* _UNICOS */ - { - ACE_UINT64 haddr; // a place to put the address - char * haddrp = (char *) &haddr; // convert to char pointer - ACE_OS::memcpy(haddrp,(char *) hp->h_addr,hp->h_length); - ip_addr.sin_addr.s_addr = haddr; - } -#endif /* ! _UNICOS */ } else { ACE_OS::memset ((void *) &ip_addr, 0, sizeof ip_addr); -#if !defined(_UNICOS) ACE_OS::memcpy ((void *) &ip_addr.sin_addr, (void*) &host_addr, sizeof ip_addr.sin_addr); -#else /* _UNICOS */ - ip_addr.sin_addr.s_addr = host_addr; // just copy to the bitfield -#endif /* ! _UNICOS */ } #if !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) @@ -1279,7 +1266,6 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) ) { -# if !defined(_UNICOS) struct sockaddr_in *addr = reinterpret_cast (&pcur->IFR_ADDR); @@ -1300,23 +1286,6 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) addrs[count].set (addr, addrlen); ++count; } -# else /* ! _UNICOS */ - // need to explicitly copy on the Cray, since the bitfields kinda - // screw things up here - struct sockaddr_in inAddr; - - inAddr.sin_len = pcur->IFR_ADDR.sa_len; - inAddr.sin_family = pcur->IFR_ADDR.sa_family; - memcpy((void *)&(inAddr.sin_addr), - (const void *)&(pcur->IFR_ADDR.sa_data[8]), - sizeof(struct in_addr)); - - if (inAddr.sin_addr.s_addr != 0) - { - addrs[count].set(&inAddr, sizeof(struct sockaddr_in)); - ++count; - } -# endif /* ! _UNICOS */ } #if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) && !defined (__Lynx__) diff --git a/dep/ACE_wrappers/ace/Stack_Trace.h b/dep/ACE_wrappers/ace/Stack_Trace.h index 56cf8a092..09febe40c 100644 --- a/dep/ACE_wrappers/ace/Stack_Trace.h +++ b/dep/ACE_wrappers/ace/Stack_Trace.h @@ -3,7 +3,7 @@ /** * @file Stack_Trace.h * - * $Id: Stack_Trace.h 81926 2008-06-12 14:43:09Z mitza $ + * $Id: Stack_Trace.h 91743 2010-09-13 18:24:51Z johnnyw $ * * @author Chris Cleeland (cleeland.ociweb.com) */ @@ -37,31 +37,31 @@ * A new conversion character, the question mark, was added to ACE_Log_Msg for stack * trace logging. The %? conversion character was added as a convenience so that users * need not instantiate an ACE_Stack_Trace instance solely for the purpose of printing - * it in an ACE logging message. The following are functionally equivalent: + * it in an ACE logging message. The following are functionally equivalent: * * \code - * ACE_DEBUG((LM_DEBUG, "%?")); + * ACE_DEBUG((LM_DEBUG, "%?")); * * ACE_Stack_Trace st; - * ACE_DEBUG ((LM_DEBUG, "%s", st.c_str() )); + * ACE_DEBUG ((LM_DEBUG, "%s", st.c_str() )); * \endcode * * These usage examples were shown in $ACE_ROOT/tests/Stack_Trace_Test.cpp. * * @note The stack trace functionality was currently supported on platforms: - * - Any platform using glibc as its runtime library, or where ACE_HAS_EXECINFO_H is defined + * - Any platform using glibc as its runtime library, or where ACE_HAS_EXECINFO_H is defined * (this covers Linux and Mac) and gcc version >= 3.3. * - VxWorks, both kernel and RTP * - Solaris * - Windows 32 and 64 bit (Visual C++, excluding WinCE/mobile) * - * @note Since stack trace buffer size has limitation(@c ACE_STACK_TRACE_SYMBUFSIZ), you will not - * get a complete stack trace if @c ACE_STACK_TRACE_SYMBUFSIZ value is less than actual stack - * trace data length. To get a complete stack trace, you need set @c ACE_STACK_TRACE_SYMBUFSIZ - * with a larger value that is enough for the stack trace data in your @c config.h file + * @note Since stack trace buffer size has limitation(@c ACE_STACK_TRACE_SYMBUFSIZ), you will not + * get a complete stack trace if @c ACE_STACK_TRACE_SYMBUFSIZ value is less than actual stack + * trace data length. To get a complete stack trace, you need set @c ACE_STACK_TRACE_SYMBUFSIZ + * with a larger value that is enough for the stack trace data in your @c config.h file * and rebuild ACE. * - * @note Using ACE logging mechanism (%?) to log the stack trace also has ACE_MAXLOGMSGLEN size limitation. + * @note Using ACE logging mechanism (%?) to log the stack trace also has ACE_MAXLOGMSGLEN size limitation. * To get a complete stack trace, you could use different output method. Following is an example. * * \code @@ -75,8 +75,8 @@ public: /** * @brief Grab a snapshot of the current stack trace and hold it for later use. * - * @param starting_frame_offset offset into the array of frames to start printing; 0 is the - * platform-specific offset for the first frame, positive numbers give less frames, negative give + * @param starting_frame_offset offset into the array of frames to start printing; 0 is the + * platform-specific offset for the first frame, positive numbers give less frames, negative give * more frames * @param num_frames the number of stack frames to include (0 indicates platform-specific maximum) * diff --git a/dep/ACE_wrappers/ace/Strategies_T.h b/dep/ACE_wrappers/ace/Strategies_T.h index f7c598aa9..25cd265f6 100644 --- a/dep/ACE_wrappers/ace/Strategies_T.h +++ b/dep/ACE_wrappers/ace/Strategies_T.h @@ -4,7 +4,7 @@ /** * @file Strategies_T.h * - * $Id: Strategies_T.h 84316 2009-02-03 19:46:05Z johnnyw $ + * $Id: Strategies_T.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -24,7 +24,7 @@ #include "ace/Reactor.h" #include "ace/Thread_Manager.h" #include "ace/Connection_Recycling_Strategy.h" -#include "ace/Refcountable.h" +#include "ace/Refcountable_T.h" #include "ace/Hashable.h" #include "ace/Recyclable.h" #include "ace/Reverse_Lock_T.h" @@ -785,7 +785,7 @@ public: }; template -class ACE_Refcounted_Hash_Recyclable : public ACE_Refcountable, +class ACE_Refcounted_Hash_Recyclable : public ACE_Refcountable_T, public ACE_Hashable, public ACE_Recyclable { diff --git a/dep/ACE_wrappers/ace/Strategies_T.inl b/dep/ACE_wrappers/ace/Strategies_T.inl index f3ae267bc..b13479286 100644 --- a/dep/ACE_wrappers/ace/Strategies_T.inl +++ b/dep/ACE_wrappers/ace/Strategies_T.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Strategies_T.inl 81503 2008-04-28 18:28:15Z johnnyw $ +// $Id: Strategies_T.inl 91688 2010-09-09 11:21:50Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -183,7 +183,7 @@ ACE_Schedule_All_Threaded_Strategy::ACE_Schedule_All_Threaded_Strat template ACE_INLINE ACE_Refcounted_Hash_Recyclable::ACE_Refcounted_Hash_Recyclable (void) - : ACE_Refcountable (0), + : ACE_Refcountable_T (0), ACE_Hashable (), ACE_Recyclable (ACE_RECYCLABLE_UNKNOWN), t_ () @@ -194,7 +194,7 @@ template ACE_INLINE ACE_Refcounted_Hash_Recyclable::ACE_Refcounted_Hash_Recyclable (const T &t, long refcount, ACE_Recyclable_State state) - : ACE_Refcountable (refcount), + : ACE_Refcountable_T (refcount), ACE_Hashable (), ACE_Recyclable (state), t_ (t) diff --git a/dep/ACE_wrappers/ace/String_Base.h b/dep/ACE_wrappers/ace/String_Base.h index 90d5554b3..128fe76a2 100644 --- a/dep/ACE_wrappers/ace/String_Base.h +++ b/dep/ACE_wrappers/ace/String_Base.h @@ -4,7 +4,7 @@ /** * @file String_Base.h * - * $Id: String_Base.h 88793 2010-02-01 17:50:34Z cleeland $ + * $Id: String_Base.h 92057 2010-09-27 14:52:00Z johnnyw $ * * @author Douglas C. Schmidt (schmidt@cs.wustl.edu) * @author Nanbor Wang @@ -99,7 +99,7 @@ public: * * @param s Zero terminated input string * @param the_allocator ACE_Allocator associated with string - * @param release Allocator responsible(true)/not reponsible(false) for + * @param release Allocator responsible(true)/not responsible(false) for * freeing memory. * @return ACE_String_Base containing const ACE_CHAR_T *s */ @@ -120,7 +120,7 @@ public: * @param s Non-zero terminated input string * @param len Length of non-zero terminated input string * @param the_allocator ACE_Allocator associated with string - * @param release Allocator responsible(true)/not reponsible(false) for + * @param release Allocator responsible(true)/not responsible(false) for * freeing memory. * @return ACE_String_Base containing const ACE_CHAR_T *s */ @@ -224,7 +224,7 @@ public: * used, and instead the internal buffer is set to NULL_String_. * * @param s Null terminated input string - * @param release Allocator responsible(true)/not reponsible(false) for + * @param release Allocator responsible(true)/not responsible(false) for * freeing memory. */ void set (const ACE_CHAR_T * s, bool release = true); @@ -244,7 +244,7 @@ public: * * @param s Non-zero terminated input string * @param len Length of input string 's' - * @param release Allocator responsible(true)/not reponsible(false) for + * @param release Allocator responsible(true)/not responsible(false) for * freeing memory. */ void set (const ACE_CHAR_T * s, size_type len, bool release); @@ -400,7 +400,7 @@ public: const ACE_CHAR_T *fast_rep (void) const; /** - * Same as STL String's and . + * Same as STL String's c_str() and fast_rep(). */ const ACE_CHAR_T *c_str (void) const; @@ -415,7 +415,7 @@ public: size_type strstr (const ACE_String_Base &s) const; /** - * Find starting at pos. Returns the slot of the first + * Find @a str starting at pos. Returns the slot of the first * location that matches (will be >= pos), else @c npos. * * @param str Input ACE_String_Base string to search for in stored string. @@ -426,7 +426,7 @@ public: size_type find (const ACE_String_Base &str, size_type pos = 0) const; /** - * Find @a s starting at pos. Returns the slot of the first + * Find @a s starting at @a pos. Returns the slot of the first * location that matches (will be >= pos), else @c npos. * * @param s non-zero input string to search for in stored string. @@ -437,7 +437,7 @@ public: size_type find (const ACE_CHAR_T *s, size_type pos = 0) const; /** - * Find @a c starting at pos. Returns the slot of the first + * Find @a c starting at @a pos. Returns the slot of the first * location that matches (will be >= pos), else @c npos. * * @param c Input character to search for in stored string. @@ -448,7 +448,7 @@ public: size_type find (ACE_CHAR_T c, size_type pos = 0) const; /** - * Find @a c starting at pos (counting from the end). Returns the + * Find @a c starting at @a pos (counting from the end). Returns the * slot of the first location that matches, else @c npos. * * @param c Input character to search for in stored string. diff --git a/dep/ACE_wrappers/ace/Svc_Conf_Lexer.cpp b/dep/ACE_wrappers/ace/Svc_Conf_Lexer.cpp index d83f23ede..95b2a2625 100644 --- a/dep/ACE_wrappers/ace/Svc_Conf_Lexer.cpp +++ b/dep/ACE_wrappers/ace/Svc_Conf_Lexer.cpp @@ -1,4 +1,4 @@ -// $Id: Svc_Conf_Lexer.cpp 81312 2008-04-09 21:01:34Z iliyan $ +// $Id: Svc_Conf_Lexer.cpp 92178 2010-10-08 07:44:20Z olli $ #include "ace/Svc_Conf_Lexer.h" #if (ACE_USES_CLASSIC_SVC_CONF == 1) @@ -239,9 +239,7 @@ ACE_Svc_Conf_Lexer::input (ACE_Svc_Conf_Param* param, if (errno == EINTR) { errno = 0; -#if !defined (ACE_LACKS_CLEARERR) ACE_OS::clearerr (param->source.file); -#endif /* !ACE_LACKS_CLEARERR */ } else { @@ -395,7 +393,7 @@ ACE_Svc_Conf_Lexer::scan (YYSTYPE* ace_yylval, if (current == buffer->index_ + 1) { - int lower = ACE_OS::ace_tolower ( + int const lower = ACE_OS::ace_tolower ( buffer->input_[current - 1]); if (c == ':' && (buffer->input_[current - 1] == '%' || diff --git a/dep/ACE_wrappers/ace/Synch.h b/dep/ACE_wrappers/ace/Synch.h index 4a1924a76..133209373 100644 --- a/dep/ACE_wrappers/ace/Synch.h +++ b/dep/ACE_wrappers/ace/Synch.h @@ -4,7 +4,7 @@ /** * @file Synch.h * - * $Id: Synch.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Synch.h 91688 2010-09-09 11:21:50Z johnnyw $ * * Wrapper Facades for various synchronization mechanisms. * @@ -47,18 +47,6 @@ #include "ace/Thread_Semaphore.h" #include "ace/TSS_Adapter.h" -// Include the templates here. -// FUZZ: disable check_for_synch_include -#include "ace/Synch_T.h" - -#if defined (ACE_LEGACY_MODE) -# include "ace/File_Lock.h" -# include "ace/Process_Semaphore.h" -# include "ace/Process_Mutex.h" -# include "ace/RW_Process_Mutex.h" -# include "ace/Test_and_Set.h" -#endif /* ACE_LEGACY_MODE */ - #endif /* DO_NOT_INCLUDE_SYNCH_H */ #include /**/ "ace/post.h" diff --git a/dep/ACE_wrappers/ace/Synch_T.cpp b/dep/ACE_wrappers/ace/Synch_T.cpp deleted file mode 100644 index c66e02768..000000000 --- a/dep/ACE_wrappers/ace/Synch_T.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// $Id: Synch_T.cpp 80826 2008-03-04 14:51:23Z wotte $ - -#ifndef ACE_SYNCH_T_CPP -#define ACE_SYNCH_T_CPP - -#include "ace/Thread.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// FUZZ: disable check_for_synch_include -#include "ace/Synch_T.h" -#include "ace/Log_Msg.h" - -#include "ace/Lock_Adapter_T.cpp" -#include "ace/Reverse_Lock_T.cpp" -#include "ace/Guard_T.cpp" -#include "ace/TSS_T.cpp" -#include "ace/Condition_T.cpp" - -#endif /* ACE_SYNCH_T_CPP */ diff --git a/dep/ACE_wrappers/ace/Synch_T.h b/dep/ACE_wrappers/ace/Synch_T.h deleted file mode 100644 index e5349e0bd..000000000 --- a/dep/ACE_wrappers/ace/Synch_T.h +++ /dev/null @@ -1,42 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Synch_T.h - * - * $Id: Synch_T.h 80826 2008-03-04 14:51:23Z wotte $ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_SYNCH_T_H -#define ACE_SYNCH_T_H -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// FUZZ: disable check_for_synch_include -#include "ace/Synch.h" - -#include "ace/Lock_Adapter_T.h" -#include "ace/Reverse_Lock_T.h" -#include "ace/Guard_T.h" -#include "ace/TSS_T.h" -#include "ace/Condition_T.h" -#include "ace/Synch_Traits.h" - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Synch_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Synch_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include /**/ "ace/post.h" -#endif /* ACE_SYNCH_T_H */ diff --git a/dep/ACE_wrappers/ace/Synch_Traits.h b/dep/ACE_wrappers/ace/Synch_Traits.h index 80f23e948..785b9fd0e 100644 --- a/dep/ACE_wrappers/ace/Synch_Traits.h +++ b/dep/ACE_wrappers/ace/Synch_Traits.h @@ -4,7 +4,7 @@ /** * @file Synch_Traits.h * - * $Id: Synch_Traits.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Synch_Traits.h 91626 2010-09-07 10:59:20Z johnnyw $ * * Moved from Synch.h. * @@ -38,8 +38,6 @@ class ACE_Condition_Thread_Mutex; class ACE_Condition_Recursive_Thread_Mutex; class ACE_Thread_Semaphore; -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) - /** * @class ACE_NULL_SYNCH * @@ -101,41 +99,6 @@ public: #define ACE_SYNCH_NULL_SEMAPHORE ACE_SYNCH::NULL_SEMAPHORE #define ACE_SYNCH_SEMAPHORE ACE_SYNCH::SEMAPHORE -#else /* !ACE_HAS_TEMPLATE_TYPEDEFS */ - -#if defined (ACE_HAS_OPTIMIZED_MESSAGE_QUEUE) -#define ACE_NULL_SYNCH ACE_Null_Mutex, ACE_Null_Condition, ACE_Null_Mutex -#define ACE_MT_SYNCH ACE_Thread_Mutex, ACE_Condition_Thread_Mutex, ACE_Thread_Semaphore -#else -#define ACE_NULL_SYNCH ACE_Null_Mutex, ACE_Null_Condition -#define ACE_MT_SYNCH ACE_Thread_Mutex, ACE_Condition_Thread_Mutex -#endif /* ACE_HAS_OPTIMIZED_MESSAGE_QUEUE */ - -#if defined (ACE_HAS_THREADS) - -#define ACE_SYNCH_MUTEX ACE_Thread_Mutex -#define ACE_SYNCH_NULL_MUTEX ACE_Null_Mutex -#define ACE_SYNCH_RECURSIVE_MUTEX ACE_Recursive_Thread_Mutex -#define ACE_SYNCH_RW_MUTEX ACE_RW_Thread_Mutex -#define ACE_SYNCH_CONDITION ACE_Condition_Thread_Mutex -#define ACE_SYNCH_RECURSIVE_CONDITION ACE_Condition_Recursive_Thread_Mutex -#define ACE_SYNCH_SEMAPHORE ACE_Thread_Semaphore -#define ACE_SYNCH_NULL_SEMAPHORE ACE_Null_Semaphore - -#else /* ACE_HAS_THREADS */ - -#define ACE_SYNCH_MUTEX ACE_Null_Mutex -#define ACE_SYNCH_NULL_MUTEX ACE_Null_Mutex -#define ACE_SYNCH_RECURSIVE_MUTEX ACE_Null_Mutex -#define ACE_SYNCH_RW_MUTEX ACE_Null_Mutex -#define ACE_SYNCH_CONDITION ACE_Null_Condition -#define ACE_SYNCH_RECURSIVE_CONDITION ACE_Null_Condition -#define ACE_SYNCH_SEMAPHORE ACE_Null_Semaphore -#define ACE_SYNCH_NULL_SEMAPHORE ACE_Null_Mutex - -#endif /* ACE_HAS_THREADS */ -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - // These are available on *all* platforms #define ACE_SYNCH_PROCESS_SEMAPHORE ACE_Process_Semaphore #define ACE_SYNCH_PROCESS_MUTEX ACE_Process_Mutex diff --git a/dep/ACE_wrappers/ace/TSS_T.cpp b/dep/ACE_wrappers/ace/TSS_T.cpp index 59dfa06ca..9cc112f3e 100644 --- a/dep/ACE_wrappers/ace/TSS_T.cpp +++ b/dep/ACE_wrappers/ace/TSS_T.cpp @@ -1,4 +1,4 @@ -// $Id: TSS_T.cpp 91399 2010-08-20 11:59:12Z johnnyw $ +// $Id: TSS_T.cpp 91693 2010-09-09 12:57:54Z johnnyw $ #ifndef ACE_TSS_T_CPP #define ACE_TSS_T_CPP @@ -28,7 +28,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_TSS) #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) # if defined (ACE_HAS_THR_C_DEST) -extern "C" void ACE_TSS_C_cleanup (void *); +extern "C" void ACE_TSS_C_cleanup (void *); # endif /* ACE_HAS_THR_C_DEST */ #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */ @@ -48,7 +48,7 @@ ACE_TSS::~ACE_TSS (void) ACE_TSS::cleanup (ts_obj); # endif /* ACE_HAS_THR_C_DEST */ - ACE_OS::thr_key_detach (this->key_, this); + ACE_OS::thr_key_detach (this->key_); ACE_OS::thr_keyfree (this->key_); } #else // defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) @@ -83,7 +83,6 @@ template void ACE_TSS::dump (void) const { #if defined (ACE_HAS_DUMP) -// ACE_TRACE ("ACE_TSS::dump"); #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->keylock_.dump (); @@ -115,11 +114,11 @@ ACE_TSS::ts_init (void) { if (ACE_Thread::keycreate (&this->key_, #if defined (ACE_HAS_THR_C_DEST) - &ACE_TSS_C_cleanup, + &ACE_TSS_C_cleanup #else - &ACE_TSS::cleanup, + &ACE_TSS::cleanup #endif /* ACE_HAS_THR_C_DEST */ - (void *) this) != 0) + ) != 0) return -1; // Major problems, this should *never* happen! else { @@ -339,8 +338,6 @@ template void ACE_TSS_Guard::dump (void) const { #if defined (ACE_HAS_DUMP) -// ACE_TRACE ("ACE_TSS_Guard::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d\n"), this->key_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -350,8 +347,6 @@ ACE_TSS_Guard::dump (void) const template void ACE_TSS_Guard::init_key (void) { -// ACE_TRACE ("ACE_TSS_Guard::init_key"); - this->key_ = ACE_OS::NULL_key; ACE_Thread::keycreate (&this->key_, #if defined (ACE_HAS_THR_C_DEST) @@ -365,27 +360,24 @@ ACE_TSS_Guard::init_key (void) template ACE_TSS_Guard::ACE_TSS_Guard (void) { -// ACE_TRACE ("ACE_TSS_Guard::ACE_TSS_Guard"); this->init_key (); } template int ACE_TSS_Guard::release (void) { -// ACE_TRACE ("ACE_TSS_Guard::release"); - - ACE_Guard *guard = 0; + Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast (temp); - guard = static_cast *> (tss_adapter->ts_obj_); + guard = static_cast (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast *> (temp); + guard = static_cast (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->release (); @@ -394,20 +386,18 @@ ACE_TSS_Guard::release (void) template int ACE_TSS_Guard::remove (void) { -// ACE_TRACE ("ACE_TSS_Guard::remove"); - - ACE_Guard *guard = 0; + Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast (temp); - guard = static_cast *> (tss_adapter->ts_obj_); + guard = static_cast (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast *> (temp); + guard = static_cast (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->remove (); @@ -416,20 +406,18 @@ ACE_TSS_Guard::remove (void) template ACE_TSS_Guard::~ACE_TSS_Guard (void) { -// ACE_TRACE ("ACE_TSS_Guard::~ACE_TSS_Guard"); - - ACE_Guard *guard = 0; + Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast (temp); - guard = static_cast *> (tss_adapter->ts_obj_); + guard = static_cast (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast *> (temp); + guard = static_cast (temp); #endif /* ACE_HAS_THR_C_DEST */ // Make sure that this pointer is NULL when we shut down... @@ -442,22 +430,17 @@ ACE_TSS_Guard::~ACE_TSS_Guard (void) template void ACE_TSS_Guard::cleanup (void *ptr) { -// ACE_TRACE ("ACE_TSS_Guard::cleanup"); - // Destructor releases lock. - delete (ACE_Guard *) ptr; + delete (Guard_Type *) ptr; } template ACE_TSS_Guard::ACE_TSS_Guard (ACE_LOCK &lock, bool block) { -// ACE_TRACE ("ACE_TSS_Guard::ACE_TSS_Guard"); - this->init_key (); - ACE_Guard *guard = 0; + Guard_Type *guard = 0; ACE_NEW (guard, - ACE_Guard (lock, - block)); + Guard_Type (lock, block)); #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; @@ -475,20 +458,18 @@ ACE_TSS_Guard::ACE_TSS_Guard (ACE_LOCK &lock, bool block) template int ACE_TSS_Guard::acquire (void) { -// ACE_TRACE ("ACE_TSS_Guard::acquire"); - - ACE_Guard *guard = 0; + Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast (temp); - guard = static_cast *> (tss_adapter->ts_obj_); + guard = static_cast (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast *> (temp); + guard = static_cast (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->acquire (); @@ -497,20 +478,18 @@ ACE_TSS_Guard::acquire (void) template int ACE_TSS_Guard::tryacquire (void) { -// ACE_TRACE ("ACE_TSS_Guard::tryacquire"); - - ACE_Guard *guard = 0; + Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast (temp); - guard = static_cast *> (tss_adapter->ts_obj_); + guard = static_cast (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast *> (temp); + guard = static_cast (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->tryacquire (); @@ -520,44 +499,37 @@ template ACE_TSS_Write_Guard::ACE_TSS_Write_Guard (ACE_LOCK &lock, bool block) { -// ACE_TRACE ("ACE_TSS_Write_Guard::ACE_TSS_Write_Guard"); - this->init_key (); - ACE_Guard *guard = 0; + Guard_Type *guard = 0; ACE_NEW (guard, - ACE_Write_Guard (lock, - block)); + Write_Guard_Type (lock, block)); #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; ACE_NEW (tss_adapter, ACE_TSS_Adapter ((void *) guard, ACE_TSS_Guard::cleanup)); - ACE_Thread::setspecific (this->key_, - (void *) tss_adapter); + ACE_Thread::setspecific (this->key_, (void *) tss_adapter); #else - ACE_Thread::setspecific (this->key_, - (void *) guard); + ACE_Thread::setspecific (this->key_, (void *) guard); #endif /* ACE_HAS_THR_C_DEST */ } template int ACE_TSS_Write_Guard::acquire (void) { -// ACE_TRACE ("ACE_TSS_Write_Guard::acquire"); - - ACE_Write_Guard *guard = 0; + Write_Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast (temp); - guard = static_cast *> (tss_adapter->ts_obj_); + guard = static_cast (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast *> (temp); + guard = static_cast (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->acquire_write (); @@ -566,20 +538,18 @@ ACE_TSS_Write_Guard::acquire (void) template int ACE_TSS_Write_Guard::tryacquire (void) { -// ACE_TRACE ("ACE_TSS_Write_Guard::tryacquire"); - - ACE_Write_Guard *guard = 0; + Write_Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast (temp); - guard = static_cast *> (tss_adapter->ts_obj_); + guard = static_cast (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast *> (temp); + guard = static_cast (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->tryacquire_write (); @@ -588,16 +558,12 @@ ACE_TSS_Write_Guard::tryacquire (void) template int ACE_TSS_Write_Guard::acquire_write (void) { -// ACE_TRACE ("ACE_TSS_Write_Guard::acquire_write"); - return this->acquire (); } template int ACE_TSS_Write_Guard::tryacquire_write (void) { -// ACE_TRACE ("ACE_TSS_Write_Guard::tryacquire_write"); - return this->tryacquire (); } @@ -605,7 +571,6 @@ template void ACE_TSS_Write_Guard::dump (void) const { #if defined (ACE_HAS_DUMP) -// ACE_TRACE ("ACE_TSS_Write_Guard::dump"); ACE_TSS_Guard::dump (); #endif /* ACE_HAS_DUMP */ } @@ -613,13 +578,10 @@ ACE_TSS_Write_Guard::dump (void) const template ACE_TSS_Read_Guard::ACE_TSS_Read_Guard (ACE_LOCK &lock, bool block) { -// ACE_TRACE ("ACE_TSS_Read_Guard::ACE_TSS_Read_Guard"); - this->init_key (); - ACE_Guard *guard = 0; + Guard_Type *guard = 0; ACE_NEW (guard, - ACE_Read_Guard (lock, - block)); + Read_Guard_Type (lock, block)); #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter; ACE_NEW (tss_adapter, @@ -636,20 +598,18 @@ ACE_TSS_Read_Guard::ACE_TSS_Read_Guard (ACE_LOCK &lock, bool block) template int ACE_TSS_Read_Guard::acquire (void) { -// ACE_TRACE ("ACE_TSS_Read_Guard::acquire"); - - ACE_Read_Guard *guard = 0; + Read_Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast (temp); - guard = static_cast *> (tss_adapter->ts_obj_); + guard = static_cast (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast *> (temp); + guard = static_cast (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->acquire_read (); @@ -658,20 +618,18 @@ ACE_TSS_Read_Guard::acquire (void) template int ACE_TSS_Read_Guard::tryacquire (void) { -// ACE_TRACE ("ACE_TSS_Read_Guard::tryacquire"); - - ACE_Read_Guard *guard = 0; + Read_Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast (temp); - guard = static_cast *> (tss_adapter->ts_obj_); + guard = static_cast (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast *> (temp); + guard = static_cast (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->tryacquire_read (); @@ -680,16 +638,12 @@ ACE_TSS_Read_Guard::tryacquire (void) template int ACE_TSS_Read_Guard::acquire_read (void) { -// ACE_TRACE ("ACE_TSS_Read_Guard::acquire_read"); - return this->acquire (); } template int ACE_TSS_Read_Guard::tryacquire_read (void) { -// ACE_TRACE ("ACE_TSS_Read_Guard::tryacquire_read"); - return this->tryacquire (); } @@ -697,7 +651,6 @@ template void ACE_TSS_Read_Guard::dump (void) const { #if defined (ACE_HAS_DUMP) -// ACE_TRACE ("ACE_TSS_Read_Guard::dump"); ACE_TSS_Guard::dump (); #endif /* ACE_HAS_DUMP */ } diff --git a/dep/ACE_wrappers/ace/TSS_T.h b/dep/ACE_wrappers/ace/TSS_T.h index d4fa8d529..7c877545b 100644 --- a/dep/ACE_wrappers/ace/TSS_T.h +++ b/dep/ACE_wrappers/ace/TSS_T.h @@ -4,7 +4,7 @@ /** * @file TSS_T.h * - * $Id: TSS_T.h 91124 2010-07-19 11:54:35Z vzykov $ + * $Id: TSS_T.h 91703 2010-09-10 11:05:38Z msmit $ * * Moved from Synch.h. * @@ -36,6 +36,7 @@ # endif /* ACE_HAS_THREADS && (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) */ #include "ace/Thread_Mutex.h" +#include "ace/Copy_Disabled.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -76,7 +77,7 @@ class ACE_TSS_Adapter; * */ template -class ACE_TSS +class ACE_TSS : private ACE_Copy_Disabled { public: /** @@ -212,9 +213,6 @@ protected: int ts_value (TYPE *new_ts_obj) const; # endif /* ACE_HAS_THR_C_DEST */ #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */ - // = Disallow copying... - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS &)) - ACE_UNIMPLEMENTED_FUNC (ACE_TSS (const ACE_TSS &)) }; /** diff --git a/dep/ACE_wrappers/ace/Task.h b/dep/ACE_wrappers/ace/Task.h index 08147a645..d6c0a68ee 100644 --- a/dep/ACE_wrappers/ace/Task.h +++ b/dep/ACE_wrappers/ace/Task.h @@ -4,7 +4,7 @@ /** * @file Task.h * - * $Id: Task.h 91058 2010-07-12 08:20:09Z johnnyw $ + * $Id: Task.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -286,7 +286,6 @@ protected: /// Holds the thread ID of the last thread to exit svc() in this object. ACE_thread_t last_thread_id_; - private: // = Disallow these operations. diff --git a/dep/ACE_wrappers/ace/Task_Ex_T.h b/dep/ACE_wrappers/ace/Task_Ex_T.h index 00233d4e7..70a97247b 100644 --- a/dep/ACE_wrappers/ace/Task_Ex_T.h +++ b/dep/ACE_wrappers/ace/Task_Ex_T.h @@ -4,7 +4,7 @@ /** * @file Task_Ex_T.h * - * $Id: Task_Ex_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Task_Ex_T.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Kobi Cohen-Arazi */ @@ -58,7 +58,8 @@ template class ACE_Module; * code is in action. */ template -class ACE_Task_Ex : public ACE_Task_Base +class ACE_Task_Ex : public ACE_Task_Base, + private ACE_Copy_Disabled { public: friend class ACE_Module; @@ -125,12 +126,6 @@ public: // Should be protected: */ int put_next (ACE_MESSAGE_TYPE *msg, ACE_Time_Value *timeout = 0); - /** - * Tests whether we can enqueue a message without blocking. - * @deprecated This method is deprecated and will go away in the future. - */ - int can_put (ACE_MESSAGE_TYPE *); - // = ACE_Task utility routines to identify names et al. /// Return the name of the enclosing Module if there's one associated /// with the Task, else returns 0. @@ -179,12 +174,6 @@ public: // Should be protected: /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; - -private: - - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Task_Ex &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Task_Ex (const ACE_Task_Ex &)) }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Task_Ex_T.inl b/dep/ACE_wrappers/ace/Task_Ex_T.inl index dd90bcd49..9b5c864c6 100644 --- a/dep/ACE_wrappers/ace/Task_Ex_T.inl +++ b/dep/ACE_wrappers/ace/Task_Ex_T.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Task_Ex_T.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Task_Ex_T.inl 91688 2010-09-09 11:21:50Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -22,13 +22,6 @@ ACE_Task_Ex::getq (ACE_MESSAGE_TYPE *&mb, ACE_Ti return this->msg_queue_->dequeue_head (mb, tv); } -template ACE_INLINE int -ACE_Task_Ex::can_put (ACE_MESSAGE_TYPE *) -{ - ACE_TRACE ("ACE_Task_Ex::can_put"); - ACE_NOTSUP_RETURN (-1); -} - template ACE_INLINE int ACE_Task_Ex::putq (ACE_MESSAGE_TYPE *mb, ACE_Time_Value *tv) { diff --git a/dep/ACE_wrappers/ace/Task_T.h b/dep/ACE_wrappers/ace/Task_T.h index d79a5fb0e..1946f45cf 100644 --- a/dep/ACE_wrappers/ace/Task_T.h +++ b/dep/ACE_wrappers/ace/Task_T.h @@ -4,7 +4,7 @@ /** * @file Task_T.h * - * $Id: Task_T.h 91016 2010-07-06 11:29:50Z johnnyw $ + * $Id: Task_T.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -111,13 +111,6 @@ public: // Should be protected: */ int put_next (ACE_Message_Block *msg, ACE_Time_Value *timeout = 0); - /** - * Tests whether we can enqueue a message without blocking. - * - * @deprecated This method is deprecated and will go away in the future. - */ - int can_put (ACE_Message_Block *); - // = ACE_Task utility routines to identify names et al. /// Return the name of the enclosing Module if there's one associated /// with the Task, else returns 0. diff --git a/dep/ACE_wrappers/ace/Task_T.inl b/dep/ACE_wrappers/ace/Task_T.inl index a441ca9d0..5eda4c2bf 100644 --- a/dep/ACE_wrappers/ace/Task_T.inl +++ b/dep/ACE_wrappers/ace/Task_T.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Task_T.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Task_T.inl 91688 2010-09-09 11:21:50Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -22,13 +22,6 @@ ACE_Task::getq (ACE_Message_Block *&mb, ACE_Time_Value *tv) return this->msg_queue_->dequeue_head (mb, tv); } -template ACE_INLINE int -ACE_Task::can_put (ACE_Message_Block *) -{ - ACE_TRACE ("ACE_Task::can_put"); - ACE_NOTSUP_RETURN (-1); -} - template ACE_INLINE int ACE_Task::putq (ACE_Message_Block *mb, ACE_Time_Value *tv) { diff --git a/dep/ACE_wrappers/ace/Thread.h b/dep/ACE_wrappers/ace/Thread.h index 4d44858fa..d654ffea5 100644 --- a/dep/ACE_wrappers/ace/Thread.h +++ b/dep/ACE_wrappers/ace/Thread.h @@ -4,7 +4,7 @@ /** * @file Thread.h * - * $Id: Thread.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Thread.h 92060 2010-09-27 18:08:48Z johnnyw $ * * @author Douglas Schmidt */ @@ -53,9 +53,9 @@ class ACE_Export ACE_Thread public: /** * Creates a new thread having @a flags attributes and running @a func - * with (if is non-0 then @a func and - * are ignored and are obtained from ). - * and are set to the thread's ID and handle (?), + * with @a args (if @a thread_adapter is non-0 then @a func and @a args + * are ignored and are obtained from @a thread_adapter>. @a thr_id + * and @a t_handle are set to the thread's ID and handle (?), * respectively. The thread runs at @a priority priority (see * below). * @@ -70,15 +70,15 @@ public: * * By default, or if @a priority is set to * ACE_DEFAULT_THREAD_PRIORITY, an "appropriate" priority value for - * the given scheduling policy (specified in , e.g., - * ) is used. This value is calculated + * the given scheduling policy (specified in @a flags, e.g., + * @c THR_SCHED_DEFAULT is used. This value is calculated * dynamically, and is the median value between the minimum and * maximum priority values for the given policy. If an explicit * value is given, it is used. Note that actual priority values are - * EXTREMEMLY implementation-dependent, and are probably best + * EXTREMELY implementation-dependent, and are probably best * avoided. * - * Note that is always deleted when + * Note that @a thread_adapter is always deleted when @a spawn * is called, so it must be allocated with global operator new. */ static int spawn (ACE_THR_FUNC func, @@ -120,7 +120,7 @@ public: * Spawn @a n new threads, which execute @a func with argument @a arg * (if @a thread_adapter is non-0 then @a func and @a args are ignored * and are obtained from @a thread_adapter). The thread_ids of - * successfully spawned threads will be placed into the + * successfully spawned threads will be placed into the @a thread_ids * buffer (which must be the same size as @a n). If @a stack != 0 it * is assumed to be an array of @a n pointers to the base of the * stacks to use for the threads being spawned. If @a stack_size != @@ -226,11 +226,11 @@ public: */ static int keycreate (ACE_thread_key_t *keyp, #if defined (ACE_HAS_THR_C_DEST) - ACE_THR_C_DEST destructor, + ACE_THR_C_DEST destructor #else - ACE_THR_DEST destructor, + ACE_THR_DEST destructor #endif /* ACE_HAS_THR_C_DEST */ - void * = 0); + ); /// Free up the key so that other threads can reuse it. static int keyfree (ACE_thread_key_t key); diff --git a/dep/ACE_wrappers/ace/Thread.inl b/dep/ACE_wrappers/ace/Thread.inl index 87e47e135..b1fd120a2 100644 --- a/dep/ACE_wrappers/ace/Thread.inl +++ b/dep/ACE_wrappers/ace/Thread.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Thread.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Thread.inl 91693 2010-09-09 12:57:54Z johnnyw $ #include "ace/OS_NS_string.h" @@ -13,14 +13,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int ACE_Thread::keycreate (ACE_thread_key_t *keyp, #if defined (ACE_HAS_THR_C_DEST) - ACE_THR_C_DEST destructor, + ACE_THR_C_DEST destructor #else - ACE_THR_DEST destructor, + ACE_THR_DEST destructor #endif /* ACE_HAS_THR_C_DEST */ - void *inst) + ) { // ACE_TRACE ("ACE_Thread::keycreate"); - return ACE_OS::thr_keycreate (keyp, destructor, inst); + return ACE_OS::thr_keycreate (keyp, destructor); } // Free up the key so that other threads can reuse it. diff --git a/dep/ACE_wrappers/ace/Thread_Adapter.h b/dep/ACE_wrappers/ace/Thread_Adapter.h index 8f1f259ef..d7ab4056d 100644 --- a/dep/ACE_wrappers/ace/Thread_Adapter.h +++ b/dep/ACE_wrappers/ace/Thread_Adapter.h @@ -4,7 +4,7 @@ /** * @file Thread_Adapter.h * - * $Id: Thread_Adapter.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Thread_Adapter.h 92060 2010-09-27 18:08:48Z johnnyw $ * * @author Carlos O'Ryan */ @@ -69,21 +69,17 @@ public: ACE_Thread_Manager *thr_mgr (void); protected: - /// Ensure that this object must be allocated on the heap. ~ACE_Thread_Adapter (void); private: - /// Called by invoke, mainly here to separate the SEH stuff because /// SEH on Win32 doesn't compile with local vars with destructors. virtual ACE_THR_FUNC_RETURN invoke_i (void); private: - /// Optional thread manager. ACE_Thread_Manager *thr_mgr_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Thread_Control.cpp b/dep/ACE_wrappers/ace/Thread_Control.cpp index 5651fa1b1..2f38849e3 100644 --- a/dep/ACE_wrappers/ace/Thread_Control.cpp +++ b/dep/ACE_wrappers/ace/Thread_Control.cpp @@ -1,19 +1,8 @@ -// $Id: Thread_Control.cpp 91286 2010-08-05 09:04:31Z johnnyw $ - -// -#include "ace/config-all.h" -#if defined (ACE_LEGACY_MODE) -// This silly include breaks a cycle when compiling in backwards -// compatibility mode -# include "ace/Thread_Exit.h" -#endif /* ACE_LEGACY_MODE */ -// +// $Id: Thread_Control.cpp 91688 2010-09-09 11:21:50Z johnnyw $ #include "ace/Thread_Control.h" #include "ace/Thread_Manager.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/Thread_Control.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/dep/ACE_wrappers/ace/Thread_Control.inl b/dep/ACE_wrappers/ace/Thread_Control.inl index 6ebd3ac2c..0f8e0c9ec 100644 --- a/dep/ACE_wrappers/ace/Thread_Control.inl +++ b/dep/ACE_wrappers/ace/Thread_Control.inl @@ -1,6 +1,7 @@ // -*- C++ -*- -// -// $Id: Thread_Control.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Thread_Control.inl 91730 2010-09-13 09:31:11Z johnnyw $ + +#include "ace/OS_NS_macros.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Thread_Mutex.h b/dep/ACE_wrappers/ace/Thread_Mutex.h index fd8f39595..7bda270e5 100644 --- a/dep/ACE_wrappers/ace/Thread_Mutex.h +++ b/dep/ACE_wrappers/ace/Thread_Mutex.h @@ -4,7 +4,7 @@ /** * @file Thread_Mutex.h * - * $Id: Thread_Mutex.h 89127 2010-02-22 19:58:18Z schmidt $ + * $Id: Thread_Mutex.h 92060 2010-09-27 18:08:48Z johnnyw $ * * Moved from Synch.h. * @@ -78,7 +78,7 @@ public: int acquire (ACE_Time_Value &tv); /** - * If @a tv == 0 the call directly. Otherwise, Block the + * If @a tv == 0 the call acquire() directly. Otherwise, Block the * thread until we acquire the mutex or until @a tv times out, in * which case -1 is returned with @c errno == @c ETIME. Note that * @a tv is assumed to be in "absolute" rather than "relative" time. diff --git a/dep/ACE_wrappers/ace/Thread_Mutex.inl b/dep/ACE_wrappers/ace/Thread_Mutex.inl index d52fce904..dfd2d1600 100644 --- a/dep/ACE_wrappers/ace/Thread_Mutex.inl +++ b/dep/ACE_wrappers/ace/Thread_Mutex.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Thread_Mutex.inl 89127 2010-02-22 19:58:18Z schmidt $ +// $Id: Thread_Mutex.inl 91813 2010-09-17 07:52:52Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -12,7 +12,7 @@ ACE_Thread_Mutex::lock (void) const } ACE_INLINE ACE_thread_mutex_t & -ACE_Thread_Mutex::lock (void) +ACE_Thread_Mutex::lock (void) { // ACE_TRACE ("ACE_Thread_Mutex::lock"); return this->lock_; diff --git a/dep/ACE_wrappers/ace/Throughput_Stats.cpp b/dep/ACE_wrappers/ace/Throughput_Stats.cpp index b18cea3c3..87a63c715 100644 --- a/dep/ACE_wrappers/ace/Throughput_Stats.cpp +++ b/dep/ACE_wrappers/ace/Throughput_Stats.cpp @@ -1,4 +1,4 @@ -// $Id: Throughput_Stats.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Throughput_Stats.cpp 92069 2010-09-28 11:38:59Z johnnyw $ #include "ace/Throughput_Stats.h" @@ -14,15 +14,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Throughput_Stats::ACE_Throughput_Stats (void) : ACE_Basic_Stats () , throughput_last_ (0) -#if 0 - // @@TODO: This is what I really wanted to compute, but it just - // does not work. - , throughput_sum_x_ (0) - , throughput_sum_x2_ (0) - , throughput_sum_y_ (0) - , throughput_sum_y2_ (0) - , throughput_sum_xy_ (0) -#endif /* 0 */ { } @@ -34,35 +25,11 @@ ACE_Throughput_Stats::sample (ACE_UINT64 throughput, if (this->samples_count () == 1u) { - this->throughput_last_ = throughput; -#if 0 - // @@TODO: This is what I really wanted to compute, but it just - // does not work. - this->throughput_sum_y_ = this->samples_count_; - this->throughput_sum_y2_ = this->samples_count_ * this->samples_count_; - this->throughput_sum_x_ = throughput; - this->throughput_sum_x2_ = throughput * throughput; - this->throughput_sum_xy_ = throughput * this->samples_count_; - - ACE_OS::printf ("%f %qu\n", throughput / 400000000.0, this->samples_count_); -#endif /* 0 */ } else { this->throughput_last_ = throughput; - -#if 0 - // @@TODO: This is what I really wanted to compute, but it just - // does not work. - this->throughput_sum_y_ += this->samples_count_; - this->throughput_sum_y2_ += this->samples_count_ * this->samples_count_; - this->throughput_sum_x_ += throughput; - this->throughput_sum_x2_ += throughput * throughput; - this->throughput_sum_xy_ += throughput * this->samples_count_; - - ACE_OS::printf ("%f %qu\n", throughput / 400000000.0, this->samples_count_); -#endif /* 0 */ } } @@ -77,32 +44,11 @@ ACE_Throughput_Stats::accumulate (const ACE_Throughput_Stats &rhs) if (this->samples_count () == 0u) { this->throughput_last_ = rhs.throughput_last_; -#if 0 - // @@TODO: This is what I really wanted to compute, but it just - // does not work. - this->throughput_sum_x_ = rhs.throughput_sum_x_; - this->throughput_sum_x2_ = rhs.throughput_sum_x2_; - this->throughput_sum_y_ = rhs.throughput_sum_y_; - this->throughput_sum_y2_ = rhs.throughput_sum_y2_; - this->throughput_sum_xy_ = rhs.throughput_sum_xy_; -#endif /* 0 */ - return; } - if (this->throughput_last_ < rhs.throughput_last_) this->throughput_last_ = rhs.throughput_last_; - -#if 0 - // @@TODO: This is what I really wanted to compute, but it just - // does not work. - this->throughput_sum_x_ += rhs.throughput_sum_x_; - this->throughput_sum_x2_ += rhs.throughput_sum_x2_; - this->throughput_sum_y_ += rhs.throughput_sum_y_; - this->throughput_sum_y2_ += rhs.throughput_sum_y2_; - this->throughput_sum_xy_ += rhs.throughput_sum_xy_; -#endif /* 0 */ } void @@ -121,51 +67,6 @@ ACE_Throughput_Stats::dump_results (const ACE_TCHAR* msg, ACE_Throughput_Stats::dump_throughput (msg, sf, this->throughput_last_, this->samples_count ()); - -#if 0 - // @@TODO: This is what I really wanted to generate, but it just - // doesn't work. - double t_sum_x = - ACE_CU64_TO_CU32 (this->throughput_sum_x_);// / sf); - //t_sum_x /= 1000000.0; - double t_sum_y = - ACE_CU64_TO_CU32 (this->throughput_sum_y_); - double t_sum_x2 = - ACE_CU64_TO_CU32 (this->throughput_sum_x2_);// / (sf*sf)); - //t_sum_x2 /= 1000000.0; - //t_sum_x2 /= 1000000.0; - double t_sum_y2 = - ACE_CU64_TO_CU32 (this->throughput_sum_y2_); - double t_sum_xy = - ACE_CU64_TO_CU32 (this->throughput_sum_xy_);// / sf); - //t_sum_xy /= 1000000.0; - double t_avgx = t_sum_x / this->samples_count (); - double t_avgy = t_sum_y / this->samples_count (); - - double t_a = - (this->samples_count () * t_sum_xy - t_sum_x * t_sum_y) - / (this->samples_count () * t_sum_x2 - t_sum_x * t_sum_x); - double t_b = (t_avgy - t_a * t_avgx); - - t_a *= 1000000.0; - - double d_r = - (t_sum_xy - t_avgx * t_sum_y - t_avgy * t_sum_x - + this->samples_count () * t_avgx * t_avgy); - double n_r = - (t_sum_x2 - - this->samples_count () * t_avgx * t_avgx) - * (t_sum_y2 - - this->samples_count () * t_avgy * t_avgy); - double t_r = d_r * d_r / n_r; - - // ACE_DEBUG ((LM_DEBUG, - // "%s throughput: %.2f/%.2f/%.2f/%.6f/%.2f (avg/a/b/r/elapsed)\n", - // msg, t_avg, t_a, t_b, t_r, seconds)); - // ACE_DEBUG ((LM_DEBUG, - // "%s data: %.2f/%.2f/%.2f/%.6f/%.2f (x/x2/y/y2/xy)\n", - // msg, t_sum_x, t_sum_x2, t_sum_y, t_sum_y2, t_sum_xy)); -#endif } void diff --git a/dep/ACE_wrappers/ace/Throughput_Stats.h b/dep/ACE_wrappers/ace/Throughput_Stats.h index c306c856c..f9a97122a 100644 --- a/dep/ACE_wrappers/ace/Throughput_Stats.h +++ b/dep/ACE_wrappers/ace/Throughput_Stats.h @@ -4,7 +4,7 @@ /** * @file Throughput_Stats.h * - * $Id: Throughput_Stats.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Throughput_Stats.h 92069 2010-09-28 11:38:59Z johnnyw $ * * @author David L. Levine */ @@ -65,18 +65,6 @@ public: private: /// The last throughput measurement. ACE_UINT64 throughput_last_; - -#if 0 - /// These are the fields that we should keep to perform linear - /// regression - //@{ - ///@} - ACE_UINT64 throughput_sum_x_; - ACE_UINT64 throughput_sum_x2_; - ACE_UINT64 throughput_sum_y_; - ACE_UINT64 throughput_sum_y2_; - ACE_UINT64 throughput_sum_xy_; -#endif /* 0 */ }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Time_Value.cpp b/dep/ACE_wrappers/ace/Time_Value.cpp index 0a549ed5e..045df4d4e 100644 --- a/dep/ACE_wrappers/ace/Time_Value.cpp +++ b/dep/ACE_wrappers/ace/Time_Value.cpp @@ -1,4 +1,4 @@ -// $Id: Time_Value.cpp 91287 2010-08-05 10:30:49Z johnnyw $ +// $Id: Time_Value.cpp 92069 2010-09-28 11:38:59Z johnnyw $ #include "ace/Time_Value.h" @@ -154,15 +154,6 @@ ACE_Time_Value::operator FILETIME () const void ACE_Time_Value::dump (void) const { -#if defined (ACE_HAS_DUMP) - // ACE_OS_TRACE ("ACE_Time_Value::dump"); -#if 0 - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntv_sec_ = %d"), this->tv_.tv_sec)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntv_usec_ = %d\n"), this->tv_.tv_usec)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -#endif /* 0 */ -#endif /* ACE_HAS_DUMP */ } void diff --git a/dep/ACE_wrappers/ace/Timer_Hash_T.cpp b/dep/ACE_wrappers/ace/Timer_Hash_T.cpp index 6b603d218..3bc82b8a1 100644 --- a/dep/ACE_wrappers/ace/Timer_Hash_T.cpp +++ b/dep/ACE_wrappers/ace/Timer_Hash_T.cpp @@ -1,4 +1,4 @@ -// $Id: Timer_Hash_T.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ +// $Id: Timer_Hash_T.cpp 92069 2010-09-28 11:38:59Z johnnyw $ #ifndef ACE_TIMER_HASH_T_CPP #define ACE_TIMER_HASH_T_CPP @@ -419,14 +419,6 @@ ACE_Timer_Hash_T::reschedule ( expired->get_interval ()); ACE_ASSERT (h->orig_id_ != -1); -#if 0 - ACE_DEBUG ((LM_DEBUG, "Hash::reschedule() resets %d in slot %d where it's id is %d and token is %x\n", - expired->get_timer_value ().msec (), - h->pos_, - h->orig_id_, - h)); -#endif - // Since schedule() above will allocate a new node // then here schedule for deletion. Don't call // this->free_node() because that will invalidate @@ -470,14 +462,6 @@ ACE_Timer_Hash_T::schedule_i ( interval); ACE_ASSERT (h->orig_id_ != -1); -#if 0 - ACE_DEBUG ((LM_DEBUG, "Hash::schedule() placing %d in slot %d where it's id is %d and token is %x\n", - future_time.msec (), - position, - h->orig_id_, - h)); -#endif - if (this->table_[this->earliest_position_]->is_empty () || this->table_[position]->earliest_time () < this->table_[this->earliest_position_]->earliest_time ()) @@ -806,14 +790,6 @@ ACE_Timer_Hash_T::expire (const ACE_Time_Value ACE_ASSERT (h->pos_ == i); -#if 0 - ACE_DEBUG ((LM_DEBUG, "Hash::expire() expiring %d in slot %d where it's id is %d and token is %x\n", - expired->get_timer_value ().msec (), - h->pos_, - h->orig_id_, - h)); -#endif - // Check if this is an interval timer. if (expired->get_interval () > ACE_Time_Value::zero) { diff --git a/dep/ACE_wrappers/ace/Timer_Heap_T.cpp b/dep/ACE_wrappers/ace/Timer_Heap_T.cpp index 75ec9ef70..134391503 100644 --- a/dep/ACE_wrappers/ace/Timer_Heap_T.cpp +++ b/dep/ACE_wrappers/ace/Timer_Heap_T.cpp @@ -1,4 +1,4 @@ -// $Id: Timer_Heap_T.cpp 84962 2009-03-24 15:16:25Z johnnyw $ +// $Id: Timer_Heap_T.cpp 92069 2010-09-28 11:38:59Z johnnyw $ #ifndef ACE_TIMER_HEAP_T_CPP #define ACE_TIMER_HEAP_T_CPP @@ -522,21 +522,7 @@ ACE_Timer_Heap_T::grow_heap (void) // All the containers will double in size from max_size_. size_t new_size = this->max_size_ * 2; -#if 0 - // Yikes - there's no way to flag a failure of going out of range of - // a 'long' - this is a problem that should be addressed at some point. - if (new_size > ACE_Numeric_Limits::max ()) - new_size = ACE_Numeric_Limits::max (); - - if (new_size <= this->max_size_) // We are already at the limit - { - errno = ENOMEM; - return -1; - } -#endif /* 0 */ - - // First grow the heap itself. - + // First grow the heap itself. ACE_Timer_Node_T **new_heap = 0; ACE_NEW (new_heap, diff --git a/dep/ACE_wrappers/ace/Timer_Queue_Adapters.cpp b/dep/ACE_wrappers/ace/Timer_Queue_Adapters.cpp index 54e8f8ade..190d11c4f 100644 --- a/dep/ACE_wrappers/ace/Timer_Queue_Adapters.cpp +++ b/dep/ACE_wrappers/ace/Timer_Queue_Adapters.cpp @@ -1,4 +1,4 @@ -// $Id: Timer_Queue_Adapters.cpp 89482 2010-03-15 07:58:50Z johnnyw $ +// $Id: Timer_Queue_Adapters.cpp 92285 2010-10-20 16:34:57Z shuston $ #ifndef ACE_TIMER_QUEUE_ADAPTERS_CPP #define ACE_TIMER_QUEUE_ADAPTERS_CPP @@ -17,6 +17,7 @@ # include "ace/Timer_Queue_Adapters.inl" # endif /* __ACE_INLINE__ */ +#include "ace/Reverse_Lock_T.h" #include "ace/Signal.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_time.h" @@ -278,8 +279,15 @@ ACE_Thread_Timer_Queue_Adapter::svc (void) } } - // Expire timers anyway, at worst this is a no-op. - this->timer_queue_->expire (); + // Expire timers anyway, at worst this is a no-op. Release the lock + // while dispatching; the timer queue has its own lock to protect + // itself. + { + ACE_Reverse_Lock rel (this->mutex_); + ACE_GUARD_RETURN (ACE_Reverse_Lock, + rmon, rel, -1); + this->timer_queue_->expire (); + } } // Thread cancellation point, if ACE supports it. diff --git a/dep/ACE_wrappers/ace/Timer_Queue_T.cpp b/dep/ACE_wrappers/ace/Timer_Queue_T.cpp index 258e68edd..838d4422b 100644 --- a/dep/ACE_wrappers/ace/Timer_Queue_T.cpp +++ b/dep/ACE_wrappers/ace/Timer_Queue_T.cpp @@ -1,4 +1,4 @@ -// $Id: Timer_Queue_T.cpp 89254 2010-02-25 22:10:39Z cleeland $ +// $Id: Timer_Queue_T.cpp 92285 2010-10-20 16:34:57Z shuston $ #ifndef ACE_TIMER_QUEUE_T_CPP #define ACE_TIMER_QUEUE_T_CPP @@ -18,6 +18,7 @@ #include "ace/Guard_T.h" #include "ace/Log_Msg.h" #include "ace/Reactor_Timer_Interface.h" +#include "ace/Reverse_Lock_T.h" #include "ace/Null_Mutex.h" #include "ace/OS_NS_sys_time.h" @@ -267,6 +268,9 @@ ACE_Timer_Queue_T::expire (const ACE_Time_Value &cur_ti while ((result = this->dispatch_info_i (cur_time, info)) != 0) { + ACE_MT (ACE_Reverse_Lock rev_lk(this->mutex_)); + ACE_MT (ACE_GUARD_RETURN (ACE_Reverse_Lock, rmon, rev_lk, -1)); + const void *upcall_act = 0; this->preinvoke (info, cur_time, upcall_act); diff --git a/dep/ACE_wrappers/ace/Token_Collection.h b/dep/ACE_wrappers/ace/Token_Collection.h index 16a9bb412..3db64182a 100644 --- a/dep/ACE_wrappers/ace/Token_Collection.h +++ b/dep/ACE_wrappers/ace/Token_Collection.h @@ -4,7 +4,7 @@ /** * @file Token_Collection.h * - * $Id: Token_Collection.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Token_Collection.h 91688 2010-09-09 11:21:50Z johnnyw $ * * The ACE_Token class offers methods for acquiring, renewing, * and releasing a synchronization token on a per-token basis. The @@ -204,18 +204,6 @@ protected: typedef ACE_Map_Manager COLLECTION; - /// Allows iterations through collection_ - /** - * @deprecated Deprecated typedef. Use COLLECTION::ITERATOR trait instead. - */ - typedef COLLECTION::ITERATOR COLLECTION_ITERATOR; - - /// Allows iterations through collection_ - /** - * @deprecated Deprecated typedef. Use COLLECTION::ENTRY trait instead. - */ - typedef COLLECTION::ENTRY COLLECTION_ENTRY; - /// COLLECTION maintains a mapping from token names to ACE_Tokens*. COLLECTION collection_; diff --git a/dep/ACE_wrappers/ace/Token_Invariants.h b/dep/ACE_wrappers/ace/Token_Invariants.h index 5cec39476..3e620b036 100644 --- a/dep/ACE_wrappers/ace/Token_Invariants.h +++ b/dep/ACE_wrappers/ace/Token_Invariants.h @@ -4,7 +4,7 @@ /** * @file Token_Invariants.h * - * $Id: Token_Invariants.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Token_Invariants.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Tim Harrison (harrison@cs.wustl.edu) * @@ -195,20 +195,6 @@ protected: typedef ACE_Map_Manager MUTEX_COLLECTION; - /// Allows iterations through collection. - /** - * @deprecated Deprecated typedef. Use MUTEX_COLLECTION::ITERATOR trait - * instead. - */ - typedef MUTEX_COLLECTION::ITERATOR MUTEX_COLLECTION_ITERATOR; - - /// Allows iterations through collection. - /** - * @deprecated Deprecated typedef. Use MUTEX_COLLECTION::ENTRY trait - * instead. - */ - typedef MUTEX_COLLECTION::ENTRY MUTEX_COLLECTION_ENTRY; - /// MUTEX_COLLECTION maintains a mapping from token names to mutexes. MUTEX_COLLECTION mutex_collection_; @@ -216,20 +202,6 @@ protected: typedef ACE_Map_Manager RWLOCK_COLLECTION; - /// Allows iterations through collection. - /** - * @deprecated Deprecated typedef. Use RWLOCK_COLLECTION::ITERATOR trait - * instead. - */ - typedef RWLOCK_COLLECTION::ITERATOR RWLOCK_COLLECTION_ITERATOR; - - /// Allows iterations through collection. - /** - * @deprecated Deprecated typedef. Use RWLOCK_COLLECTION::ENTRY trait - * instead. - */ - typedef RWLOCK_COLLECTION::ENTRY RWLOCK_COLLECTION_ENTRY; - /// MUTEX_COLLECTION maintains a mapping from token names to mutexes. RWLOCK_COLLECTION rwlock_collection_; diff --git a/dep/ACE_wrappers/ace/Token_Manager.h b/dep/ACE_wrappers/ace/Token_Manager.h index 9882e28ef..eb86a4dd9 100644 --- a/dep/ACE_wrappers/ace/Token_Manager.h +++ b/dep/ACE_wrappers/ace/Token_Manager.h @@ -4,7 +4,7 @@ /** * @file Token_Manager.h * - * $Id: Token_Manager.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Token_Manager.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Tim Harrison (harrison@cs.wustl.edu) */ @@ -120,20 +120,6 @@ private: typedef ACE_Map_Manager COLLECTION; - /// Allows iterations through collection_ - /** - * @deprecated Deprecated typedef. Use COLLECTION::ITERATOR trait - * instead. - */ - typedef COLLECTION::ITERATOR COLLECTION_ITERATOR; - - /// Allows iterations through collection_ - /** - * @deprecated Deprecated typedef. Use COLLECTION::ENTRY trait - * instead. - */ - typedef COLLECTION::ENTRY COLLECTION_ENTRY; - /// COLLECTION maintains a mapping from token names to ACE_Tokens*. COLLECTION collection_; }; diff --git a/dep/ACE_wrappers/ace/Tokenizer_T.cpp b/dep/ACE_wrappers/ace/Tokenizer_T.cpp index 00aa2abdc..ccf737679 100644 --- a/dep/ACE_wrappers/ace/Tokenizer_T.cpp +++ b/dep/ACE_wrappers/ace/Tokenizer_T.cpp @@ -1,4 +1,4 @@ -// $Id: Tokenizer_T.cpp 88793 2010-02-01 17:50:34Z cleeland $ +// $Id: Tokenizer_T.cpp 91813 2010-09-17 07:52:52Z johnnyw $ #ifndef ACE_TOKENIZER_T_CPP #define ACE_TOKENIZER_T_CPP @@ -124,7 +124,7 @@ ACE_Tokenizer_T::next (void) index_ = 0; return 0; } - + // Check if a buffer has been passed if (!buffer_) { diff --git a/dep/ACE_wrappers/ace/Unbounded_Set.h b/dep/ACE_wrappers/ace/Unbounded_Set.h index a75eac18f..165560951 100644 --- a/dep/ACE_wrappers/ace/Unbounded_Set.h +++ b/dep/ACE_wrappers/ace/Unbounded_Set.h @@ -4,7 +4,7 @@ /** * @file Unbounded_Set.h * - * $Id: Unbounded_Set.h 81642 2008-05-07 19:30:35Z shuston $ + * $Id: Unbounded_Set.h 91743 2010-09-13 18:24:51Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -50,7 +50,7 @@ public: // = Initialization method. ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set &s, bool end = false); - + ACE_Unbounded_Set_Iterator (const base_type &s); }; @@ -63,13 +63,13 @@ class ACE_Unbounded_Set_Const_Iterator : public ACE_Unbounded_Set_Ex_Const_Iterator > { public: - + typedef ACE_Unbounded_Set_Ex_Const_Iterator > base_type; - + // = Initialization method. ACE_Unbounded_Set_Const_Iterator (const ACE_Unbounded_Set &s, bool end = false); - + ACE_Unbounded_Set_Const_Iterator (const base_type &s); }; diff --git a/dep/ACE_wrappers/ace/Unbounded_Set.inl b/dep/ACE_wrappers/ace/Unbounded_Set.inl index 365b025c0..c83629496 100644 --- a/dep/ACE_wrappers/ace/Unbounded_Set.inl +++ b/dep/ACE_wrappers/ace/Unbounded_Set.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Unbounded_Set.inl 81642 2008-05-07 19:30:35Z shuston $ +// $Id: Unbounded_Set.inl 91813 2010-09-17 07:52:52Z johnnyw $ #include "ace/Global_Macros.h" @@ -13,7 +13,7 @@ ACE_Unbounded_Set_Default_Comparator::operator () (const T &lhs, const T &rh } template -ACE_Unbounded_Set_Iterator::ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set &s, +ACE_Unbounded_Set_Iterator::ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set &s, bool end) : base_type (s, end) { diff --git a/dep/ACE_wrappers/ace/Vector_T.cpp b/dep/ACE_wrappers/ace/Vector_T.cpp index 006e6db1b..f46466534 100644 --- a/dep/ACE_wrappers/ace/Vector_T.cpp +++ b/dep/ACE_wrappers/ace/Vector_T.cpp @@ -1,4 +1,4 @@ -// $Id: Vector_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Vector_T.cpp 92069 2010-09-28 11:38:59Z johnnyw $ #ifndef ACE_VECTOR_T_CPP #define ACE_VECTOR_T_CPP @@ -40,7 +40,7 @@ void ACE_Vector::push_back (const T& elem) } else ACE_Array::size (length_ + 1); - + ++length_; (*this)[length_-1] = elem; } @@ -48,14 +48,6 @@ void ACE_Vector::push_back (const T& elem) template void ACE_Vector::dump (void) const { -#if defined (ACE_HAS_DUMP) -#if 0 - // Can't do this unless the vector is an object with a dump - // function. - for (size_t i = 0; i < this->size (); ++i) - (*this)[i].dump (); -#endif /* 0 */ -#endif /* ACE_HAS_DUMP */ } // Compare this vector with for equality. @@ -75,61 +67,6 @@ ACE_Vector::operator== (const ACE_Vector &s) c return true; } -#if 0 -template -int compare(const ACE_Vector& v1, - const ACE_Vector& v2, - const size_t from_ndx, - const size_t to_ndx) -{ - size_t last1 = v1.size () - 1; - size_t last2 = v2.size () - 1; - if (last1 < from_ndx || last1 < to_ndx) - return false; - if (last2 < from_ndx || last2 < to_ndx) - return false; - if (last1 != last2) - return false; - - // cout<<"compare() <================="<"< -int partial_compare(const ACE_Vector& v1, - const ACE_Vector& v2, - const size_t from_ndx, - const size_t to_ndx) -{ - size_t last1 = v1.size () - 1; - size_t last2 = v2.size () - 1; - - if (last1 < from_ndx || last1 < to_ndx) - return false; - if (last2 < from_ndx || last2 < to_ndx) - return false; - - // cout<<"partial_compare() <================="<"< int diff --git a/dep/ACE_wrappers/ace/Vector_T.h b/dep/ACE_wrappers/ace/Vector_T.h index 8f9dbdf9c..8037bd6e2 100644 --- a/dep/ACE_wrappers/ace/Vector_T.h +++ b/dep/ACE_wrappers/ace/Vector_T.h @@ -4,7 +4,7 @@ /** * @file Vector_T.h * - * $Id: Vector_T.h 91285 2010-08-05 08:29:30Z johnnyw $ + * $Id: Vector_T.h 92069 2010-09-28 11:38:59Z johnnyw $ * * @author Craig L. Ching * @author Gonzalo Diethelm @@ -202,58 +202,6 @@ protected: friend class ACE_Vector_Iterator; }; -#if 0 -/* - * Not sure about including these functions, if for no other reason, - * because they polute the global namespace! - */ - -/** - * Compare two vectors in the range of [from_ndx..to_ndx]. This - * template function requires class T to have the bool operator!=() - * declared in the class. It is safe to define vectors of scalar data - * types, like int, double, etc., including class ACE_TString. - * - * @param v1 The first vector (out of the two) to be compared. - * @param v2 The Second vector (out of the two) to be compared. - * @param from_ndx Compare vector v1 and v2, starting with the - * "from_ndx" index . - * @param to_ndx Compare vector v1 and v2, from "from_ndx" to - * "to_ndx". - * @return Returns true if v1==v2 in the specified index range, - * returns false otherwise. Also, returns false in case if - * v1's size is not equal to v2's size. - */ -template -int compare (const ACE_Vector& v1, - const ACE_Vector& v2, - const size_t from_ndx, - const size_t to_ndx); - -/** - * Does a partial comparison of two vectors in the range of - * [from_ndx..to_ndx]. The only difference between this function and - * the template compare<T> function is that this function does - * not require v1 and v2 to be of equal size. - * - * @param v1 The first vector (out of the two) to be compared. - * @param v2 The Second vector (out of the two) to be compared. - * @param from_ndx Compare vector v1 and v2, starting with the - * "from_ndx" index . - * @param to_ndx Compare vector v1 and v2, from "from_ndx" to - * "to_ndx". - * @return Returns true if vector v1 and v2 are equal in the specified - * index range. - */ - -template -int partial_compare (const ACE_Vector& v1, - const ACE_Vector& v2, - const size_t from_ndx, - const size_t to_ndx); -#endif /* 0 */ -// **************************************************************** - /** * @class ACE_Vector_Iterator * diff --git a/dep/ACE_wrappers/ace/Version.h b/dep/ACE_wrappers/ace/Version.h index 2b8e277bb..835fc849f 100644 --- a/dep/ACE_wrappers/ace/Version.h +++ b/dep/ACE_wrappers/ace/Version.h @@ -1,9 +1,9 @@ // -*- C++ -*- -// $Id: Version.h 91613 2010-09-04 09:31:47Z johnnyw $ -// This is file was automatically generated by \$ACE_ROOT/bin/make_release. +// $Id: Version.h 92364 2010-10-27 10:02:39Z johnnyw $ +// This is file was automatically generated by \$ACE_ROOT/bin/make_release.py #define ACE_MAJOR_VERSION 5 #define ACE_MINOR_VERSION 8 -#define ACE_BETA_VERSION 2 -#define ACE_VERSION "5.8.2" +#define ACE_BETA_VERSION 3 +#define ACE_VERSION "5.8.3" diff --git a/dep/ACE_wrappers/ace/Versioned_Namespace.h b/dep/ACE_wrappers/ace/Versioned_Namespace.h index 542254876..211584134 100644 --- a/dep/ACE_wrappers/ace/Versioned_Namespace.h +++ b/dep/ACE_wrappers/ace/Versioned_Namespace.h @@ -4,7 +4,7 @@ /** * @file Versioned_Namespace.h * - * $Id$ + * $Id: Versioned_Namespace.h 92286 2010-10-20 18:22:07Z johnnyw $ * * Versioned namespace support. * diff --git a/dep/ACE_wrappers/ace/WIN32_Asynch_IO.h b/dep/ACE_wrappers/ace/WIN32_Asynch_IO.h index 34af77dab..2c8495a17 100644 --- a/dep/ACE_wrappers/ace/WIN32_Asynch_IO.h +++ b/dep/ACE_wrappers/ace/WIN32_Asynch_IO.h @@ -4,7 +4,7 @@ /** * @file WIN32_Asynch_IO.h * - * $Id: WIN32_Asynch_IO.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: WIN32_Asynch_IO.h 92298 2010-10-21 11:15:17Z johnnyw $ * * * These classes only works on Win32 platforms. @@ -111,10 +111,10 @@ public: /// Destructor. virtual ~ACE_WIN32_Asynch_Result (void); - /// Simulate error value to use in the post_completion () + /// Simulate error value to use in the post_completion() void set_error (u_long errcode); - /// Simulate value to use in the post_completion () + /// Simulate value to use in the post_completion() void set_bytes_transferred (size_t nbytes); protected: @@ -158,8 +158,8 @@ class ACE_Export ACE_WIN32_Asynch_Operation : public virtual ACE_Asynch_Operatio public: /** * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the @a handler to get the + * each asynchronous call. If (@a handle == ACE_INVALID_HANDLE), + * ACE_Handler::handle() will be called on the @a handler to get the * correct handle. */ int open (const ACE_Handler::Proxy_Ptr &handler_proxy, @@ -310,7 +310,7 @@ protected: * @brief This class is a factory for starting off asynchronous reads * on a stream. * - * Once is called, multiple asynchronous s can + * Once open() is called, multiple asynchronous read()s can * started using this class. An ACE_Asynch_Read_Stream::Result * will be passed back to the @a handler when the asynchronous * reads completes through the @@ -351,8 +351,8 @@ public: /** * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the @a handler to get the + * each asynchronous call. If (@a handle == ACE_INVALID_HANDLE), + * ACE_Handler::handle() will be called on the @a handler to get the * correct handle. */ int open (const ACE_Handler::Proxy_Ptr &handler_proxy, @@ -489,11 +489,11 @@ protected: * on a stream. * * - * Once is called, multiple asynchronous s can + * Once open() is called, multiple asynchronous s can * started using this class. A ACE_Asynch_Write_Stream::Result * will be passed back to the @a handler when the asynchronous * write completes through the - * callback. + * ACE_Handler::handle_write_stream() callback. */ class ACE_Export ACE_WIN32_Asynch_Write_Stream : public virtual ACE_Asynch_Write_Stream_Impl, public ACE_WIN32_Asynch_Operation @@ -530,8 +530,8 @@ public: /** * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the @a handler to get the + * each asynchronous call. If (@a handle == ACE_INVALID_HANDLE), + * ACE_Handler::handle() will be called on the @a handler to get the * correct handle. */ int open (const ACE_Handler::Proxy_Ptr &handler_proxy, diff --git a/dep/ACE_wrappers/ace/ace.mpc b/dep/ACE_wrappers/ace/ace.mpc index eba67d895..1425d2a81 100644 --- a/dep/ACE_wrappers/ace/ace.mpc +++ b/dep/ACE_wrappers/ace/ace.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- now wouldn't this be cool... -// $Id: ace.mpc 91579 2010-08-31 12:41:37Z johnnyw $ +// $Id: ace.mpc 91791 2010-09-16 09:29:32Z johnnyw $ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, uuid, filecache, versioned_namespace, pkgconfig, support_ostream { avoids = ace_for_tao @@ -348,7 +348,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, Stream_Modules.cpp String_Base.cpp Svc_Handler.cpp - Synch_T.cpp Refcountable_T.cpp TSS_T.cpp Task_Ex_T.cpp @@ -382,7 +381,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, Reverse_Lock_T.inl TSS_T.inl ace_wchar.inl - OS.inl } Header_Files { @@ -390,7 +388,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, recurse = 1 ACE_export.h - Array.h Bound_Ptr.h CE_Screen_Output.h Codeset_Symbols.h @@ -408,8 +405,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, Lock_Adapter_T.h Log_Priority.h Malloc_Base.h - Map.h - Method_Object.h Metrics_Cache.h Metrics_Cache_T.h Memory_Pool.h @@ -420,23 +415,17 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, Null_Mutex.h Null_Semaphore.h Numeric_Limits.h - OS.h - OS_Dirent.h OS_Memory.h OS_NS_macros.h - OS_String.h OS_Thread_Adapter.h Object_Manager_Base.h Obstack.h - Pair.h Proactor_Impl.h Reactor_Impl.h Reactor_Timer_Interface.h - Refcountable.h Refcounted_Auto_Ptr.h Reverse_Lock_T.h Select_Reactor.h - Service_Templates.h SOCK_Netlink.h SStringfwd.h Stack_Trace.h diff --git a/dep/ACE_wrappers/ace/ace.mwc b/dep/ACE_wrappers/ace/ace.mwc index 5c18480f4..c14f84667 100644 --- a/dep/ACE_wrappers/ace/ace.mwc +++ b/dep/ACE_wrappers/ace/ace.mwc @@ -1,18 +1,6 @@ // -*- MPC -*- -// -// $Id: ace.mwc 82426 2008-07-26 06:35:20Z johnnyw $ +// $Id: ace.mwc 91777 2010-09-15 09:42:34Z johnnyw $ workspace { - ace.mpc - ace_for_tao.mpc - ace_flreactor.mpc - ace_foxreactor.mpc - ace_qt3reactor.mpc - ace_qt4reactor.mpc - ace_tkreactor.mpc - ace_xtreactor.mpc - ETCL - Monitor_Control - QoS - SSL } + diff --git a/dep/ACE_wrappers/ace/ace_ce_dll.cfg b/dep/ACE_wrappers/ace/ace_ce_dll.cfg deleted file mode 100644 index 80c479b32..000000000 --- a/dep/ACE_wrappers/ace/ace_ce_dll.cfg +++ /dev/null @@ -1 +0,0 @@ -WCE_CFG=WCE200; \ No newline at end of file diff --git a/dep/ACE_wrappers/ace/ace_flreactor.mpc b/dep/ACE_wrappers/ace/ace_flreactor.mpc deleted file mode 100644 index 49d4c165f..000000000 --- a/dep/ACE_wrappers/ace/ace_flreactor.mpc +++ /dev/null @@ -1,32 +0,0 @@ -// -*- MPC -*- now wouldn't this be cool... -// $Id: ace_flreactor.mpc 90826 2010-06-24 09:07:33Z johnnyw $ - -project(ACE_FlReactor) : acedefaults, install, acelib, ace_output, ace_fl{ - - sharedname = ACE_FlReactor - dynamicflags += ACE_FLREACTOR_BUILD_DLL - - Source_Files { - FlReactor - } - - Header_Files { - FlReactor - } - - Inline_Files { - FlReactor - } - - Template_Files { - FlReactor - } - - Resource_Files { - FlReactor - } - - Pkgconfig_Files { - FlReactor/ACE_FlReactor.pc.in - } -} diff --git a/dep/ACE_wrappers/ace/ace_for_tao.mpc b/dep/ACE_wrappers/ace/ace_for_tao.mpc index 043c97428..dfba6a3ee 100644 --- a/dep/ACE_wrappers/ace/ace_for_tao.mpc +++ b/dep/ACE_wrappers/ace/ace_for_tao.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // -// $Id: ace_for_tao.mpc 90826 2010-06-24 09:07:33Z johnnyw $ +// $Id: ace_for_tao.mpc 92120 2010-10-01 12:00:01Z johnnyw $ // The ACE_FOR_TAO subset is designed primarily for use with the // TAO CosNotification service. It is not intended to be used @@ -262,7 +262,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, Stream_Modules.cpp String_Base.cpp Svc_Handler.cpp - Synch_T.cpp TSS_T.cpp Task_Ex_T.cpp Task_T.cpp @@ -287,9 +286,7 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, Guard_T.inl Handle_Gobbler.inl Lock_Adapter_T.inl - OS.inl OS_Memory.inl - OS_String.inl Refcounted_Auto_Ptr.inl Reverse_Lock_T.inl TSS_T.inl @@ -300,7 +297,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, Header_Files { ACE_export.h - Array.h Based_Pointer_Repository.h Bound_Ptr.h CORBA_macros.h @@ -324,16 +320,12 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, Null_Mutex.h Null_Semaphore.h Numeric_Limits.h - OS.h - OS_Dirent.h OS_Memory.h OS_NS_macros.h - OS_String.h OS_Thread_Adapter.h Object_Manager_Base.h Process.h Process_Manager.h - Pair.h Reactor_Impl.h Reactor_Timer_Interface.h Refcounted_Auto_Ptr.h @@ -361,8 +353,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, config-minimal.h config-win32-borland.h config-win32-common.h - config-win32-ghs.h - config-win32-msvc-6.h config-win32-msvc-7.h config-win32-msvc.h config-win32.h diff --git a/dep/ACE_wrappers/ace/ace_foxreactor.mpc b/dep/ACE_wrappers/ace/ace_foxreactor.mpc deleted file mode 100644 index 3c3596d19..000000000 --- a/dep/ACE_wrappers/ace/ace_foxreactor.mpc +++ /dev/null @@ -1,32 +0,0 @@ -// -*- MPC -*- now wouldn't this be cool... -// $Id: ace_foxreactor.mpc 90826 2010-06-24 09:07:33Z johnnyw $ - -project(ACE_FoxReactor) : acedefaults, install, acelib, ace_output, ace_fox { - - sharedname = ACE_FoxReactor - dynamicflags += ACE_FOXREACTOR_BUILD_DLL - - Source_Files { - FoxReactor - } - - Header_Files { - FoxReactor - } - - Inline_Files { - FoxReactor - } - - Template_Files { - FoxReactor - } - - Resource_Files { - FoxReactor - } - - Pkgconfig_Files { - FoxReactor/ACE_FoxReactor.pc.in - } -} diff --git a/dep/ACE_wrappers/ace/ace_qt3reactor.mpc b/dep/ACE_wrappers/ace/ace_qt3reactor.mpc deleted file mode 100644 index 82653815b..000000000 --- a/dep/ACE_wrappers/ace/ace_qt3reactor.mpc +++ /dev/null @@ -1,43 +0,0 @@ -// -*- MPC -*- now wouldn't this be cool... -// $Id: ace_qt3reactor.mpc 90826 2010-06-24 09:07:33Z johnnyw $ - -project(ACE_Qt3Reactor_moc) : acedefaults, ace_qt3 { - custom_only = 1 - MOC_Files { - QtReactor/QtReactor.h - } -} - -project(ACE_Qt3Reactor) : acedefaults, install, acelib, ace_output, ace_qt3 { - after += ACE_Qt3Reactor_moc - sharedname = ACE_QtReactor - dynamicflags += ACE_QTREACTOR_BUILD_DLL - - MOC_Files { - } - - Source_Files { - QtReactor/QtReactor_moc.cpp - QtReactor/QtReactor.cpp - } - - Header_Files { - QtReactor - } - - Inline_Files { - QtReactor - } - - Template_Files { - QtReactor - } - - Resource_Files { - QtReactor - } - - Pkgconfig_Files { - QtReactor/ACE_QtReactor.pc.in - } -} diff --git a/dep/ACE_wrappers/ace/ace_qt4reactor.mpc b/dep/ACE_wrappers/ace/ace_qt4reactor.mpc deleted file mode 100644 index 9293c374b..000000000 --- a/dep/ACE_wrappers/ace/ace_qt4reactor.mpc +++ /dev/null @@ -1,43 +0,0 @@ -// -*- MPC -*- now wouldn't this be cool... -// $Id: ace_qt4reactor.mpc 90826 2010-06-24 09:07:33Z johnnyw $ - -project(ACE_Qt4Reactor_moc) : acedefaults, ace_qt4 { - custom_only = 1 - MOC_Files { - QtReactor/QtReactor.h - } -} - -project(ACE_Qt4Reactor) : acedefaults, install, acelib, ace_output, ace_qt4 { - after += ACE_Qt4Reactor_moc - sharedname = ACE_QtReactor - dynamicflags += ACE_QTREACTOR_BUILD_DLL - - MOC_Files { - } - - Source_Files { - QtReactor/QtReactor_moc.cpp - QtReactor/QtReactor.cpp - } - - Header_Files { - QtReactor - } - - Inline_Files { - QtReactor - } - - Template_Files { - QtReactor - } - - Resource_Files { - QtReactor - } - - Pkgconfig_Files { - QtReactor/ACE_QtReactor.pc.in - } -} diff --git a/dep/ACE_wrappers/ace/ace_tkreactor.mpc b/dep/ACE_wrappers/ace/ace_tkreactor.mpc deleted file mode 100644 index 88dc6ec98..000000000 --- a/dep/ACE_wrappers/ace/ace_tkreactor.mpc +++ /dev/null @@ -1,32 +0,0 @@ -// -*- MPC -*- now wouldn't this be cool... -// $Id: ace_tkreactor.mpc 90826 2010-06-24 09:07:33Z johnnyw $ - -project(ACE_TkReactor) : acedefaults, install, acelib, ace_output, ace_tk { - - sharedname = ACE_TkReactor - dynamicflags += ACE_TKREACTOR_BUILD_DLL - - Source_Files { - TkReactor - } - - Header_Files { - TkReactor - } - - Inline_Files { - TkReactor - } - - Template_Files { - TkReactor - } - - Resource_Files { - TkReactor - } - - Pkgconfig_Files { - TkReactor/ACE_TkReactor.pc.in - } -} diff --git a/dep/ACE_wrappers/ace/ace_wchar.h b/dep/ACE_wrappers/ace/ace_wchar.h index 41f1184d6..77db8f838 100644 --- a/dep/ACE_wrappers/ace/ace_wchar.h +++ b/dep/ACE_wrappers/ace/ace_wchar.h @@ -4,7 +4,7 @@ /** * @file ace_wchar.h * - * $Id: ace_wchar.h 91285 2010-08-05 08:29:30Z johnnyw $ + * $Id: ace_wchar.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Darrell Brunsch */ @@ -19,38 +19,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// These macros have been deprecated and should be replaced by their -// ACE_TEXT_* equivalents. These macros are just hacks and may not -// completely provide the old functionality. -#if defined (ACE_LEGACY_MODE) -// Convert the old unicode indicators -# if defined (ACE_HAS_MOSTLY_UNICODE_APIS) -# define ACE_USES_WCHAR -# endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ -# if defined (ACE_HAS_UNICODE) -# define ACE_HAS_WCHAR -# endif /* ACE_HAS_UNICODE */ - -// These are defined to get older stuff to compile -// FUZZ: disable check_for_tchar -# define ASYS_TCHAR ACE_TCHAR -# define ASYS_TEXT ACE_TEXT -# define ASYS_ONLY_MULTIBYTE_STRING ACE_TEXT_ALWAYS_CHAR -# define ASYS_MULTIBYTE_STRING ACE_TEXT_CHAR_TO_TCHAR -# define ASYS_WIDE_STRING ACE_TEXT_CHAR_TO_TCHAR -# define ACE_WIDE_STRING ACE_TEXT_CHAR_TO_TCHAR - -# if defined (ACE_USES_WCHAR) -# define ASYS_ONLY_WIDE_STRING(STRING) STRING -# else /* ACE_USES_WCHAR */ -# define ASYS_ONLY_WIDE_STRING(STRING) \ - ACE_Ascii_To_Wide (STRING).wchar_rep () -# endif /* ACE_USES_WCHAR */ - -# define ACE_TEXT_STRING ACE_TString - -#endif /* ACE_LEGACY_MODE */ - #if defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) # if !defined (ACE_HAS_WCHAR) # define ACE_HAS_WCHAR @@ -244,11 +212,6 @@ private: ACE_Ascii_To_Wide operator= (ACE_Ascii_To_Wide &); }; -#if defined (ACE_LEGACY_MODE) -typedef ACE_Ascii_To_Wide ACE_OS_CString; -typedef ACE_Wide_To_Ascii ACE_OS_WString; -#endif /* ACE_LEGACY_MODE */ - ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_WCHAR */ diff --git a/dep/ACE_wrappers/ace/ace_xtreactor.mpc b/dep/ACE_wrappers/ace/ace_xtreactor.mpc deleted file mode 100644 index 5a82963ea..000000000 --- a/dep/ACE_wrappers/ace/ace_xtreactor.mpc +++ /dev/null @@ -1,32 +0,0 @@ -// -*- MPC -*- now wouldn't this be cool... -// $Id: ace_xtreactor.mpc 90826 2010-06-24 09:07:33Z johnnyw $ - -project(ACE_XtReactor) : acedefaults, install, acelib, ace_output, ace_xt { - - sharedname = ACE_XtReactor - dynamicflags += ACE_XTREACTOR_BUILD_DLL - - Source_Files { - XtReactor - } - - Header_Files { - XtReactor - } - - Inline_Files { - XtReactor - } - - Template_Files { - XtReactor - } - - Resource_Files { - XtReactor - } - - Pkgconfig_Files { - XtReactor/ACE_XtReactor.pc.in - } -} diff --git a/dep/ACE_wrappers/ace/config-aix-5.x.h b/dep/ACE_wrappers/ace/config-aix-5.x.h index d524e9530..3e2120595 100644 --- a/dep/ACE_wrappers/ace/config-aix-5.x.h +++ b/dep/ACE_wrappers/ace/config-aix-5.x.h @@ -1,4 +1,4 @@ -// $Id: config-aix-5.x.h 87268 2009-10-29 21:06:06Z olli $ +// $Id: config-aix-5.x.h 91685 2010-09-09 09:35:14Z johnnyw $ // // Config file for AIX 5.1 and higher. @@ -78,7 +78,6 @@ # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# define ACE_HAS_TEMPLATE_TYPEDEFS # define ACE_HAS_CUSTOM_EXPORT_MACROS # define ACE_Proper_Export_Flag # define ACE_Proper_Import_Flag diff --git a/dep/ACE_wrappers/ace/config-cray.h b/dep/ACE_wrappers/ace/config-cray.h deleted file mode 100644 index 1b9448761..000000000 --- a/dep/ACE_wrappers/ace/config-cray.h +++ /dev/null @@ -1,205 +0,0 @@ -/* -*- C++ -*- */ -// $Id: config-cray.h 87169 2009-10-19 20:26:55Z olli $ - -#ifndef ACE_CONFIG_CRAY_H -#define ACE_CONFIG_CRAY_H -#include /**/ "ace/pre.h" - -/* - The following predefined macros are used within ACE ifdefs. - These are defined when using the Cray compilers. _CRAYMPP - is defined, for example, if you are running on a Cray T3E - massively parallel machine. Moreover, in the case of the T3E, - _CRAYT3E will be defined. This is used to determine the - ACE_SIZEOF defines for primitive types. - - _UNICOS is defined as either the major version of UNICOS being run, - e.g. 9 or 10 on the vector machines (e.g. C90, T90, J90, YMP, ...) - or the major+minor+level UNICOS/mk version, e.g. 2.0.3 => 203, - being run on an MPP machine. - - Summary: - - _CRAYMPP (defined only if running on MPP machine, e.g. T3E, UNICOS/mk) - _CRAYT3E (defined specifically if compiling on a Cray T3E) - _UNICOS (defined if running UNICOS or UNICOS/mk) - - Tested on UNICOS 10.0.0.5, UNICOS/mk 2.0.4.57 - Compiles on UNICOS 9.0.2.8, but some tests deadlock - - Contributed by Doug Anderson -*/ - -#if defined (_UNICOS) && !defined (MAXPATHLEN) -#define MAXPATHLEN 1023 -#endif /* _UNICOS */ - -#define ACE_DEFAULT_CLOSE_ALL_HANDLES 0 - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -#define ACE_HAS_CPLUSPLUS_HEADERS - -#define ACE_HAS_SSIZE_T - -#define ACE_HAS_SYSV_IPC - -#define ACE_MT_SAFE 1 - -#define ACE_HAS_THREADS - -#define ACE_HAS_PTHREADS - -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -#define ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP - -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -#define ACE_HAS_POSIX_TIME - -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY - -#define ACE_HAS_POSIX_NONBLOCK - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -#define ACE_HAS_DIRENT - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_IP_MULTICAST - -#define ACE_HAS_SOCKADDR_IN_SIN_LEN - -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -#define ACE_HAS_NONCONST_READLINK - -#define ACE_HAS_CHARPTR_SOCKOPT - -#define ACE_HAS_NONCONST_GETBY -#define ACE_HAS_NONCONST_INET_ADDR - -// has man pages, but links with missing symbols and I can't find lib yet -/* #define ACE_HAS_REGEX */ - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -#if _UNICOS > 9 -# define ACE_HAS_SIGWAIT -#endif - -#define ACE_HAS_SIG_ATOMIC_T - -#define ACE_HAS_SIGISMEMBER_BUG - -#define ACE_HAS_MSG - -#define ACE_HAS_GPERF - -// Special modifications that apply to UNICOS/mk -#if defined(_CRAYMPP) - -# define ACE_HAS_SIGINFO_T -# define ACE_HAS_UCONTEXT_T - -#endif - -// The Cray T90 supposedly supports SYSV SHMEM, but I was unable to get it -// working. Of course, all other Cray PVP and MPP systems do NOT support it, -// so it's probably good to just define like this for consistency -#define ACE_LACKS_SYSV_SHMEM -#define ACE_LACKS_MMAP -#define ACE_LACKS_CONST_TIMESPEC_PTR -#define ACE_LACKS_SYSCALL -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_MADVISE -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_PTHREAD_CLEANUP -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_THREAD_PROCESS_SCOPING - -#if !defined(_CRAYMPP) - -#define ACE_LACKS_PTHREAD_CANCEL -#define ACE_LACKS_PTHREAD_KILL - -#endif - -#define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_PRI_T -#define ACE_LACKS_GETPGID -#define ACE_LACKS_SETPGID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREUID -#define ACE_LACKS_MPROTECT -#define ACE_LACKS_MSYNC -#define ACE_LACKS_READV -#define ACE_LACKS_RLIMIT - -// we probably want to fake not having this, since Cray memory mgmt is different -#define ACE_LACKS_SBRK - -#define ACE_LACKS_SETSCHED - -#define ACE_LACKS_SIGINFO_H - -#define ACE_LACKS_TIMESPEC_T - -#define ACE_LACKS_WRITEV - -// Cray vector machines are "word" oriented, and modern ones are hard 64-bit. -// "char" is somewhat of a special case. Most problems arise when code thinks -// it can address 32-bit quantities and the like. MPP crays are typically -// byte oriented, e.g. T3E uses Alpha processors, so we don't need as much -// special treatment. - -#ifndef _CRAYMPP - -# define ACE_SIZEOF_CHAR 1 -# define ACE_SIZEOF_SHORT 8 -# define ACE_SIZEOF_INT 8 -# define ACE_SIZEOF_LONG 8 -# define ACE_SIZEOF_LONG_LONG 8 -# define ACE_SIZEOF_FLOAT 8 -# define ACE_SIZEOF_DOUBLE 8 -# define ACE_SIZEOF_LONG_DOUBLE 16 -# define ACE_SIZEOF_VOID_P 8 - -#elif defined(_CRAYT3E) - -# define ACE_SIZEOF_CHAR 1 -# define ACE_SIZEOF_SHORT 4 -# define ACE_SIZEOF_INT 8 -# define ACE_SIZEOF_LONG 8 -# define ACE_SIZEOF_LONG_LONG 8 -# define ACE_SIZEOF_FLOAT 4 -# define ACE_SIZEOF_DOUBLE 8 -# define ACE_SIZEOF_LONG_DOUBLE 8 -# define ACE_SIZEOF_VOID_P 8 - -#endif - -// Ones to check out at some point - -// C++ Compiler stuff to verify -/* #define ACE_NEW_THROWS_EXCEPTIONS */ -/* #define ACE_HAS_TEMPLATE_TYPEDEFS */ - -// thread issues to check out -/* #define ACE_LACKS_TIMEDWAIT_PROTOTYPES */ - -// Cray does seem to support it, in -lnsl and has tiuser.h header -/* #define ACE_HAS_TLI */ -/* #define ACE_HAS_TIUSER_H */ -/* #define ACE_HAS_TLI_PROTOTYPES */ - -/* #define ACE_LACKS_NAMED_POSIX_SEM */ - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_CRAY_H */ diff --git a/dep/ACE_wrappers/ace/config-cxx-common.h b/dep/ACE_wrappers/ace/config-cxx-common.h deleted file mode 100644 index e50cf38ec..000000000 --- a/dep/ACE_wrappers/ace/config-cxx-common.h +++ /dev/null @@ -1,84 +0,0 @@ -// -*- C++ -*- -// -// $Id: config-cxx-common.h 91285 2010-08-05 08:29:30Z johnnyw $ - -#ifndef ACE_CXX_COMMON_H -#define ACE_CXX_COMMON_H -#include /**/ "ace/pre.h" - -#if !defined (ACE_CONFIG_INCLUDE_CXX_COMMON) -# error ace/config-cxx-common.h: ACE configuration error! Do not #include this file directly! -#endif - -#if defined (__DECCXX) -# if !defined (linux) -# define ACE_HAS_STRING_CLASS -# if (__DECCXX_VER >= 60090010) -# define ACE_HAS_STDCPP_STL_INCLUDES -# endif /* __DECCXX_VER < 60090010 */ -# endif /* ! linux */ - -# define DEC_CXX -# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR -# define ACE_LACKS_LINEBUFFERED_STREAMBUF -# define ACE_LACKS_SIGNED_CHAR -# define ACE_HAS_CPLUSPLUS_HEADERS -# define ACE_TEMPLATES_REQUIRE_SOURCE -# if (__DECCXX_VER >= 60090010) - // DEC CXX 6.0 supports exceptions, etc., by default. Exceptions - // are enabled by platform_osf1_4.x.GNU/wrapper_macros.GNU. -# define ACE_NEW_THROWS_EXCEPTIONS -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_HAS_TEMPLATE_TYPEDEFS - -# define ACE_ENDLESS_LOOP \ - unsigned int ace_endless_loop____ = 0; if (ace_endless_loop____) break; - -# if defined (__USE_STD_IOSTREAM) -# define ACE_LACKS_CHAR_RIGHT_SHIFTS -# define ACE_LACKS_IOSTREAM_FX -# define ACE_LACKS_UNBUFFERED_STREAMBUF -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# else /* ! __USE_STD_IOSTREAM */ -# define ACE_USES_OLD_IOSTREAMS -# endif /* ! __USE_STD_IOSTREAM */ - -// 9: nested comment not allowed. (/usr/include/pdsc.h!) (nestcomment) -// 177: variable was declared but never referenced (declbutnotref) -// 193: zero used for undefined preprocessing identifier (undpreid) -// 236: controlling expression is constant (boolexprconst) -// 401: base_class_with_nonvirtual_dtor (basclsnondto) -// 1016: expected type is incompatible with declared type of int (incint) -// 1136: conversion to smaller size integer could lose data (intconlosbit) - -# pragma message disable basclsnondto -# pragma message disable boolexprconst -# pragma message disable undpreid -# pragma message disable notusetmpfunprm -# pragma message disable bltinclnk - -# if (__DECCXX_VER >= 60190029) - // 6.1-029 and later support msg 1136. Disable it because it - // causes warnings from ACE and/or TAO. -# pragma message disable intconlosbit -# endif /* __DECCXX_VER >= 60190029 */ - -# if (__DECCXX_VER == 60190027) - // Seems that this version of cxx doesn't have reset -# define ACE_AUTO_PTR_LACKS_RESET -# endif /* __DECCXX_VER == 60190027 */ - -# if defined (DIGITAL_UNIX) && DIGITAL_UNIX >= 0x40D - // variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced -# pragma message disable declbutnotref -# endif /* DIGITAL_UNIX >= 4.0f */ - -# else /* __DECCXX_VER < 60090010 */ -# define ACE_LACKS_PRAGMA_ONCE -# endif /* __DECCXX_VER < 60090010 */ -#else /* ! __DECCXX */ -# error ace/config-cxx-common.h can only be used with Compaq CXX! -#endif /* ! __DECCXX */ - -#include /**/ "ace/post.h" -#endif /* ACE_CXX_COMMON_H */ diff --git a/dep/ACE_wrappers/ace/config-doxygen.h b/dep/ACE_wrappers/ace/config-doxygen.h index 53fdec777..5664338e3 100644 --- a/dep/ACE_wrappers/ace/config-doxygen.h +++ b/dep/ACE_wrappers/ace/config-doxygen.h @@ -6,7 +6,7 @@ * * @file config-doxygen.h * - * $Id: config-doxygen.h 91285 2010-08-05 08:29:30Z johnnyw $ + * $Id: config-doxygen.h 91685 2010-09-09 09:35:14Z johnnyw $ * * @author Carlos O'Ryan * @author Darrell Brunsch @@ -90,18 +90,12 @@ /// Generate ACE_Dev_Poll_Reactor documentation #define ACE_HAS_DEV_POLL -/// Generate ACE_Event_Handler_T documentation -#define ACE_HAS_TEMPLATE_TYPEDEFS - /// Generate ACE_Log_Msg_NT_Event_Log documentation #define ACE_HAS_LOG_MSG_NT_EVENT_LOG /// Generate icmp documentation #define ACE_HAS_ICMP_SUPPORT 1 -/// Don't expand ACE_RCSID macro -#define ACE_USE_RCSID 0 - /// Parse some ACE_SSL classes that depend on recent versions of /// OpenSSL. #define OPENSSL_VERSION_NUMBER 0x00905820L diff --git a/dep/ACE_wrappers/ace/config-g++-common.h b/dep/ACE_wrappers/ace/config-g++-common.h index 464f30eab..4146b5c21 100644 --- a/dep/ACE_wrappers/ace/config-g++-common.h +++ b/dep/ACE_wrappers/ace/config-g++-common.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: config-g++-common.h 91338 2010-08-11 13:47:26Z johnnyw $ +// $Id: config-g++-common.h 92120 2010-10-01 12:00:01Z johnnyw $ // This configuration file is designed to be included by another, // specific configuration file. It provides config information common @@ -10,9 +10,15 @@ #define ACE_GNUG_COMMON_H #include /**/ "ace/pre.h" +#if !defined (ACE_CC_NAME) +# define ACE_CC_NAME ACE_TEXT ("g++") +#endif +#define ACE_CC_MAJOR_VERSION __GNUC__ +#define ACE_CC_MINOR_VERSION __GNUC_MINOR__ +#define ACE_CC_BETA_VERSION (0) + #define ACE_HAS_CPLUSPLUS_HEADERS #define ACE_HAS_STDCPP_STL_INCLUDES -#define ACE_HAS_TEMPLATE_TYPEDEFS #define ACE_HAS_STANDARD_CPP_LIBRARY 1 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 @@ -162,13 +168,5 @@ #endif #endif /* ACE_HAS_THREADS */ -#if defined (ACE_HAS_GNU_REPO) - // -frepo causes unresolved symbols of basic_string left- and - // right-shift operators with ACE_HAS_STRING_CLASS. -# if defined (ACE_HAS_STRING_CLASS) -# undef ACE_HAS_STRING_CLASS -# endif /* ACE_HAS_STRING_CLASS */ -#endif /* ! ACE_HAS_GNU_REPO */ - #include /**/ "ace/post.h" #endif /* ACE_GNUG_COMMON_H */ diff --git a/dep/ACE_wrappers/ace/config-hpux-11.00.h b/dep/ACE_wrappers/ace/config-hpux-11.00.h index d2797a32e..978a85a8e 100644 --- a/dep/ACE_wrappers/ace/config-hpux-11.00.h +++ b/dep/ACE_wrappers/ace/config-hpux-11.00.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-hpux-11.00.h 91285 2010-08-05 08:29:30Z johnnyw $ +// $Id: config-hpux-11.00.h 92102 2010-09-30 08:14:15Z johnnyw $ // The following configuration file is designed to work for HP // platforms running HP-UX 11.00 using aC++ or gcc (2.95 and up). @@ -24,9 +24,7 @@ // aC++... // Precompiler needs extra flags to ignore "invalid #pragma directive" -# ifndef ACE_USING_MCPP_PREPROCESSOR -# define ACE_CC_PREPROCESSOR_ARGS "-E +W 67" -# endif +# define ACE_CC_PREPROCESSOR_ARGS "-E +W 67" // If the -AA compile option is used, the compiler defines _HP_NAMESPACE_STD. // The -AA option enables the 2.0 standard C++ library. If not used, then @@ -51,10 +49,6 @@ # define ACE_LACKS_NUMERIC_LIMITS # endif /* _HP_NAMESPACE_STD */ -// Compiler implements templates that support typedefs inside of classes -// used as formal arguments to a template class. -# define ACE_HAS_TEMPLATE_TYPEDEFS - # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR // Platform lacks streambuf "linebuffered ()". diff --git a/dep/ACE_wrappers/ace/config-icc-common.h b/dep/ACE_wrappers/ace/config-icc-common.h index 13a6c9216..d55447f70 100644 --- a/dep/ACE_wrappers/ace/config-icc-common.h +++ b/dep/ACE_wrappers/ace/config-icc-common.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: config-icc-common.h 91285 2010-08-05 08:29:30Z johnnyw $ +// $Id: config-icc-common.h 91685 2010-09-09 09:35:14Z johnnyw $ #ifndef ACE_LINUX_ICC_COMMON_H #define ACE_LINUX_ICC_COMMON_H @@ -8,7 +8,6 @@ # define ACE_HAS_CPLUSPLUS_HEADERS # define ACE_HAS_STDCPP_STL_INCLUDES -# define ACE_HAS_TEMPLATE_TYPEDEFS # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 diff --git a/dep/ACE_wrappers/ace/config-integritySCA.h b/dep/ACE_wrappers/ace/config-integritySCA.h index 960086eff..19362257a 100644 --- a/dep/ACE_wrappers/ace/config-integritySCA.h +++ b/dep/ACE_wrappers/ace/config-integritySCA.h @@ -8,7 +8,7 @@ * Integrity RTOS with SCA from Green Hills Software * http://www.ghs.com/products/rtos/integrity.html * - * $Id: config-integritySCA.h 91285 2010-08-05 08:29:30Z johnnyw $ + * $Id: config-integritySCA.h 92181 2010-10-08 07:52:54Z olli $ */ #define ghs @@ -29,7 +29,6 @@ #define ACE_NEW_THROWS_EXCEPTIONS #define ACE_HAS_STANDARD_CPP_LIBRARY 1 #define ACE_TEMPLATES_REQUIRE_SOURCE 1 -#define ACE_HAS_TEMPLATE_TYPEDEFS #define TAO_USE_SEQUENCE_TEMPLATES #define ACE_NEEDS_FUNC_DEFINITIONS #define _REENTRANT @@ -106,7 +105,6 @@ #define ACE_LACKS_MSYNC #define ACE_LACKS_PID_STUFF #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_IPC_H #define ACE_LACKS_SETGID #define ACE_LACKS_PIPE #define ACE_LACKS_SYS_PARAM_H @@ -186,7 +184,6 @@ extern "C" #define ACE_LACKS_GETPPID #define NSIG (SIGRTMAX+1) #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -#define ACE_USE_RCSID 0 #define ACE_LACKS_CUSERID #define ACE_NEEDS_HUGE_THREAD_STACKSIZE 0x5000 #define fileno(file) ((file)->io_channel) //Hack to get Svc_Conf_l.cpp compiled diff --git a/dep/ACE_wrappers/ace/config-irix6.5.x-sgic++.h b/dep/ACE_wrappers/ace/config-irix6.5.x-sgic++.h deleted file mode 100644 index 2d501010b..000000000 --- a/dep/ACE_wrappers/ace/config-irix6.5.x-sgic++.h +++ /dev/null @@ -1,18 +0,0 @@ -// -*- C++ -*- -// $Id: config-irix6.5.x-sgic++.h 80826 2008-03-04 14:51:23Z wotte $ - -// Use this file for IRIX 6.5.x - -#ifndef ACE_CONFIG_IRIX65X_H -#define ACE_CONFIG_IRIX65X_H -#include /**/ "ace/pre.h" - -// Include IRIX 6.[234] configuration -#include "ace/config-irix6.x-sgic++.h" - -// Irix 6.5 man pages show that they exist -#undef ACE_LACKS_CONDATTR_PSHARED -#undef ACE_LACKS_MUTEXATTR_PSHARED - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_IRIX65X_H */ diff --git a/dep/ACE_wrappers/ace/config-irix6.x-common.h b/dep/ACE_wrappers/ace/config-irix6.x-common.h deleted file mode 100644 index 1de756d53..000000000 --- a/dep/ACE_wrappers/ace/config-irix6.x-common.h +++ /dev/null @@ -1,254 +0,0 @@ -/* -*- C++ -*- */ -// -// $Id: config-irix6.x-common.h 87167 2009-10-19 19:33:53Z olli $ -// -// This file contains the common configuration options for both -// SGI/MIPSPro C++ and g++ under IRIX 6.X -// -// For IRIX 6.2 there are several patches that should be applied to -// get reliable operation with multi-threading and exceptions. -// Specifically you should get a reasonable current IRIX, Compiler -// and POSIX patch-sets. - -// For IRIX 6.[34] it's less critical, but it's still recommended -// that you apply the applicable patch-sets (IRIX and Compiler I believe). - -// These patches are updated frequently, so you should ask your support -// contact or search SGI's web site (http://www.sgi.com) for the latest -// version. - -// Use this file for IRIX 6.[234] if you have the pthreads patches -// installed. - -#ifndef ACE_CONFIG_IRIX6X_COMMON_H - -#ifndef IRIX6 -# define IRIX6 -#endif - -#if ! defined(ACE_CONFIG_H) -#error "This file may only be included by config-irix6.x-sgic++.h, config-irix6.x-kcc.h or config-irix6.x-g++.h" -#endif - -// The Irix 6.x float.h doesn't allow us to distinguish between a -// double and a long double. So, we have to hard-code this. Thanks -// to Bob Laferriere for figuring it out. -#if defined (_MIPS_SIM) /* 6.X System */ -# include -# if defined (__GNUC__) -# define ACE_SIZEOF_LONG_DOUBLE 16 -# elif defined (_MIPS_SIM_NABI32) && (_MIPS_SIM == _MIPS_SIM_NABI32) -# define ACE_SIZEOF_LONG_DOUBLE 16 -# elif defined (_MIPS_SIM_ABI32) && (_MIPS_SIM == _MIPS_SIM_ABI32) -# define ACE_SIZEOF_LONG_DOUBLE 8 -# elif defined (_MIPS_SIM_ABI64) && (_MIPS_SIM == _MIPS_SIM_ABI64) -# define ACE_SIZEOF_LONG_DOUBLE 16 -# elif !defined (ACE_SIZEOF_LONG_DOUBLE) -# define ACE_SIZEOF_LONG_DOUBLE 8 -# endif -#else -# define ACE_SIZEOF_LONG_DOUBLE 8 /* 5.3 System */ -#endif - -// petern, Next part of it: - -// Platform supports getpagesize() call. -#define ACE_HAS_GETPAGESIZE - -// Platform has no implementation of pthread_condattr_setpshared(), -// even though it supports pthreads! (like Irix 6.2) -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_MUTEXATTR_PSHARED - -#define ACE_LACKS_SUSECONDS_T - -// Platform/compiler has the sigwait(2) prototype -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIGTIMEDWAIT -#define ACE_HAS_SIGSUSPEND - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Platform requires void * for mmap(). -#define ACE_HAS_VOIDPTR_MMAP - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYS_SYSCALL_H - -// Compiler/platform supports alloca() -// Although ACE does have alloca() on this compiler/platform combination, it is -// disabled by default since it can be dangerous. Uncomment the following line -// if you ACE to use it. -//#define ACE_HAS_ALLOCA - -// Compiler/platform has -#define ACE_HAS_ALLOCA_H - -// Irix needs to define bzero() in this odd file -#define ACE_HAS_BSTRING - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Platform contains . -#define ACE_HAS_POLL - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST -#ifdef ACE_LACKS_PERFECT_MULTICAST_FILTERING - #undef ACE_LACKS_PERFECT_MULTICAST_FILTERING -#endif -#define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 - -//************************************************************** -// Not so sure how next lines should look like - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -//************************************************************** - -// IRIX 6.4 and below do not support reentrant netdb functions -// (getprotobyname_r, getprotobynumber_r, gethostbyaddr_r, -// gethostbyname_r, getservbyname_r). -#if (ACE_IRIX_VERS <= 64) && !defined (ACE_HAS_NETDB_REENTRANT_FUNCTIONS) -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#endif /* ACE_HAS_NETDB_REENTRANT_FUNCTIONS */ - -#define ACE_HAS_DIRENT -// Unless the thread enabled version is used the readdir_r interface -// does not get defined in IRIX 6.2 -#define ACE_LACKS_READDIR_R -#define ACE_LACKS_RWLOCK_T - -#define ACE_HAS_GPERF - -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_BROKEN_DGRAM_SENDV - -#define ACE_LACKS_PLACEMENT_OPERATOR_DELETE -#define ACE_PI_CONTROL_BLOCK_ALIGN_LONGS 2 - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -// IRIX 6.5 supports AIO -#define ACE_HAS_AIO_CALLS -#define ACE_POSIX_AIOCB_PROACTOR -#define ACE_HAS_SGIDLADD -#define ACE_HAS_P_READ_WRITE -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_STDINT_H -#define ACE_HAS_SYSENT_H -#define ACE_HAS_SYSV_SYSINFO -#define ACE_HAS_SYS_SYSTEMINFO_H - -// Platform has support for multi-byte character support compliant -// with the XPG4 Worldwide Portability Interface wide-character -// classification. -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -// We need to setup a very high address or Naming_Test won't run. -#define ACE_DEFAULT_BASE_ADDR ((char *) (1024U * 1024 * 1024)) - -#define ACE_LACKS_SIGNED_CHAR - -// Platform supports reentrant functions (i.e., all the POSIX *_r -// functions). -#define ACE_HAS_REENTRANT_FUNCTIONS - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform does not support reentrant password file accessor functiions. -#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS - -// uses ctime_r & asctime_r with only two parameters vs. three -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -#define ACE_HAS_UALARM - -// Scheduling functions are declared in -#define ACE_NEEDS_SCHED_H - -// Compile using multi-thread libraries by default -#if !defined (ACE_MT_SAFE) - #define ACE_MT_SAFE 1 -#endif /* ACE_MT_SAFE */ - -#if (ACE_MT_SAFE != 0) - -// Add threading support - -#define ACE_HAS_IRIX62_THREADS - -// Needed for the threading stuff? -#include /**/ -#define PTHREAD_MIN_PRIORITY PX_PRIO_MIN -#define PTHREAD_MAX_PRIORITY PX_PRIO_MAX - -// ACE supports threads. -#define ACE_HAS_THREADS - -// Platform has no implementation of pthread_condattr_setpshared(), -// even though it supports pthreads! (like Irix 6.2) -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_MUTEXATTR_PSHARED - -// IRIX 6.2 supports a variant of POSIX Pthreads, supposedly POSIX 1c -#define ACE_HAS_PTHREADS - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// The pthread_cond_timedwait call does not reset the timer. -#define ACE_LACKS_COND_TIMEDWAIT_RESET 1 - -// When threads are enabled READDIR_R is supported on IRIX. -#undef ACE_LACKS_READDIR_R - -#endif /* (ACE_MT_SAFE == 0) */ - - -#endif /* ACE_CONFIG_IRIX6X_COMMON_H */ diff --git a/dep/ACE_wrappers/ace/config-irix6.x-g++.h b/dep/ACE_wrappers/ace/config-irix6.x-g++.h deleted file mode 100644 index 94c79119a..000000000 --- a/dep/ACE_wrappers/ace/config-irix6.x-g++.h +++ /dev/null @@ -1,15 +0,0 @@ -/* -*- C++ -*- */ -// $Id: config-irix6.x-g++.h 87268 2009-10-29 21:06:06Z olli $ - -// The following configuration file is designed to work for the SGI -// Indigo2EX running Irix 6.2 platform using the GNU C++ Compiler - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#include "ace/config-g++-common.h" -#include "ace/config-irix6.x-common.h" - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/dep/ACE_wrappers/ace/config-irix6.x-sgic++.h b/dep/ACE_wrappers/ace/config-irix6.x-sgic++.h deleted file mode 100644 index 8bba07ac6..000000000 --- a/dep/ACE_wrappers/ace/config-irix6.x-sgic++.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- C++ -*- */ -// $Id: config-irix6.x-sgic++.h 81935 2008-06-12 22:01:53Z jtc $ - -// Use this file for IRIX 6.[234] if you have the pthreads patches -// installed. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#include "ace/config-irix6.x-common.h" - -// This is the config file for IRIX 6.2, 6.4 and hopefully 6.3, using -// the SGI C++ compiler (7.1 or higher). - -// The following three should be enabled/disabled together. -#if _COMPILER_VERSION < 720 -#define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA -#endif /* _COMPILER_VERSION < 720 */ -#define ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_NEEDS_FUNC_DEFINITIONS - -// Platform supports STREAM pipes (note that this is disabled by -// default, see the manual page on pipe(2) to find out how to enable -// it). -// #define ACE_HAS_STREAM_PIPES - -#if defined (_COMPILER_VERSION) -# define ACE_CC_NAME ACE_TEXT ("SGI/MIPSPro") -# define ACE_CC_MAJOR_VERSION (_COMPILER_VERSION / 100) -# define ACE_CC_MINOR_VERSION (_COMPILER_VERSION % 100) -# define ACE_CC_BETA_VERSION (0) -#endif /* _COMPILER_VERSION */ - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/dep/ACE_wrappers/ace/config-kfreebsd.h b/dep/ACE_wrappers/ace/config-kfreebsd.h index 34530ab0b..ab2cd8882 100644 --- a/dep/ACE_wrappers/ace/config-kfreebsd.h +++ b/dep/ACE_wrappers/ace/config-kfreebsd.h @@ -1,4 +1,4 @@ -// $Id: config-kfreebsd.h 91429 2010-08-23 14:50:15Z johnnyw $ +// $Id: config-kfreebsd.h 91743 2010-09-13 18:24:51Z johnnyw $ #ifndef ACE_CONFIG_KFREEBSD_H #define ACE_CONFIG_KFREEBSDH @@ -133,7 +133,7 @@ /* Define to 1 if platform has the header file. */ #ifdef ACE_HAS_NEW_H -#undef ACE_HAS_NEW_H +#undef ACE_HAS_NEW_H #endif #ifndef ACE_LACKS_NEW_H diff --git a/dep/ACE_wrappers/ace/config-linux-common.h b/dep/ACE_wrappers/ace/config-linux-common.h index b787a1447..a2367bb81 100644 --- a/dep/ACE_wrappers/ace/config-linux-common.h +++ b/dep/ACE_wrappers/ace/config-linux-common.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-linux-common.h 88663 2010-01-22 10:49:22Z mcorino $ +// $Id: config-linux-common.h 92183 2010-10-08 08:44:15Z olli $ // Do not use this configuration file directly since it's designed to // be included by another, specific configuration file, such as @@ -147,7 +147,6 @@ #if __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1 # define ACE_HAS_P_READ_WRITE -# define ACE_LACKS_PREAD_PROTOTYPE // Use ACE's alternate cuserid() implementation since the use of the // system cuserid() is discouraged. # define ACE_HAS_ALT_CUSERID @@ -168,20 +167,12 @@ // this must appear before its #include. # define ACE_HAS_STRING_CLASS # include "ace/config-g++-common.h" -#define ACE_CC_NAME ACE_TEXT ("g++") -#define ACE_CC_MAJOR_VERSION __GNUC__ -#define ACE_CC_MINOR_VERSION __GNUC_MINOR__ -//#define ACE_CC_BETA_VERSION 0 /* ??? */ -#elif defined (__DECCXX) -# define ACE_CONFIG_INCLUDE_CXX_COMMON -# include "ace/config-cxx-common.h" #elif defined (__SUNCC_PRO) || defined (__SUNPRO_CC) # include "ace/config-suncc-common.h" #elif defined (__PGI) // Portable group compiler # define ACE_HAS_CPLUSPLUS_HEADERS # define ACE_HAS_STDCPP_STL_INCLUDES -# define ACE_HAS_TEMPLATE_TYPEDEFS # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_LACKS_SWAB @@ -433,23 +424,6 @@ # endif /* (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,47)) */ #endif /* ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO */ -#if defined (ACE_HAS_EVENT_POLL) -// The sys_epoll interface was introduced in Linux kernel 2.5.45. -// Don't support backported versions since they appear to be buggy. -// The obsolete ioctl()-based interface is no longer supported. -#if 0 -// linux/version.h may not be accurate. It's not for Fedora Core 2... -# if !defined (ACE_LACKS_LINUX_VERSION_H) -# include -# endif /* !ACE_LACKS_LINUX_VERSION_H */ -# if (LINUX_VERSION_CODE < KERNEL_VERSION (2,5,45)) -# undef ACE_HAS_EVENT_POLL -# error Disabling Linux epoll support. Kernel used in C library is too old. -# error Linux kernel 2.5.45 or better is required. -# endif /* LINUX_VERSION_CODE < KERNEL_VERSION (2,5,45) */ -#endif /* ACE_HAS_EVENT_POLL */ -#endif - #if !defined (ACE_HAS_EVENT_POLL) && !defined (ACE_HAS_DEV_POLL) # if !defined (ACE_LACKS_LINUX_VERSION_H) # include diff --git a/dep/ACE_wrappers/ace/config-lynxos.h b/dep/ACE_wrappers/ace/config-lynxos.h index 81176f615..cd2174656 100644 --- a/dep/ACE_wrappers/ace/config-lynxos.h +++ b/dep/ACE_wrappers/ace/config-lynxos.h @@ -1,4 +1,4 @@ -// $Id: config-lynxos.h 89494 2010-03-15 20:11:18Z olli $ +// $Id: config-lynxos.h 91683 2010-09-09 09:07:49Z johnnyw $ // The following configuration file is designed to work for LynxOS, // version 4.0.0 and later, using the GNU g++ compiler. @@ -146,11 +146,6 @@ # endif #endif /* ACE_MT_SAFE */ -// By default, don't include RCS Id strings in object code. -#if !defined (ACE_USE_RCSID) -# define ACE_USE_RCSID 0 -#endif /* ! ACE_USE_RCSID */ - #if ACE_LYNXOS_MAJOR == 4 && ACE_LYNXOS_MINOR == 0 # define ACE_LACKS_GETOPT_PROTOTYPE # define ACE_LACKS_INET_ATON_PROTOTYPE diff --git a/dep/ACE_wrappers/ace/config-macosx-leopard.h b/dep/ACE_wrappers/ace/config-macosx-leopard.h index 2af9ba97b..5fb28c338 100644 --- a/dep/ACE_wrappers/ace/config-macosx-leopard.h +++ b/dep/ACE_wrappers/ace/config-macosx-leopard.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-macosx-leopard.h 91459 2010-08-25 09:51:01Z mcorino $ +// $Id: config-macosx-leopard.h 91688 2010-09-09 11:21:50Z johnnyw $ // This configuration file is designed to work with the MacOS X operating system. @@ -100,7 +100,6 @@ #define ACE_NEEDS_SCHED_H -// Use of is deprecated. #define ACE_LACKS_MALLOC_H #define ACE_HAS_ALT_CUSERID diff --git a/dep/ACE_wrappers/ace/config-macosx-snowleopard.h b/dep/ACE_wrappers/ace/config-macosx-snowleopard.h index beeb820d6..a60b8c40a 100644 --- a/dep/ACE_wrappers/ace/config-macosx-snowleopard.h +++ b/dep/ACE_wrappers/ace/config-macosx-snowleopard.h @@ -1,4 +1,4 @@ -// $Id: config-macosx-snowleopard.h 91319 2010-08-08 23:32:07Z wotte $ +// $Id: config-macosx-snowleopard.h 91693 2010-09-09 12:57:54Z johnnyw $ #ifndef ACE_CONFIG_MACOSX_SNOWLEOPARD_H #define ACE_CONFIG_MACOSX_SNOWLEOPARD_H @@ -14,7 +14,6 @@ #endif -// This header has been deprecated in Snow Leopard. #define ACE_LACKS_UCONTEXT_H #endif // ACE_CONFIG_MACOSX_SNOWLEOPARD_H diff --git a/dep/ACE_wrappers/ace/config-macosx-tiger.h b/dep/ACE_wrappers/ace/config-macosx-tiger.h index f3d1ddcf8..944c1651f 100644 --- a/dep/ACE_wrappers/ace/config-macosx-tiger.h +++ b/dep/ACE_wrappers/ace/config-macosx-tiger.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-macosx-tiger.h 87167 2009-10-19 19:33:53Z olli $ +// $Id: config-macosx-tiger.h 91693 2010-09-09 12:57:54Z johnnyw $ // This configuration file is designed to work with the MacOS X operating system. @@ -86,7 +86,6 @@ #define ACE_NEEDS_SCHED_H -// Use of is deprecated. #define ACE_LACKS_MALLOC_H #define ACE_HAS_ALT_CUSERID diff --git a/dep/ACE_wrappers/ace/config-macosx.h b/dep/ACE_wrappers/ace/config-macosx.h index ae2552f14..12b69de3b 100644 --- a/dep/ACE_wrappers/ace/config-macosx.h +++ b/dep/ACE_wrappers/ace/config-macosx.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-macosx.h 87167 2009-10-19 19:33:53Z olli $ +// $Id: config-macosx.h 91693 2010-09-09 12:57:54Z johnnyw $ // This configuration file is designed to work with the MacOS X operating system, version 10.2 (Jaguar). @@ -60,7 +60,6 @@ #define ACE_NEEDS_SCHED_H -// Use of is deprecated. #define ACE_LACKS_MALLOC_H #define ACE_HAS_ALT_CUSERID diff --git a/dep/ACE_wrappers/ace/config-macros.h b/dep/ACE_wrappers/ace/config-macros.h index d36978ab9..304a1a147 100644 --- a/dep/ACE_wrappers/ace/config-macros.h +++ b/dep/ACE_wrappers/ace/config-macros.h @@ -4,7 +4,7 @@ /** * @file config-macros.h * - * $Id: config-macros.h 91325 2010-08-09 15:14:39Z johnnyw $ + * $Id: config-macros.h 91685 2010-09-09 09:35:14Z johnnyw $ * * @author (Originally in OS.h)Doug Schmidt * @author Jesper S. M|ller @@ -128,45 +128,6 @@ # endif # endif /* ACE_USES_FIFO_SEM */ -// ========================================================================= -// RCSID Macros -// ========================================================================= - -// By default, DO NOT include RCS Id strings in object code. -#if ! defined (ACE_USE_RCSID) -# define ACE_USE_RCSID 0 -#endif /* #if ! defined (ACE_USE_RCSID) */ - -#if (defined (ACE_USE_RCSID) && (ACE_USE_RCSID != 0)) -# if ! defined (ACE_RCSID) - - // This hack has the following purposes: - // 1. To define the RCS id string variable as a static char*, so - // that there won't be any duplicate extern symbols at link - // time. - // 2. To have a RCS id string variable with a unique name for each - // file. - // 3. To avoid warnings of the type "variable declared and never - // used". - -# define ACE_RCSID(path, file, id) \ - static inline const char* get_rcsid_ ## path ## _ ## file (const char*) \ - { \ - return id ; \ - } \ - static const char* rcsid_ ## path ## _ ## file = \ - get_rcsid_ ## path ## _ ## file ( rcsid_ ## path ## _ ## file ) ; - -# endif /* #if ! defined (ACE_RCSID) */ -#else - - // RCS id strings are not wanted. -# if defined (ACE_RCSID) -# undef ACE_RCSID -# endif /* #if defined (ACE_RCSID) */ -# define ACE_RCSID(path, file, id) /* noop */ -#endif /* #if (defined (ACE_USE_RCSID) && (ACE_USE_RCSID != 0)) */ - // ========================================================================= // INLINE macros // @@ -275,7 +236,7 @@ #if !defined (ACE_UNUSED_ARG) # if defined (__GNUC__) && ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))) # define ACE_UNUSED_ARG(a) (void) (a) -# elif defined (__GNUC__) || defined (ghs) || defined (__hpux) || defined (__sgi) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) +# elif defined (__GNUC__) || defined (ghs) || defined (__hpux) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) // Some compilers complain about "statement with no effect" with (a). // This eliminates the warnings, and no code is generated for the null // conditional statement. @note that may only be true if -O is enabled, @@ -290,11 +251,11 @@ # endif /* ghs || __GNUC__ || ..... */ #endif /* !ACE_UNUSED_ARG */ -#if defined (_MSC_VER) || defined(__sgi) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) || (defined (__HP_aCC) && (__HP_aCC < 40000 || __HP_aCC >= 60500)) +#if defined (_MSC_VER) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) || (defined (__HP_aCC) && (__HP_aCC < 40000 || __HP_aCC >= 60500)) # define ACE_NOTREACHED(a) -#else /* __sgi || ghs || ..... */ +#else /* ghs || ..... */ # define ACE_NOTREACHED(a) a -#endif /* __sgi || ghs || ..... */ +#endif /* ghs || ..... */ // ============================================================================ // ACE_ALLOC_HOOK* macros @@ -539,6 +500,10 @@ extern "C" u_long CLS##_Export _get_dll_unload_policy (void) \ # define ACE_GCC_DESTRUCTOR_ATTRIBUTE #endif +#ifndef ACE_HAS_TEMPLATE_TYPEDEFS +#define ACE_HAS_TEMPLATE_TYPEDEFS +#endif + #ifndef ACE_DEPRECATED # define ACE_DEPRECATED #endif diff --git a/dep/ACE_wrappers/ace/config-mvs.h b/dep/ACE_wrappers/ace/config-mvs.h index 3f438a776..ce2971025 100644 --- a/dep/ACE_wrappers/ace/config-mvs.h +++ b/dep/ACE_wrappers/ace/config-mvs.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-mvs.h 88495 2010-01-12 19:23:11Z olli $ +// $Id: config-mvs.h 92102 2010-09-30 08:14:15Z johnnyw $ // Config file for MVS with OpenEdition @@ -21,9 +21,7 @@ #define ACE_MVS // Preprocesor requires an extra argument -#ifndef ACE_USING_MCPP_PREPROCESSOR -# define ACE_CC_PREPROCESSOR_ARGS "-+ -E" -#endif +#define ACE_CC_PREPROCESSOR_ARGS "-+ -E" // See the README file in this directory // for a description of the following ACE_ macros @@ -68,7 +66,6 @@ #define ACE_HAS_STRBUF_T #define ACE_HAS_STRINGS #define ACE_HAS_SYSV_IPC -#define ACE_HAS_TEMPLATE_TYPEDEFS #define ACE_HAS_THREADS #define ACE_HAS_THREAD_SPECIFIC_STORAGE #define ACE_HAS_THR_C_DEST diff --git a/dep/ACE_wrappers/ace/config-openvms.h b/dep/ACE_wrappers/ace/config-openvms.h index 467f085ec..33e2ff52d 100644 --- a/dep/ACE_wrappers/ace/config-openvms.h +++ b/dep/ACE_wrappers/ace/config-openvms.h @@ -1,15 +1,11 @@ /* -*- C++ -*- */ -// $Id: config-openvms.h 91285 2010-08-05 08:29:30Z johnnyw $ +// $Id: config-openvms.h 91685 2010-09-09 09:35:14Z johnnyw $ // The following configuration file is designed to work for OpenVMS 7.3-2 #ifndef ACE_CONFIG_H #define ACE_CONFIG_H -#if !defined (ACE_USE_RCSID) -# define ACE_USE_RCSID 0 -#endif - #ifdef __cplusplus #pragma message disable CODCAUUNR #pragma message disable CODEUNREACHABLE @@ -141,7 +137,7 @@ #define ACE_LACKS_STRRECVFD 1 #define ACE_LACKS_T_ERRNO 1 -/* POSIX threads ompatibilities */ +/* POSIX threads compatibilities */ #define ACE_LACKS_RWLOCK_T 1 #define ACE_LACKS_PTHREAD_KILL 1 #define ACE_LACKS_THREAD_PROCESS_SCOPING 1 @@ -182,7 +178,6 @@ #define ACE_HAS_STRING_CLASS 1 #define ACE_HAS_SVR4_DYNAMIC_LINKING 1 -#define ACE_HAS_TEMPLATE_TYPEDEFS 1 #define ACE_LACKS_NAMED_POSIX_SEM 1 #define ACE_LACKS_SYSV_SHMEM 1 #define ACE_LACKS_UNIX_DOMAIN_SOCKETS 1 diff --git a/dep/ACE_wrappers/ace/config-qnx-neutrino.h b/dep/ACE_wrappers/ace/config-qnx-neutrino.h index 86525567c..8ba1b97e4 100644 --- a/dep/ACE_wrappers/ace/config-qnx-neutrino.h +++ b/dep/ACE_wrappers/ace/config-qnx-neutrino.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: config-qnx-neutrino.h 87167 2009-10-19 19:33:53Z olli $ +// $Id: config-qnx-neutrino.h 92120 2010-10-01 12:00:01Z johnnyw $ // The following configuration file is designed to work for Neutrino // 2.0 (Beta) with GNU C++ and the POSIX (pthread) threads package. @@ -24,8 +24,6 @@ # endif /* __X86__ */ #endif /* __OPTIMIZE__ */ -#include "ace/config-g++-common.h" - // The following defines the Neutrino compiler. // gcc should know to call g++ as necessary #ifdef __GNUC__ @@ -34,6 +32,8 @@ # define ACE_CC_NAME ACE_TEXT ("NTO compiler ??") #endif +#include "ace/config-g++-common.h" + // /usr/nto/include/float.h defines // FLT_MAX_EXP 127 // DBL_MAX_EXP 1023 diff --git a/dep/ACE_wrappers/ace/config-qnx-rtp-common.h b/dep/ACE_wrappers/ace/config-qnx-rtp-common.h index 79eb2397b..9d9e0aced 100644 --- a/dep/ACE_wrappers/ace/config-qnx-rtp-common.h +++ b/dep/ACE_wrappers/ace/config-qnx-rtp-common.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: config-qnx-rtp-common.h 85074 2009-04-10 03:17:24Z mesnier_p $ +// $Id: config-qnx-rtp-common.h 92120 2010-10-01 12:00:01Z johnnyw $ // several macros common to various qnx neutrino version. #ifndef ACE_CONFIG_QNX_RTP_COMMON_H @@ -23,8 +23,6 @@ # endif /* __X86__ */ #endif /* __OPTIMIZE__ */ -#include "ace/config-g++-common.h" - // The following defines the Neutrino compiler. // gcc should know to call g++ as necessary #ifdef __GNUC__ @@ -33,6 +31,8 @@ # define ACE_CC_NAME ACE_TEXT ("QNX-RTP compiler ??") #endif +#include "ace/config-g++-common.h" + // /usr/nto/include/float.h defines // FLT_MAX_EXP 127 // DBL_MAX_EXP 1023 diff --git a/dep/ACE_wrappers/ace/config-qnx-rtp.h b/dep/ACE_wrappers/ace/config-qnx-rtp.h index c55a4abb9..02ee89bc5 100644 --- a/dep/ACE_wrappers/ace/config-qnx-rtp.h +++ b/dep/ACE_wrappers/ace/config-qnx-rtp.h @@ -1,9 +1,9 @@ // -*- C++ -*- -// $Id: config-qnx-rtp.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-qnx-rtp.h 91743 2010-09-13 18:24:51Z johnnyw $ // The following configuration file is designed to work for QNX RTP // GNU C++ and the POSIX (pthread) threads package. You can get QNX -// RTP at http://get.qnx.com. -// This header is intended to switch between configuration for +// RTP at http://get.qnx.com. +// This header is intended to switch between configuration for // various NTO versions. #ifndef ACE_CONFIG_QNX_RTP_H #define ACE_CONFIG_QNX_RTP_H diff --git a/dep/ACE_wrappers/ace/config-sco-5.0.0-nothread.h b/dep/ACE_wrappers/ace/config-sco-5.0.0-nothread.h deleted file mode 100644 index 259bd55c2..000000000 --- a/dep/ACE_wrappers/ace/config-sco-5.0.0-nothread.h +++ /dev/null @@ -1,12 +0,0 @@ -/* -*- C++ -*- */ -// $Id: config-sco-5.0.0-nothread.h 87268 2009-10-29 21:06:06Z olli $ - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#include "ace/config-g++-common.h" -#include "ace/config-sco-5.0.0.h" - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/dep/ACE_wrappers/ace/config-sco-5.0.0.h b/dep/ACE_wrappers/ace/config-sco-5.0.0.h deleted file mode 100644 index 61b68213b..000000000 --- a/dep/ACE_wrappers/ace/config-sco-5.0.0.h +++ /dev/null @@ -1,90 +0,0 @@ -/* -*- C++ -*- */ -// $Id: config-sco-5.0.0.h 87167 2009-10-19 19:33:53Z olli $ - -#ifndef ACE_CONFIG_SCO_5_0_0_H -#define ACE_CONFIG_SCO_5_0_0_H -#include /**/ "ace/pre.h" - -// Compiling for SCO. -#if !defined (SCO) -#define SCO -#endif /* SCO */ - -#if defined (SCO) && !defined (MAXPATHLEN) -#define MAXPATHLEN 1023 -#endif /* SCO */ - -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_LACKS_CONST_TIMESPEC_PTR -#define ACE_LACKS_SYSCALL -#define ACE_LACKS_STRRECVFD -#define ACE_NEEDS_FTRUNCATE -#define ACE_LACKS_MADVISE -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS - -#define ACE_DEFAULT_CLOSE_ALL_HANDLES 0 - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC -#define ACE_HAS_NONCONST_MSGSND -#define ACE_HAS_BIG_FD_SET -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -// Compiler/platform contains the file. -//#define ACE_HAS_SYS_SYSCALL_H - -// Fixes a problem with HP/UX not wrapping the mmap(2) header files -// with extern "C". -//#define ACE_HAS_BROKEN_MMAP_H - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Compiler/platform supports poll(). -// #define ACE_HAS_POLL - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform defines the sig_atomic_t typedef -#define ACE_HAS_SIG_ATOMIC_T - -// Compiler supports the ssize_t typedef. -//#define ACE_HAS_SSIZE_T - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY - -// Note, this only works if the flag is set above! -//#define ACE_HAS_GETRUSAGE - -// Platform uses int for select() rather than fd_set. -#define ACE_HAS_SELECT_H - -// Platform has prototypes for ACE_TLI. -#define ACE_HAS_TLI_PROTOTYPES -// Platform has the XLI version of ACE_TLI. -// #define ACE_HAS_XLI - -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -#define ACE_LACKS_STRCASECMP - -// #define ACE_HAS_POSIX_TIME -#define ACE_HAS_IP_MULTICAST -#define ACE_HAS_DIRENT -#define ACE_LACKS_READDIR_R -#define ACE_HAS_GPERF - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_SCO_5_0_0_H */ diff --git a/dep/ACE_wrappers/ace/config-suncc-common.h b/dep/ACE_wrappers/ace/config-suncc-common.h index b11f2d1e8..8033a4f5a 100644 --- a/dep/ACE_wrappers/ace/config-suncc-common.h +++ b/dep/ACE_wrappers/ace/config-suncc-common.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: config-suncc-common.h 91285 2010-08-05 08:29:30Z johnnyw $ +// $Id: config-suncc-common.h 91685 2010-09-09 09:35:14Z johnnyw $ #ifndef ACE_SUNCC_COMMON_H #define ACE_SUNCC_COMMON_H @@ -8,7 +8,6 @@ # define ACE_HAS_CPLUSPLUS_HEADERS # define ACE_HAS_STDCPP_STL_INCLUDES -# define ACE_HAS_TEMPLATE_TYPEDEFS # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 diff --git a/dep/ACE_wrappers/ace/config-sunos5.5.h b/dep/ACE_wrappers/ace/config-sunos5.5.h index f2a287748..d3279b9d3 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.5.h +++ b/dep/ACE_wrappers/ace/config-sunos5.5.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-sunos5.5.h 91321 2010-08-09 06:38:18Z johnnyw $ +// $Id: config-sunos5.5.h 92102 2010-09-30 08:14:15Z johnnyw $ // This configuration file is designed to work for SunOS 5.5 platforms // using the following compilers: @@ -58,7 +58,6 @@ // If -compat=4 is turned on, the old 4.2 settings for iostreams are used, // but the newer, explicit instantiation is used (above) # if (__SUNPRO_CC_COMPAT >= 5) -# define ACE_HAS_TEMPLATE_TYPEDEFS # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_HAS_THR_C_DEST @@ -364,16 +363,7 @@ # define ACE_CC_MAJOR_VERSION (__SUNPRO_CC >> 8) # define ACE_CC_MINOR_VERSION (__SUNPRO_CC & 0x00ff) # define ACE_CC_BETA_VERSION (0) -#elif defined (__GNUG__) -# define ACE_CC_MAJOR_VERSION __GNUC__ -# define ACE_CC_MINOR_VERSION __GNUC_MINOR__ -# define ACE_CC_BETA_VERSION (0) -# if __GNUC_MINOR__ >= 90 -# define ACE_CC_NAME ACE_TEXT ("egcs") -# else -# define ACE_CC_NAME ACE_TEXT ("g++") -# endif /* __GNUC_MINOR__ */ -#endif /* __GNUG__ */ +#endif /* __SUNPRO_CC */ #if defined (i386) && (_FILE_OFFSET_BITS==32) # define ACE_HAS_X86_STAT_MACROS diff --git a/dep/ACE_wrappers/ace/config-sunos5.6.h b/dep/ACE_wrappers/ace/config-sunos5.6.h index c89bf1750..958e019cd 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.6.h +++ b/dep/ACE_wrappers/ace/config-sunos5.6.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-sunos5.6.h 91581 2010-08-31 13:18:11Z shuston $ +// $Id: config-sunos5.6.h 91685 2010-09-09 09:35:14Z johnnyw $ // The following configuration file is designed to work for SunOS 5.6 // platforms using the SunC++ 4.x or g++ compilers. @@ -38,13 +38,7 @@ #ifndef ACE_TEMPLATES_REQUIRE_SOURCE #define ACE_TEMPLATES_REQUIRE_SOURCE 1 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -#ifndef ACE_HAS_TEMPLATE_TYPEDEFS -#define ACE_HAS_TEMPLATE_TYPEDEFS 1 -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ // Forte 7 seems to botch this one... -#if __SUNPRO_CC == 0x540 -#undef ACE_HAS_TEMPLATE_TYPEDEFS -#endif #ifndef ACE_HAS_THR_C_DEST #define ACE_HAS_THR_C_DEST 1 #endif /* ACE_HAS_THR_C_DEST */ diff --git a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h index 8470a51d6..ff2111cf5 100644 --- a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h +++ b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: config-tandem-nsk-mips-v2.h 91285 2010-08-05 08:29:30Z johnnyw $ +// $Id: config-tandem-nsk-mips-v2.h 91685 2010-09-09 09:35:14Z johnnyw $ #ifndef ACE_CONFIG_NSK_H #define ACE_CONFIG_NSK_H @@ -352,10 +352,6 @@ typedef enum CMA_T_SCHED_POLICY { // .cpp files). #define ACE_TEMPLATES_REQUIRE_SOURCE -// Compiler implements templates that support typedefs inside -// of classes used as formal arguments to a template class. -#define ACE_HAS_TEMPLATE_TYPEDEFS - // Platform has its standard c++ library in the namespace std. #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 @@ -370,9 +366,6 @@ typedef enum CMA_T_SCHED_POLICY { // Build options //========================================================================= -// Disable the inclusion of RCS ids in the generated code. -#define ACE_USE_RCSID 0 - // For debugging problems in os calls (but this doesn't work too well // since output is not interleaved properly with output from ACE_TRACE //# define ACE_OS_TRACE(X) ::printf(X) diff --git a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h index 88dc259cf..c037bed4e 100644 --- a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h +++ b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: config-tandem-nsk-mips-v3.h 91285 2010-08-05 08:29:30Z johnnyw $ +// $Id: config-tandem-nsk-mips-v3.h 91685 2010-09-09 09:35:14Z johnnyw $ #ifndef ACE_CONFIG_NSK_H @@ -387,10 +387,6 @@ typedef enum CMA_T_SCHED_POLICY { // .cpp files). #define ACE_TEMPLATES_REQUIRE_SOURCE -// Compiler implements templates that support typedefs inside -// of classes used as formal arguments to a template class. -#define ACE_HAS_TEMPLATE_TYPEDEFS - // Platform/Compiler supports a String class #define ACE_HAS_STRING_CLASS #define ACE_HAS_STDCPP_STL_INCLUDES @@ -435,9 +431,6 @@ typedef enum CMA_T_SCHED_POLICY { // Build options //========================================================================= -// Disable the inclusion of RCS ids in the generated code. -#define ACE_USE_RCSID 0 - // For debugging problems in os calls (but this doesn't work too well // since output is not interleaved properly with output from ACE_TRACE //# define ACE_OS_TRACE(X) ::printf(X) diff --git a/dep/ACE_wrappers/ace/config-tandem.h b/dep/ACE_wrappers/ace/config-tandem.h index 145c20abd..fa2869b3c 100644 --- a/dep/ACE_wrappers/ace/config-tandem.h +++ b/dep/ACE_wrappers/ace/config-tandem.h @@ -1,6 +1,6 @@ /* -*- C++ -*- */ // Testing TANDEM -// $Id: config-tandem.h 87167 2009-10-19 19:33:53Z olli $ +// $Id: config-tandem.h 91781 2010-09-15 12:49:15Z johnnyw $ // The following configuration file is designed to work for Tandems NonStop-UX // 4.2MP platforms using the NCC 3.20 compiler. @@ -154,7 +154,6 @@ // Compiler/platform has threadspecific storage #define ACE_HAS_THREAD_SPECIFIC_STORAGE -//Platform supports thr_keydelete (e.g,. UNIXWARE) #define ACE_HAS_THR_MINSTACK // Tandem uses thr_minstack instead of thr_min_stack #define ACE_LACKS_PRI_T // Tandem lacks pri_t @@ -181,7 +180,6 @@ #define ACE_HAS_STANDARD_CPP_LIBRARY //Platform lacks madvise() (e.g., Linux) #define ACE_LACKS_MADVISE -//Compiler/platform lacks strcasecmp() (e.g., DG/UX, UNIXWARE, VXWORKS) #define ACE_LACKS_STRCASECMP // Defines the page size of the system. diff --git a/dep/ACE_wrappers/ace/config-tru64.h b/dep/ACE_wrappers/ace/config-tru64.h deleted file mode 100644 index 45a7aa6bd..000000000 --- a/dep/ACE_wrappers/ace/config-tru64.h +++ /dev/null @@ -1,151 +0,0 @@ -/* -*- C++ -*- */ -// $Id: config-tru64.h 87270 2009-10-29 21:47:47Z olli $ - -// The following configuration file is designed to work for the -// Digital UNIX V4.0a and later platforms. It relies on -// config-osf1-4.0.h, and adds deltas for newer platforms. - -#ifndef ACE_CONFIG_TRU64_H -#define ACE_CONFIG_TRU64_H -#include /**/ "ace/pre.h" - -#if !defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif /* ! ACE_MT_SAFE */ - -/*clearerr is not defined when _REENTRANT is not defined*/ -#if ACE_MT_SAFE == 0 -#define ACE_LACKS_CLEARERR -#endif /* ACE_MT_SAFE == 0 */ - -#include "ace/config-posix.h" - -// Configuration-specific #defines: -// 1) g++ or cxx -// 2) pthreads or DCE threads -#if defined (__GNUG__) - // g++ with pthreads - - // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so - // this must appear before its #include. -# define ACE_HAS_STRING_CLASS - -# include "ace/config-g++-common.h" - -# define ACE_HAS_REENTRANT_FUNCTIONS -#elif defined (__DECCXX) - -# define ACE_CONFIG_INCLUDE_CXX_COMMON -# include "ace/config-cxx-common.h" - -#elif defined (__rational__) -# define ACE_HAS_REENTRANT_FUNCTIONS -# define ACE_HAS_STRING_CLASS -# define ACE_LACKS_LINEBUFFERED_STREAMBUF -# define ACE_LACKS_SIGNED_CHAR - - // Exceptions are enabled by platform_osf1_4.0_rcc.GNU. -# define ACE_HAS_STDCPP_STL_INCLUDES -#else -# ifdef __cplusplus /* Let it slide for C compilers. */ -# error unsupported compiler on Digital Unix -# endif /* __cplusplus */ -#endif /* ! __GNUG__ && ! __DECCXX && ! __rational__ */ - -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -#define ACE_HAS_BROKEN_IF_HEADER -#if (ACE_MT_SAFE != 0) -# define ACE_HAS_PTHREADS -# define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -#endif /* ACE_MT_SAFE != 0 */ -#define ACE_LACKS_T_ERRNO -#if !defined (DIGITAL_UNIX) -# define DIGITAL_UNIX 0x400 -#endif /* ! DIGITAL_UNIX */ - -#define ACE_SIZEOF_LONG 8 - -#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -#define ACE_HAS_AUTOMATIC_INIT_FINI -#define ACE_HAS_NONCONST_SETRLIMIT -#define ACE_HAS_BROKEN_T_ERROR -#define ACE_HAS_NONCONST_WRITEV -#define ACE_HAS_CLOCK_GETTIME -#define ACE_HAS_CLOCK_SETTIME -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_DIRENT -#define ACE_HAS_GETRUSAGE -#define ACE_HAS_GPERF -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_IP_MULTICAST -#define ACE_HAS_LLSEEK -#define ACE_HAS_LONG_MAP_FAILED -#define ACE_HAS_MSG -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_NONCONST_SENDMSG -#define ACE_HAS_OSF1_GETTIMEOFDAY -#define ACE_HAS_OSF_TIMOD_H -#define ACE_HAS_POLL -#define ACE_HAS_POSIX_NONBLOCK -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_PRIOCNTL -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SSIZE_T -#define ACE_HAS_STRBUF_T -#define ACE_HAS_STREAMS -#define ACE_HAS_STRPTIME -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_HAS_SVR4_SIGNAL_T -#define ACE_HAS_SYS_SYSCALL_H -#define ACE_HAS_SYSV_IPC -#if (ACE_MT_SAFE == 0) -// clearerr is not defined when _REENTRANT is not defined -#define ACE_LACKS_CLEARERR -#else /* ACE_MT_SAFE != 0 */ -#define ACE_HAS_THREADS -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_LACKS_PTHREAD_ATTR_SETSTACKADDR -#endif /* ACE_MT_SAFE != 0 */ -#define ACE_HAS_TIUSER_H -#define ACE_HAS_XTI -#define ACE_HAS_TLI_PROTOTYPES -#define ACE_HAS_UALARM -#define ACE_HAS_UCONTEXT_T -#define ACE_LACKS_PRI_T -#define ACE_LACKS_RWLOCK_T -#define ACE_PAGE_SIZE 8192 -#define ACE_HAS_SIGTIMEDWAIT -#define ACE_HAS_SIGSUSPEND - -// DJT 6/10/96 All these broken macro's can now be removed with the -// approporiate ordering of the include files. The Platinum release -// now temporarily supports both forms. Platform's implementation of -// sendmsg() has a non-const msgheader parameter. -#define ACE_HAS_NONCONST_SENDMSG -#define ACE_HAS_IDTYPE_T -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER - -#if DIGITAL_UNIX >= 0x500 -# define ACE_HAS_XPG4_MULTIBYTE_CHAR 1 -#endif /* DIGITAL_UNIX >= 0x500 */ - -#if DIGITAL_UNIX >= 0x40E -# define ACE_LACKS_STDINT_H -#endif /* DIGITAL_UNIX >= 0x40E */ - -#if (DIGITAL_UNIX >= 0x400) && (DIGITAL_UNIX < 0x500) -#define ACE_LACKS_PREAD_PROTOTYPE -#endif /* (DIGITAL_UNIX >= 0x400) && (DIGITAL_UNIX < 0x500) */ - -// gethostbyaddr does not handle IPv6-mapped-IPv4 addresses -#define ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_TRU64_H */ diff --git a/dep/ACE_wrappers/ace/config-unixware-7.1.0.h b/dep/ACE_wrappers/ace/config-unixware-7.1.0.h deleted file mode 100644 index 3712ea01e..000000000 --- a/dep/ACE_wrappers/ace/config-unixware-7.1.0.h +++ /dev/null @@ -1,399 +0,0 @@ -/* -*- C++ -*- */ -// $Id: config-unixware-7.1.0.h 91285 2010-08-05 08:29:30Z johnnyw $ - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H - -/* ACE configuration header file */ - -/* Include the commong gnu config file */ -#include "config-g++-common.h" - -/* For unixware 7.1 && g++ 2.91.57, see if this fixes my problem */ -#ifndef UNIXWARE_7_1 -#define UNIXWARE_7_1 -#endif - -/* Define if you have alloca, as a function or macro. */ -#define HAVE_ALLOCA 1 - -/* Define if you have the strftime function. */ -#define HAVE_STRFTIME 1 - -/* Define if you have that is POSIX.1 compatible. */ -#define HAVE_SYS_WAIT_H 1 - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if lex declares yytext as a char * by default, not a char[]. */ -#define YYTEXT_POINTER 1 - -/* Define _REENTRANT if reentrant functions should be used. */ -#ifndef _REENTRANT -# define _REENTRANT 1 -#endif - -#define ACE_HAS_NEW_NO_H 1 -#define ACE_HAS_STDEXCEPT_NO_H 1 - -#define ACE_THREAD_MIN_PRIORITY 0 -#if defined (ACE_THREAD_MIN_PRIORITY) -# define PTHREAD_MIN_PRIORITY ACE_THREAD_MIN_PRIORITY -#endif /* #if defined (ACE_THREAD_MIN_PRIORITY) */ - -#define ACE_THREAD_MAX_PRIORITY 99 -#if defined (ACE_THREAD_MAX_PRIORITY) -# define PTHREAD_MAX_PRIORITY ACE_THREAD_MAX_PRIORITY -#endif /* #if defined (ACE_THREAD_MAX_PRIORITY) */ - -/* Specify sizes of given built-in types. If a size isn't defined here, - then ace/Basic_Types.h will attempt to deduce the size. */ -/* #undef ACE_SIZEOF_CHAR */ -#define ACE_SIZEOF_SHORT 2 -#define ACE_SIZEOF_INT 4 -#define ACE_SIZEOF_LONG 4 -#define ACE_SIZEOF_LONG_LONG 8 -#define ACE_SIZEOF_VOID_P 4 -#define ACE_SIZEOF_FLOAT 4 -#define ACE_SIZEOF_DOUBLE 8 -#define ACE_SIZEOF_LONG_DOUBLE 12 - -/* Enable ACE inlining */ -#define __ACE_INLINE__ 1 - -/* OS has priocntl (2) */ -#define ACE_HAS_PRIOCNTL 1 - -/* Platform has pread() and pwrite() support */ -#define ACE_HAS_P_READ_WRITE 1 - -/* Compiler/platform supports alloca() */ -// Although ACE does have alloca() on this compiler/platform combination, it is -// disabled by default since it can be dangerous. Uncomment the following line -// if you ACE to use it. -//#define ACE_HAS_ALLOCA 1 - -/* Compiler/platform correctly calls init()/fini() for shared libraries */ -#define ACE_HAS_AUTOMATIC_INIT_FINI 1 - -/* Platform doesn't cast MAP_FAILED to a (void *). */ -/* #undef ACE_HAS_BROKEN_MAP_FAILED */ -/* Staller: oh yes, let's do this! */ -#define ACE_HAS_BROKEN_MAP_FAILED - -/* Prototypes for both signal() and struct sigaction are consistent. */ -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1 - -/* Platform supports operations on directories via struct dirent, - readdir_r, etc. */ -#define ACE_HAS_DIRENT 1 - -/* Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be - defined, except on Win32) */ -#define ACE_HAS_GETPAGESIZE 1 - -/* Platform supports the getrusage() system call. */ -#define ACE_HAS_GETRUSAGE 1 - -/* Platform has a getrusage () prototype in sys/resource.h that differs from - the one in ace/OS.i. */ -#define ACE_HAS_GETRUSAGE_PROTOTYPE 1 - -/* The GPERF utility is compiled for this platform */ -#define ACE_HAS_GPERF 1 - -/* Optimize ACE_Handle_Set::count_bits for select() operations (common case) */ -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT 1 - -/* Compiler/platform supports idtype_t. */ -#define ACE_HAS_IDTYPE_T 1 - -/* Platform supports IP multicast */ -#define ACE_HAS_IP_MULTICAST 1 - -/* Platform supports thr_keydelete (e.g,. UNIXWARE) */ -#define ACE_HAS_THR_KEYDELETE 1 - -/* Platform calls thr_minstack() rather than thr_min_stack() (e.g., Tandem). */ -#define ACE_HAS_THR_MINSTACK 1 - -/* Platform supports recvmsg and sendmsg */ -#define ACE_HAS_MSG 1 - -/* Platform's select() uses non-const timeval* (only found on Linux right - now) */ -#define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 - -/* Uses ctime_r & asctime_r with only two parameters vs. three. */ -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1 - -/* Platform is an Intel Pentium microprocessor. */ -/* There is a problem with the gethrtime() because of (apparently) a problem - with the inline assembly instruction. Hopefully there is a way to resolve - that with an improvement to the assembler -*/ -#ifdef ACE_HAS_PENTIUM -#undef ACE_HAS_PENTIUM -#endif /* ACE_HAS_PENTIUM */ - - -/* Platform contains */ -#define ACE_HAS_POLL 1 - -/* Platform supports POSIX O_NONBLOCK semantics */ -#define ACE_HAS_POSIX_NONBLOCK 1 - -/* Platform supports the POSIX struct timespec type */ -#define ACE_HAS_POSIX_TIME 1 - -/* Platform supports the /proc file system and defines tid_t - in */ -#define ACE_HAS_PROC_FS 1 - -/* Platform supports POSIX Threads */ -#define ACE_HAS_PTHREADS 1 - -/* pthread.h declares an enum with PTHREAD_PROCESS_PRIVATE and - PTHREAD_PROCESS_SHARED values */ -#define ACE_HAS_PTHREAD_PROCESS_ENUM 1 - -/* Platform will recurse infinitely on thread exits from TSS cleanup routines - (e.g., AIX) */ -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS 1 - -/* Platform supports reentrant functions (i.e., all the POSIX *_r - functions). */ -#define ACE_HAS_REENTRANT_FUNCTIONS 1 - -/* Platform has support for multi-byte character support compliant with the - XPG4 Worldwide Portability Interface wide-character classification. */ -#define ACE_HAS_XPG4_MULTIBYTE_CHAR 1 - -/* Platform does not support reentrant netdb functions (getprotobyname_r, - getprotobynumber_r, gethostbyaddr_r, gethostbyname_r, getservbyname_r). */ -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS 1 - -/* Platform supports the POSIX regular expression library */ -#define ACE_HAS_REGEX 1 - -/* Platform has special header for select(). */ -#define ACE_HAS_SELECT_H 1 - -/* Platform has a function to set t_errno (e.g., Tandem). */ -#define ACE_HAS_SET_T_ERRNO 1 - -/* Platform supports SVR4 extended signals */ -#define ACE_HAS_SIGINFO_T 1 - -/* Platform/compiler has the sigwait(2) prototype */ -#define ACE_HAS_SIGWAIT 1 - -/* Compiler/platform defines the sig_atomic_t typedef */ -#define ACE_HAS_SIG_ATOMIC_T 1 - -/* Platform supports new BSD inet_addr len field. */ -#define ACE_HAS_SOCKADDR_IN_SIN_LEN 1 - -/* OS/compiler uses size_t * rather than int * for socket lengths */ -#define ACE_HAS_SIZET_SOCKET_LEN 1 - -/* Compiler/platform provides the sys/sockio.h file */ -#define ACE_HAS_SYS_SOCKIO_H 1 - -/* Compiler supports the ssize_t typedef */ -#define ACE_HAS_SSIZE_T 1 - -/* Platform supports UNIX International Threads */ -#define ACE_HAS_STHREADS 1 - -/* Platform has thr_yield() */ -#define ACE_HAS_THR_YIELD 1 - -/* Compiler/platform supports struct strbuf */ -#define ACE_HAS_STRBUF_T 1 - -/* Platform supports STREAMS */ -#define ACE_HAS_STREAMS 1 - -/* Platform supports STREAM pipes */ -#define ACE_HAS_STREAM_PIPES 1 - -/* Platform/Compiler supports a String class (e.g., GNU or Win32). */ -#define ACE_HAS_STRING_CLASS 1 - -/* Platform has (which contains bzero() prototype) */ -#define ACE_HAS_STRINGS 1 - -/* Platform/compiler supports void * as second parameter to gettimeofday(). */ -#define ACE_HAS_VOIDPTR_GETTIMEOFDAY 1 - -/* Compiler/platform supports SVR4 dynamic linking semantics */ -#define ACE_HAS_SVR4_DYNAMIC_LINKING 1 - -/* Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff)... */ -#define ACE_HAS_SVR4_TLI 1 - -/* Compiler/platform contains the file. */ -#define ACE_HAS_SYS_SYSCALL_H 1 - -/* Platform supports system configuration information */ -#define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSV_SYSINFO 1 - -/* Platform supports System V IPC (most versions of UNIX, but not Win32) */ -#define ACE_HAS_SYSV_IPC 1 - -/* Platform provides header */ -#define ACE_HAS_SYS_FILIO_H 1 - -/* Platform provides header */ -#define ACE_HAS_SYS_XTI_H 1 - -/* Platform has POSIX terminal interface. */ -#define ACE_HAS_TERMIOS 1 - -/* Platform supports threads */ -#define ACE_HAS_THREADS 1 - -/* Compiler/platform has thread-specific storage */ -#define ACE_HAS_THREAD_SPECIFIC_STORAGE 1 - -/* Platform supports TLI timod STREAMS module */ -#define ACE_HAS_TIMOD_H 1 - -/* Platform supports TLI tiuser header */ -#define ACE_HAS_TIUSER_H 1 - -/* Platform supports TLI. Also see ACE_TLI_TCP_DEVICE. */ -#define ACE_HAS_TLI 1 - -/* Platform provides TLI function prototypes */ -#define ACE_HAS_TLI_PROTOTYPES 1 - -/* Platform supports ualarm() */ -#define ACE_HAS_UALARM 1 - -/* Platform supports ucontext_t (which is used in the extended signal API). */ -#define ACE_HAS_UCONTEXT_T 1 - -/* Platform has header file */ -#define ACE_HAS_UTIME 1 - -/* Platform requires void * for mmap(). */ -#define ACE_HAS_VOIDPTR_MMAP 1 - -/* Platform has XTI (X/Open-standardized superset of TLI). Implies - ACE_HAS_TLI but uses a different header file. */ -#define ACE_HAS_XTI 1 - -/* Platform can not build ace/IOStream{,_T}.cpp. This does not necessarily - mean that the platform does not support iostreams. */ -#define ACE_LACKS_ACE_IOSTREAM 1 - -/* Platform does not have u_longlong_t typedef */ -#define ACE_LACKS_U_LONGLONG_T 1 - -/* Platform lacks madvise() (e.g., Linux) */ -#define ACE_LACKS_MADVISE 1 - -/* Platform lacks pri_t (e.g., Tandem NonStop UNIX). */ -#define ACE_LACKS_PRI_T 1 - -/* Platform lacks pthread_thr_sigsetmask (e.g., MVS, HP/UX, and OSF/1 3.2) */ -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1 - -/* Platfrom lack pthread_yield() support. */ -#define ACE_LACKS_PTHREAD_YIELD 1 - -/* Platform lacks readers/writer locks. */ -#define ACE_LACKS_RWLOCK_T 1 - -/* MIT pthreads platform lacks the timedwait prototypes */ -#define ACE_LACKS_TIMEDWAIT_PROTOTYPES 1 - -/* Platform does not define timepec_t as a typedef for struct timespec. */ -#define ACE_LACKS_TIMESPEC_T 1 - -/* Compile using multi-thread libraries */ -#define ACE_MT_SAFE 1 - -/* Platform needs to #include to get thread scheduling defs. */ -#define ACE_NEEDS_SCHED_H 1 - -/*********************************************************************/ -/* Compiler's template mechanim must see source code (i.e., .cpp files). This - is used for GNU G++. */ -/* Staller -> make 0 */ -// #undef ACE_TEMPLATES_REQUIRE_SOURCE - -/*********************************************************************/ - -/* The OS/platform supports the poll() event demultiplexor */ -#define ACE_USE_POLL 1 - -/* Platform has its standard c++ library in the namespace std. */ -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 - -/* The number of bytes in a double. */ -#define SIZEOF_DOUBLE 8 - -/* The number of bytes in a float. */ -#define SIZEOF_FLOAT 4 - -/* The number of bytes in a int. */ -#define SIZEOF_INT 4 - -/* The number of bytes in a long. */ -#define SIZEOF_LONG 4 - -/* The number of bytes in a long double. */ -#define SIZEOF_LONG_DOUBLE 12 - -/* The number of bytes in a long long. */ -#define SIZEOF_LONG_LONG 8 - -/* The number of bytes in a short. */ -#define SIZEOF_SHORT 2 - -/* The number of bytes in a signed char. */ -#define SIZEOF_SIGNED_CHAR 1 - -/* The number of bytes in a void *. */ -#define SIZEOF_VOID_P 4 - -/* Define if you have the execv function. */ -#define HAVE_EXECV 1 - -/* Define if you have the execve function. */ -#define HAVE_EXECVE 1 - -/* Define if you have the execvp function. */ -#define HAVE_EXECVP 1 - -/* Define if you have the header file. */ -#define HAVE_DIRENT_H 1 - -/* Define if you have the header file. */ -#define HAVE_FSTREAM 1 - -/* Define if you have the header file. */ -#define HAVE_IOMANIP 1 - -/* Define if you have the header file. */ -#define HAVE_IOSTREAM 1 - -/* Define if you have the header file. */ -#define HAVE_PWD_H 1 - -/* Name of package */ -#define PACKAGE "ace" - -/* Added by Staller */ -#define ENUM_BOOLEAN // See file /usr/local/lib/gcc-lib/i486-pc-sysv5/egcs-2.91.60/include/sys/types.h -#define howmany(x, y) (((x)+((y)-1))/(y)) -#define ACE_HAS_BROKEN_T_ERROR // make a nasty warning disappear in OS.i -#define __USLC__ 1 -#define __IOCTL_VERSIONED__ // By Carlo! - -#endif /* ACE_CONFIG_H */ diff --git a/dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h b/dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h deleted file mode 100644 index 9dac770a8..000000000 --- a/dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h +++ /dev/null @@ -1,452 +0,0 @@ -/* -*- C++ -*- */ -#ifndef ACE_CONFIG_UNIXWARE_UDK_H -#define ACE_CONFIG_UNIXWARE_UDK_H - -// $Id: config-unixware-7.1.0.udk.h 91285 2010-08-05 08:29:30Z johnnyw $ - -// Configuration for the unixware UDK compiler. derived from the unixware/g++ config -// which was itself derived from an autoconfig run. - -/* ACE configuration header file */ - -#define ACE_TEMPLATES_REQUIRE_SOURCE - -#ifndef UNIXWARE_7_1 -#define UNIXWARE_7_1 -#endif - -#define ACE_LACKS_PLACEMENT_OPERATOR_DELETE - -/* Define if you have the strftime function. */ -#define HAVE_STRFTIME 1 - -/* Define if you have that is POSIX.1 compatible. */ -#define HAVE_SYS_WAIT_H 1 - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if lex declares yytext as a char * by default, not a char[]. */ -#define YYTEXT_POINTER 1 - -/* Define _REENTRANT if reentrant functions should be used. */ -#ifndef _REENTRANT -# define _REENTRANT 1 -#endif - -#define ACE_HAS_NEW_NO_H 1 -#define ACE_HAS_STDEXCEPT_NO_H 1 - -/* - * TODO: These two next #defines have an #undef before them, in - * case the variable being defined already had a value. - * The #undefs are being picked up by configure, and are commented out! - */ -#define ACE_THREAD_MIN_PRIORITY 0 -#if defined (ACE_THREAD_MIN_PRIORITY) -/* # undef PTHREAD_MIN_PRIORITY */ -# define PTHREAD_MIN_PRIORITY ACE_THREAD_MIN_PRIORITY -#endif /* #if defined (ACE_THREAD_MIN_PRIORITY) */ - -#define ACE_THREAD_MAX_PRIORITY 99 -#if defined (ACE_THREAD_MAX_PRIORITY) -/* # undef PTHREAD_MAX_PRIORITY */ -# define PTHREAD_MAX_PRIORITY ACE_THREAD_MAX_PRIORITY -#endif /* #if defined (ACE_THREAD_MAX_PRIORITY) */ - - - -/* UnixWare specific configuration parameters */ -/* #undef UNIXWARE */ -/* #undef UNIXWARE_2_0 */ -/* #undef UNIXWARE_2_1 */ - -/* Specify sizes of given built-in types. If a size isn't defined here, - then ace/Basic_Types.h will attempt to deduce the size. */ -/* #undef ACE_SIZEOF_CHAR */ -#define ACE_SIZEOF_SHORT 2 -#define ACE_SIZEOF_INT 4 -#define ACE_SIZEOF_LONG 4 -#define ACE_SIZEOF_LONG_LONG 8 -#define ACE_SIZEOF_VOID_P 4 -#define ACE_SIZEOF_FLOAT 4 -#define ACE_SIZEOF_DOUBLE 8 -#define ACE_SIZEOF_LONG_DOUBLE 12 - -/* Enable ACE inlining */ -#define __ACE_INLINE__ 1 - -/* Platform supports Asynchronous IO calls */ -/* #define ACE_HAS_AIO_CALLS */ - -/* Specify this if you don't want threads to inherit parent thread's - ACE_Log_Msg properties. */ -/* #undef ACE_THREADS_DONT_INHERIT_LOG_MSG */ - -/* OS has priocntl (2) */ -#define ACE_HAS_PRIOCNTL 1 - -/* Platform has pread() and pwrite() support */ -#define ACE_HAS_P_READ_WRITE 1 - -/* Compiler/platform correctly calls init()/fini() for shared libraries */ -#define ACE_HAS_AUTOMATIC_INIT_FINI 1 - -/* Compiler handles explicit calling of template destructor correctly. - See "ace/OS.h" for details. */ -/* Staller: already defined by config-g++-common.h -#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR 1 -*/ - -/* Platform doesn't cast MAP_FAILED to a (void *). */ -/* #undef ACE_HAS_BROKEN_MAP_FAILED */ -/* Staller: oh yes, let's do this! */ -#define ACE_HAS_BROKEN_MAP_FAILED - - -/* Prototypes for both signal() and struct sigaction are consistent. */ -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1 - -/* Compiler/platform has correctly prototyped header files */ -#define ACE_HAS_CPLUSPLUS_HEADERS - -/* Platform supports operations on directories via struct dirent, - readdir_r, etc. */ -#define ACE_HAS_DIRENT - -/* Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be - defined, except on Win32) */ -#define ACE_HAS_GETPAGESIZE - -/* Platform supports the getrusage() system call. */ -#define ACE_HAS_GETRUSAGE - -/* Platform has a getrusage () prototype in sys/resource.h that differs from - the one in ace/OS.i. */ -#define ACE_HAS_GETRUSAGE_PROTOTYPE - -/* The GPERF utility is compiled for this platform */ -#define ACE_HAS_GPERF - -/* Optimize ACE_Handle_Set::count_bits for select() operations (common case) */ -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT 1 - -/* Compiler/platform supports SunOS high resolution timers */ -/* #undef ACE_HAS_HI_RES_TIMER */ - -/* Compiler/platform supports idtype_t. */ -#define ACE_HAS_IDTYPE_T - -/* Inline all the static class OS methods to remove call overhead */ -/* Note: This gets defined by OS.h if __ACE_INLINE__ is defined */ -/* #undef ACE_HAS_INLINED_OSCALLS */ - -/* Platform supports IP multicast */ -#define ACE_HAS_IP_MULTICAST - -/* Platform supports thr_keydelete (e.g,. UNIXWARE) */ -#define ACE_HAS_THR_KEYDELETE - -/* Platform calls thr_minstack() rather than thr_min_stack() (e.g., Tandem). */ -#define ACE_HAS_THR_MINSTACK - -/* Some files, such as ace/streams.h, want to include new style C++ stream - headers. These headers are iomanip, ios, iostream, istream, ostream, - fstream and streambuf. If _all_ of these headers aren't available, then - assume that only iostream.h and fstream.h are available. */ -/* #define ACE_USES_OLD_IOSTREAMS */ - -/* Platform supports recvmsg and sendmsg */ -#define ACE_HAS_MSG - -/* Platform's select() uses non-const timeval* (only found on Linux right - now) */ -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -/* Uses ctime_r & asctime_r with only two parameters vs. three. */ -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - - -/* Platform is an Intel Pentium microprocessor. */ -/* There is a problem with the gethrtime() because of (apparently) a problem - with the inline assembly instruction. Hopefully there is a way to resolve - that with an improvement to the assembler -*/ -#ifdef ACE_HAS_PENTIUM -//#undef ACE_HAS_PENTIUM -#endif /* ACE_HAS_PENTIUM */ - - -/* Platform contains */ -#define ACE_HAS_POLL - -/* Platform supports POSIX O_NONBLOCK semantics */ -#define ACE_HAS_POSIX_NONBLOCK - -/* Platform supports the POSIX struct timespec type */ -#define ACE_HAS_POSIX_TIME - -/* Platform supports the /proc file system and defines tid_t - in */ -#define ACE_HAS_PROC_FS - -/* Platform supports POSIX Threads */ -#define ACE_HAS_PTHREADS - -/* pthread.h declares an enum with PTHREAD_PROCESS_PRIVATE and - PTHREAD_PROCESS_SHARED values */ -#define ACE_HAS_PTHREAD_PROCESS_ENUM - -/* Platform will recurse infinitely on thread exits from TSS cleanup routines - (e.g., AIX) */ -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS - -/* Platform supports reentrant functions (i.e., all the POSIX *_r - functions). */ -#define ACE_HAS_REENTRANT_FUNCTIONS - -/* Platform has support for multi-byte character support compliant with the - XPG4 Worldwide Portability Interface wide-character classification. */ -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -/* Platform does not support reentrant netdb functions (getprotobyname_r, - getprotobynumber_r, gethostbyaddr_r, gethostbyname_r, getservbyname_r). */ -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS - -/* Platform supports the POSIX regular expression library */ -#define ACE_HAS_REGEX - -/* Platform has special header for select(). */ -#define ACE_HAS_SELECT_H - -/* Platform has a function to set t_errno (e.g., Tandem). */ -#define ACE_HAS_SET_T_ERRNO - -/* Platform supports SVR4 extended signals */ -#define ACE_HAS_SIGINFO_T - -/* Platform/compiler has the sigwait(2) prototype */ -#define ACE_HAS_SIGWAIT - -/* Compiler/platform defines the sig_atomic_t typedef */ -#define ACE_HAS_SIG_ATOMIC_T - -/* Platform supports new BSD inet_addr len field. */ -#define ACE_HAS_SOCKADDR_IN_SIN_LEN - -/* OS/compiler uses size_t * rather than int * for socket lengths */ -#define ACE_HAS_SIZET_SOCKET_LEN - -/* Compiler/platform provides the sys/sockio.h file */ -#define ACE_HAS_SYS_SOCKIO_H - -/* Compiler supports the ssize_t typedef */ -#define ACE_HAS_SSIZE_T - -/* Platform supports UNIX International Threads */ -#define ACE_HAS_STHREADS - -/* Platform has thr_yield() */ -#define ACE_HAS_THR_YIELD - -/* Platform/compiler supports Standard C++ Library */ -/* It seems that UDK provides std-like declarations for only portions - such as -*/ -#define ACE_HAS_STANDARD_CPP_LIBRARY 0 - -/* Compiler/platform supports struct strbuf */ -#define ACE_HAS_STRBUF_T - -/* Platform supports STREAMS */ -#define ACE_HAS_STREAMS - -/* Platform supports STREAM pipes */ -#define ACE_HAS_STREAM_PIPES - -/* Platform/Compiler supports a String class (e.g., GNU or Win32). */ -#define ACE_HAS_STRING_CLASS - -/* Platform has (which contains bzero() prototype) */ -#define ACE_HAS_STRINGS - -/* Platform/compiler supports void * as second parameter to gettimeofday(). */ -#define ACE_HAS_VOIDPTR_GETTIMEOFDAY - -/* Compiler/platform supports SVR4 dynamic linking semantics */ -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -/* Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff)... */ -#define ACE_HAS_SVR4_TLI - -/* Compiler/platform contains the file. */ -#define ACE_HAS_SYS_SYSCALL_H - -/* Platform supports system configuration information */ -#define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSV_SYSINFO 1 - -/* Platform supports System V IPC (most versions of UNIX, but not Win32) */ -#define ACE_HAS_SYSV_IPC 1 - -/* Platform provides header */ -#define ACE_HAS_SYS_FILIO_H 1 - -/* Platform provides header */ -#define ACE_HAS_SYS_XTI_H 1 - -/* Compiler implements templates that support typedefs inside of classes used - as formal arguments to a template class. */ -#define ACE_HAS_TEMPLATE_TYPEDEFS 1 - -/* Platform has POSIX terminal interface. */ -#define ACE_HAS_TERMIOS 1 - -/* Platform supports threads */ -#define ACE_HAS_THREADS 1 - -/* Compiler/platform has thread-specific storage */ -#define ACE_HAS_THREAD_SPECIFIC_STORAGE 1 - -/* Platform supports TLI timod STREAMS module */ -#define ACE_HAS_TIMOD_H 1 - -/* Platform supports TLI tiuser header */ -#define ACE_HAS_TIUSER_H 1 - -/* Platform supports TLI. Also see ACE_TLI_TCP_DEVICE. */ -#define ACE_HAS_TLI 1 - -/* Platform provides TLI function prototypes */ -#define ACE_HAS_TLI_PROTOTYPES 1 - -/* Platform supports ualarm() */ -#define ACE_HAS_UALARM 1 - -/* Platform supports ucontext_t (which is used in the extended signal API). */ -#define ACE_HAS_UCONTEXT_T 1 - -/* Platform has header file */ -#define ACE_HAS_UTIME 1 - -/* Prints out console message in ACE_NOTSUP. Useful for tracking down origin - of ACE_NOTSUP. */ -/* #undef ACE_HAS_VERBOSE_NOTSUP */ - -/* Platform requires void * for mmap(). */ -#define ACE_HAS_VOIDPTR_MMAP 1 - -/* Platform has XTI (X/Open-standardized superset of TLI). Implies - ACE_HAS_TLI but uses a different header file. */ -#define ACE_HAS_XTI 1 - -/* Platform can not build ace/IOStream{,_T}.cpp. This does not necessarily - mean that the platform does not support iostreams. */ -#define ACE_LACKS_ACE_IOSTREAM 1 - -/* Platform does not have u_longlong_t typedef */ -#define ACE_LACKS_U_LONGLONG_T 1 - -/* Platform lacks madvise() (e.g., Linux) */ -#define ACE_LACKS_MADVISE 1 - -/* Platform lacks pri_t (e.g., Tandem NonStop UNIX). */ -#define ACE_LACKS_PRI_T 1 - -/* Platform lacks pthread_thr_sigsetmask (e.g., MVS, HP/UX, and OSF/1 3.2) */ -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1 - -/* Platfrom lack pthread_yield() support. */ -#define ACE_LACKS_PTHREAD_YIELD 1 - -/* Platform lacks readers/writer locks. */ -#define ACE_LACKS_RWLOCK_T 1 - -/* MIT pthreads platform lacks the timedwait prototypes */ -#define ACE_LACKS_TIMEDWAIT_PROTOTYPES 1 - -/* Platform does not define timepec_t as a typedef for struct timespec. */ -#define ACE_LACKS_TIMESPEC_T 1 - -/* Compile using multi-thread libraries */ -#define ACE_MT_SAFE 1 - -/* Platform needs to #include to get thread scheduling defs. */ -#define ACE_NEEDS_SCHED_H 1 - -/* The OS/platform supports the poll() event demultiplexor */ -#define ACE_USE_POLL 1 - -/* Platform has its standard c++ library in the namespace std. */ -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 - -/* The number of bytes in a double. */ -#define SIZEOF_DOUBLE 8 - -/* The number of bytes in a float. */ -#define SIZEOF_FLOAT 4 - -/* The number of bytes in a int. */ -#define SIZEOF_INT 4 - -/* The number of bytes in a long. */ -#define SIZEOF_LONG 4 - -/* The number of bytes in a long double. */ -#define SIZEOF_LONG_DOUBLE 12 - -/* The number of bytes in a long long. */ -#define SIZEOF_LONG_LONG 8 - -/* The number of bytes in a short. */ -#define SIZEOF_SHORT 2 - -/* The number of bytes in a signed char. */ -#define SIZEOF_SIGNED_CHAR 1 - -/* The number of bytes in a void *. */ -#define SIZEOF_VOID_P 4 - -/* Define if you have the execv function. */ -#define HAVE_EXECV 1 - -/* Define if you have the execve function. */ -#define HAVE_EXECVE 1 - -/* Define if you have the execvp function. */ -#define HAVE_EXECVP 1 - -/* Define if you have the header file. */ -#define HAVE_DIRENT_H 1 - -/* Define if you have the header file. */ -#define HAVE_FSTREAM 1 - -/* Define if you have the header file. */ -#define HAVE_IOMANIP 1 - -/* Define if you have the header file. */ -#define HAVE_IOSTREAM 1 - -/* Define if you have the header file. */ -#define HAVE_PWD_H 1 - -/* Name of package */ -#define PACKAGE "ace" - -/* Version number of package */ -#define VERSION "4.6.37" - -/* Added by Staller */ -#define ENUM_BOOLEAN // See file /usr/local/lib/gcc-lib/i486-pc-sysv5/egcs-2.91.60/include/sys/types.h -/* Hat nix gebracht -#define ACE_DEFAULT_SELECT_REACTOR_SIZE 256 // this is like in linux config fileto avoid another error -*/ -#define howmany(x, y) (((x)+((y)-1))/(y)) -#define ACE_HAS_BROKEN_T_ERROR // let disappear a nasty warning from OS.i -#if !defined (__USLC__) -# define __USLC__ 1 -#endif - -#define __IOCTL_VERSIONED__ // By Carlo! -#endif /* ACE_UNIXWARE_UDK_H */ diff --git a/dep/ACE_wrappers/ace/config-vxworks6.4.h b/dep/ACE_wrappers/ace/config-vxworks6.4.h index d1fad7819..9a0487f36 100644 --- a/dep/ACE_wrappers/ace/config-vxworks6.4.h +++ b/dep/ACE_wrappers/ace/config-vxworks6.4.h @@ -1,5 +1,5 @@ //* -*- C++ -*- */ -// $Id: config-vxworks6.4.h 89494 2010-03-15 20:11:18Z olli $ +// $Id: config-vxworks6.4.h 91683 2010-09-09 09:07:49Z johnnyw $ // The following configuration file is designed to work for VxWorks // 6.4 platforms using one of these compilers: @@ -337,11 +337,6 @@ # define ACE_NTRACE 1 #endif /* ACE_NTRACE */ -// By default, don't include RCS Id strings in object code. -#if !defined (ACE_USE_RCSID) -#define ACE_USE_RCSID 0 -#endif /* !ACE_USE_RCSID */ - #if defined (ACE_HAS_IP_MULTICAST) # define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 #endif /* ACE_HAS_IP_MULTICAST */ diff --git a/dep/ACE_wrappers/ace/config-win32-borland.h b/dep/ACE_wrappers/ace/config-win32-borland.h index 65dbee6c8..f5305d3b0 100644 --- a/dep/ACE_wrappers/ace/config-win32-borland.h +++ b/dep/ACE_wrappers/ace/config-win32-borland.h @@ -1,5 +1,5 @@ // -*- C++ -*- -//$Id: config-win32-borland.h 91285 2010-08-05 08:29:30Z johnnyw $ +//$Id: config-win32-borland.h 92102 2010-09-30 08:14:15Z johnnyw $ // The following configuration file contains defines for Borland compilers. @@ -33,12 +33,10 @@ # define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100) # define ACE_CC_BETA_VERSION (0) -#ifndef ACE_USING_MCPP_PREPROCESSOR -# if (__BORLANDC__ >= 0x620) -# define ACE_CC_PREPROCESSOR_ARGS "-q -Sl -o%s" -# else -# define ACE_CC_PREPROCESSOR_ARGS "-q -P- -o%s" -# endif +#if (__BORLANDC__ >= 0x620) +# define ACE_CC_PREPROCESSOR_ARGS "-q -Sl -o%s" +#else +# define ACE_CC_PREPROCESSOR_ARGS "-q -P- -o%s" #endif // Automatically define WIN32 macro if the compiler tells us it is our @@ -115,7 +113,6 @@ #define ACE_HAS_STANDARD_CPP_LIBRARY 1 #define ACE_HAS_STDCPP_STL_INCLUDES 1 #define ACE_HAS_STRING_CLASS 1 -#define ACE_HAS_TEMPLATE_TYPEDEFS 1 #define ACE_HAS_USER_MODE_MASKS 1 #define ACE_LACKS_ACE_IOSTREAM 1 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 @@ -145,8 +142,10 @@ # define ACE_LACKS_PRAGMA_ONCE 1 #endif -#define ACE_LACKS_ISWCTYPE -#define ACE_LACKS_ISCTYPE +#if (__BORLANDC__ < 0x630) +# define ACE_LACKS_ISWCTYPE +# define ACE_LACKS_ISCTYPE +#endif #if (__BORLANDC__ < 0x620) // Older Borland compilers can't handle assembly in inline methods or diff --git a/dep/ACE_wrappers/ace/config-win32-cegcc.h b/dep/ACE_wrappers/ace/config-win32-cegcc.h index c29290d71..4f115d69a 100644 --- a/dep/ACE_wrappers/ace/config-win32-cegcc.h +++ b/dep/ACE_wrappers/ace/config-win32-cegcc.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: config-win32-cegcc.h 87167 2009-10-19 19:33:53Z olli $ +// $Id: config-win32-cegcc.h 92102 2010-09-30 08:14:15Z johnnyw $ // // The following configuration file is designed to work for win32 @@ -14,15 +14,9 @@ # error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ -#define ACE_CC_NAME ACE_TEXT ("g++") #define ACE_CC_PREPROCESSOR "cpp" #define ACE_CC_PREPROCESOR_ARGS "" -// Why all this is not in config-g++-common.h? -#define ACE_CC_MAJOR_VERSION __GNUC__ -#define ACE_CC_MINOR_VERSION __GNUC_MINOR__ -#define ACE_CC_BETA_VERSION (0) - #if !defined (ACE_HAS_CEGCC) # error You do not seem to be using cegcc #endif diff --git a/dep/ACE_wrappers/ace/config-win32-common.h b/dep/ACE_wrappers/ace/config-win32-common.h index 2debc3362..19fe2ad29 100644 --- a/dep/ACE_wrappers/ace/config-win32-common.h +++ b/dep/ACE_wrappers/ace/config-win32-common.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-win32-common.h 91448 2010-08-24 14:22:13Z johnnyw $ +// $Id: config-win32-common.h 92120 2010-10-01 12:00:01Z johnnyw $ #ifndef ACE_CONFIG_WIN32_COMMON_H @@ -166,11 +166,6 @@ #define ACE_HAS_GPERF -// By default, don't include RCS Id strings in object code. -#if !defined (ACE_USE_RCSID) -# define ACE_USE_RCSID 0 -#endif /* ! ACE_USE_RCSID */ - // ---------------- platform features or lack of them ------------- // By default WIN32 has FD_SETSIZE of 64, which places the limit @@ -305,12 +300,11 @@ #define ACE_MKDIR_LACKS_MODE #define ACE_SIZEOF_LONG_LONG 8 -// Green Hills Native x86 does not support __int64 keyword -// Neither does mingw32. + #if !defined (ACE_LACKS_LONGLONG_T) && !defined (__MINGW32__) #define ACE_INT64_TYPE signed __int64 #define ACE_UINT64_TYPE unsigned __int64 -#endif /* (ghs) */ +#endif #if defined (__MINGW32__) #define ACE_INT64_TYPE signed long long diff --git a/dep/ACE_wrappers/ace/config-win32-dmc.h b/dep/ACE_wrappers/ace/config-win32-dmc.h index 054e57448..77c4795b3 100644 --- a/dep/ACE_wrappers/ace/config-win32-dmc.h +++ b/dep/ACE_wrappers/ace/config-win32-dmc.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: config-win32-dmc.h 91285 2010-08-05 08:29:30Z johnnyw $ +// $Id: config-win32-dmc.h 92102 2010-09-30 08:14:15Z johnnyw $ // The following configuration file contains defines for Digital Mars compilers. @@ -28,10 +28,8 @@ # define ACE_CC_MAJOR_VERSION (1) # define ACE_CC_MINOR_VERSION (8) # define ACE_CC_BETA_VERSION (9) -# ifndef ACE_USING_MCPP_PREPROCESSOR -# define ACE_CC_PREPROCESSOR "DMC.EXE" -# define ACE_CC_PREPROCESSOR_ARGS "-E" -# endif +# define ACE_CC_PREPROCESSOR "DMC.EXE" +# define ACE_CC_PREPROCESSOR_ARGS "-E" // Microsoft's standard cpp library auto_ptr doesn't have reset (). # define ACE_AUTO_PTR_LACKS_RESET @@ -46,24 +44,19 @@ #define ACE_WCSDUP_EQUIVALENT ::_wcsdup // This section above was extracted from config-win32-msvc -# define ACE_EXPORT_NESTED_CLASSES 1 -# define ACE_HAS_CPLUSPLUS_HEADERS 1 -# define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 -# define ACE_HAS_SIG_ATOMIC_T 1 -# define ACE_HAS_STANDARD_CPP_LIBRARY 0 -# define ACE_HAS_STDCPP_STL_INCLUDES 1 -# define ACE_HAS_STRING_CLASS 1 -# define ACE_HAS_TEMPLATE_TYPEDEFS 1 -# define ACE_HAS_USER_MODE_MASKS 1 -//# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -# define ACE_LACKS_STRPTIME 1 -//# define ACE_LACKS_PRAGMA_ONCE 1 -//# define ACE_NEW_THROWS_EXCEPTIONS 1 -# define ACE_SIZEOF_LONG_DOUBLE 10 -# define ACE_TEMPLATES_REQUIRE_SOURCE 1 -// Changed ACE_TEXT to ACE_TEXT in the following two lines -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# define ACE_HAS_STRBUF_T +#define ACE_EXPORT_NESTED_CLASSES 1 +#define ACE_HAS_CPLUSPLUS_HEADERS 1 +#define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 +#define ACE_HAS_SIG_ATOMIC_T 1 +#define ACE_HAS_STANDARD_CPP_LIBRARY 0 +#define ACE_HAS_STDCPP_STL_INCLUDES 1 +#define ACE_HAS_STRING_CLASS 1 +#define ACE_HAS_USER_MODE_MASKS 1 +#define ACE_LACKS_STRPTIME 1 +#define ACE_SIZEOF_LONG_DOUBLE 10 +#define ACE_TEMPLATES_REQUIRE_SOURCE 1 +#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 +#define ACE_HAS_STRBUF_T #define ACE_HAS_3_PARAM_WCSTOK #define ACE_USES_OLD_IOSTREAMS #define ACE_LACKS_UCONTEXT_H diff --git a/dep/ACE_wrappers/ace/config-win32-ghs.h b/dep/ACE_wrappers/ace/config-win32-ghs.h deleted file mode 100644 index 8f84b3894..000000000 --- a/dep/ACE_wrappers/ace/config-win32-ghs.h +++ /dev/null @@ -1,92 +0,0 @@ -// -*- C++ -*- -// $Id: config-win32-ghs.h 91285 2010-08-05 08:29:30Z johnnyw $ - -// The following configuration file contains defines for Green Hills compilers. - -#ifndef ACE_CONFIG_WIN32_GHS_H -#define ACE_CONFIG_WIN32_GHS_H -#include /**/ "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -#ifndef WIN32 -# define WIN32 -#endif /* WIN32 */ - -#undef _M_IX86 -// This turns on ACE_HAS_PENTIUM -#define _M_IX86 500 -// GHS does not provide DLL support -#define ACE_HAS_DLL 0 -#define TAO_HAS_DLL 0 -#undef _DLL - -//Green Hills Native x86 does not support structural exceptions -# undef ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS -# undef ACE_HAS_WCHAR -# define ACE_CONFIG_INCLUDE_GHS_COMMON -# include "ace/config-ghs-common.h" - -// Changed ACE_TEXT to ACE_TEXT in the following line -# define ACE_CC_NAME ACE_TEXT ("Green Hills C++") -# define ACE_CC_MAJOR_VERSION (1) -# define ACE_CC_MINOR_VERSION (8) -# define ACE_CC_BETA_VERSION (9) -# ifndef ACE_USING_MCPP_PREPROCESSOR -# define ACE_CC_PREPROCESSOR "GCX.EXE" -# define ACE_CC_PREPROCESSOR_ARGS "-E" -# endif - -// GHS uses Microsoft's standard cpp library, which has auto_ptr. -# undef ACE_LACKS_AUTO_PTR -// Microsoft's standard cpp library auto_ptr doesn't have reset (). -# define ACE_AUTO_PTR_LACKS_RESET - -#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) - -// This section below was extracted from config-win32-msvc -#define ACE_HAS_ITOA -#define ACE_ITOA_EQUIVALENT ::_itoa -#define ACE_STRCASECMP_EQUIVALENT ::_stricmp -#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp -#define ACE_WCSDUP_EQUIVALENT ::_wcsdup -// This section above was extracted from config-win32-msvc - -# define ACE_EXPORT_NESTED_CLASSES 1 -# define ACE_HAS_CPLUSPLUS_HEADERS 1 -# define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 -# define ACE_HAS_SIG_ATOMIC_T 1 -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_HAS_STDCPP_STL_INCLUDES 1 -# define ACE_HAS_STRING_CLASS 1 -# define ACE_HAS_TEMPLATE_TYPEDEFS 1 -# define ACE_HAS_USER_MODE_MASKS 1 -# define ACE_LACKS_ACE_IOSTREAM 1 -//# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -# define ACE_LACKS_STRPTIME 1 -//# define ACE_LACKS_PRAGMA_ONCE 1 -# define ACE_LACKS_STRRECVFD 1 -//# define ACE_NEW_THROWS_EXCEPTIONS 1 -# define ACE_SIZEOF_LONG_DOUBLE 10 -# define ACE_TEMPLATES_REQUIRE_SOURCE 1 -# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u" -# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d" -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -// Set the following to zero to placate SString.h ACE_WString CTOR -# undef ACE_WSTRING_HAS_USHORT_SUPPORT - -// Green Hills Native x86 does not support __int64 keyword -# define ACE_LACKS_LONGLONG_T - -/* need to ensure these are included before */ -# include -# include - -# if !defined (ACE_LD_DECORATOR_STR) && defined (_DEBUG) -# define ACE_LD_DECORATOR_STR ACE_TEXT ("d") -# endif - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_WIN32_GHS_H */ diff --git a/dep/ACE_wrappers/ace/config-win32-mingw.h b/dep/ACE_wrappers/ace/config-win32-mingw.h index 0a0ff292f..58635b74c 100644 --- a/dep/ACE_wrappers/ace/config-win32-mingw.h +++ b/dep/ACE_wrappers/ace/config-win32-mingw.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: config-win32-mingw.h 87167 2009-10-19 19:33:53Z olli $ +// $Id: config-win32-mingw.h 92102 2010-09-30 08:14:15Z johnnyw $ // // The following configuration file is designed to work for win32 @@ -14,15 +14,9 @@ # error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ -#define ACE_CC_NAME ACE_TEXT ("g++") #define ACE_CC_PREPROCESSOR "cpp" #define ACE_CC_PREPROCESOR_ARGS "" -// Why all this is not in config-g++-common.h? -#define ACE_CC_MAJOR_VERSION __GNUC__ -#define ACE_CC_MINOR_VERSION __GNUC_MINOR__ -#define ACE_CC_BETA_VERSION (0) - #if !defined(__MINGW32__) # error You do not seem to be using mingw32 #endif diff --git a/dep/ACE_wrappers/ace/config-win32-msvc-10.h b/dep/ACE_wrappers/ace/config-win32-msvc-10.h index 882a33e0a..f915cb22c 100644 --- a/dep/ACE_wrappers/ace/config-win32-msvc-10.h +++ b/dep/ACE_wrappers/ace/config-win32-msvc-10.h @@ -3,7 +3,7 @@ /** * @file config-win32-msvc-10.h * - * $Id: config-win32-msvc-10.h 91285 2010-08-05 08:29:30Z johnnyw $ + * $Id: config-win32-msvc-10.h 91685 2010-09-09 09:35:14Z johnnyw $ * * @brief Microsoft Visual C++ 10.0 configuration file. * @@ -78,7 +78,6 @@ #define ACE_LACKS_STRRECVFD #define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_TEMPLATE_TYPEDEFS #define ACE_TEMPLATES_REQUIRE_SOURCE // Platform provides ACE_TLI function prototypes. diff --git a/dep/ACE_wrappers/ace/config-win32-msvc-7.h b/dep/ACE_wrappers/ace/config-win32-msvc-7.h index 016456e96..d7fb64078 100644 --- a/dep/ACE_wrappers/ace/config-win32-msvc-7.h +++ b/dep/ACE_wrappers/ace/config-win32-msvc-7.h @@ -3,7 +3,7 @@ /** * @file config-win32-msvc-7.h * - * $Id: config-win32-msvc-7.h 91285 2010-08-05 08:29:30Z johnnyw $ + * $Id: config-win32-msvc-7.h 91685 2010-09-09 09:35:14Z johnnyw $ * * @brief Microsoft Visual C++ 7.0 configuration file. * @@ -53,7 +53,6 @@ #define ACE_LACKS_STRRECVFD #define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_TEMPLATE_TYPEDEFS #define ACE_TEMPLATES_REQUIRE_SOURCE // Platform provides ACE_TLI function prototypes. diff --git a/dep/ACE_wrappers/ace/config-win32-msvc-8.h b/dep/ACE_wrappers/ace/config-win32-msvc-8.h index 9f1a7301f..ef13986f9 100644 --- a/dep/ACE_wrappers/ace/config-win32-msvc-8.h +++ b/dep/ACE_wrappers/ace/config-win32-msvc-8.h @@ -3,7 +3,7 @@ /** * @file config-win32-msvc-8.h * - * $Id: config-win32-msvc-8.h 91285 2010-08-05 08:29:30Z johnnyw $ + * $Id: config-win32-msvc-8.h 91685 2010-09-09 09:35:14Z johnnyw $ * * @brief Microsoft Visual C++ 8.0 configuration file. * @@ -82,7 +82,6 @@ #define ACE_LACKS_STRRECVFD #define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_TEMPLATE_TYPEDEFS #define ACE_TEMPLATES_REQUIRE_SOURCE // Platform provides ACE_TLI function prototypes. diff --git a/dep/ACE_wrappers/ace/config-win32-msvc-9.h b/dep/ACE_wrappers/ace/config-win32-msvc-9.h index f0282fc62..884f97534 100644 --- a/dep/ACE_wrappers/ace/config-win32-msvc-9.h +++ b/dep/ACE_wrappers/ace/config-win32-msvc-9.h @@ -3,7 +3,7 @@ /** * @file config-win32-msvc-9.h * - * $Id: config-win32-msvc-9.h 91285 2010-08-05 08:29:30Z johnnyw $ + * $Id: config-win32-msvc-9.h 91685 2010-09-09 09:35:14Z johnnyw $ * * @brief Microsoft Visual C++ 9.0 configuration file. * @@ -78,7 +78,6 @@ #define ACE_LACKS_STRRECVFD #define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_TEMPLATE_TYPEDEFS #define ACE_TEMPLATES_REQUIRE_SOURCE // Platform provides ACE_TLI function prototypes. diff --git a/dep/ACE_wrappers/ace/config-win32-msvc.h b/dep/ACE_wrappers/ace/config-win32-msvc.h index 6f62477b9..6b84ac234 100644 --- a/dep/ACE_wrappers/ace/config-win32-msvc.h +++ b/dep/ACE_wrappers/ace/config-win32-msvc.h @@ -2,7 +2,7 @@ /** * @file config-win32-msvc.h * - * $Id: config-win32-msvc.h 85785 2009-06-24 18:20:42Z mitza $ + * $Id: config-win32-msvc.h 92120 2010-10-01 12:00:01Z johnnyw $ * * @brief Microsoft Visual C++ configuration file. * @@ -22,10 +22,8 @@ #endif /* ACE_CONFIG_WIN32_H */ #define ACE_CC_NAME ACE_TEXT ("Visual C++") -#ifndef ACE_USING_MCPP_PREPROCESSOR -# define ACE_CC_PREPROCESSOR "CL.EXE" -# define ACE_CC_PREPROCESSOR_ARGS "-nologo -E" -#endif +#define ACE_CC_PREPROCESSOR "CL.EXE" +#define ACE_CC_PREPROCESSOR_ARGS "-nologo -E" #define ACE_CC_MAJOR_VERSION (_MSC_VER / 100 - 6) #define ACE_CC_MINOR_VERSION (_MSC_VER % 100) @@ -140,7 +138,7 @@ // To resume any of these warning: #pragma warning(default: 4xxx) // which should be placed after these defines -#if !defined (ALL_WARNINGS) && defined(_MSC_VER) && !defined(ghs) && !defined(__MINGW32__) +#if !defined (ALL_WARNINGS) && defined(_MSC_VER) && !defined(__MINGW32__) # pragma warning(disable: 4127) /* constant expression for TRACE/ASSERT */ # pragma warning(disable: 4134) /* message map member fxn casts */ # pragma warning(disable: 4511) /* private copy constructors are good to have */ diff --git a/dep/ACE_wrappers/ace/config-win32.h b/dep/ACE_wrappers/ace/config-win32.h index af946518c..89d8d68bc 100644 --- a/dep/ACE_wrappers/ace/config-win32.h +++ b/dep/ACE_wrappers/ace/config-win32.h @@ -3,7 +3,7 @@ /** * @file config-win32.h * - * $Id: config-win32.h 85057 2009-04-08 10:59:58Z msmit $ + * $Id: config-win32.h 92120 2010-10-01 12:00:01Z johnnyw $ * * @brief Microsoft Windows configuration file. * @@ -35,8 +35,6 @@ # include "ace/config-win32-borland.h" #elif defined (_MSC_VER) # include "ace/config-win32-msvc.h" -#elif defined (ghs) -# include "ace/config-win32-ghs.h" #elif defined (ACE_HAS_CEGCC) //need to be prior to MINGW32 # include "ace/config-win32-cegcc.h" #elif defined (__MINGW32__) diff --git a/dep/ACE_wrappers/ace/os_include/net/os_if.h b/dep/ACE_wrappers/ace/os_include/net/os_if.h index 3dcf5918f..d672292a6 100644 --- a/dep/ACE_wrappers/ace/os_include/net/os_if.h +++ b/dep/ACE_wrappers/ace/os_include/net/os_if.h @@ -6,7 +6,7 @@ * * sockets local interfaces * - * $Id: os_if.h 88719 2010-01-26 12:55:03Z sowayaa $ + * $Id: os_if.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -47,10 +47,6 @@ extern "C" { #endif /* __cplusplus */ -#if defined (ACE_HAS_BROKEN_IF_HEADER) - struct ifafilt; -#endif /* ACE_HAS_BROKEN_IF_HEADER */ - #if defined (ACE_LACKS_IFREQ) struct ifreq { #define IFNAMSIZ 16 diff --git a/dep/ACE_wrappers/ace/os_include/os_netdb.h b/dep/ACE_wrappers/ace/os_include/os_netdb.h index 798bf9b7a..87629474a 100644 --- a/dep/ACE_wrappers/ace/os_include/os_netdb.h +++ b/dep/ACE_wrappers/ace/os_include/os_netdb.h @@ -6,7 +6,7 @@ * * definitions for network database operations * - * $Id: os_netdb.h 84660 2009-03-01 20:22:37Z olli $ + * $Id: os_netdb.h 91743 2010-09-13 18:24:51Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -40,7 +40,7 @@ extern "C" #if !defined (ACE_LACKS_NETDB_H) # include /**/ #endif /* !ACE_LACKS_NETDB_H */ - + #if defined (ACE_LACKS_HOSTENT) struct hostent { char *h_name; /* official name of host */ diff --git a/dep/ACE_wrappers/ace/os_include/os_pthread.h b/dep/ACE_wrappers/ace/os_include/os_pthread.h index 368f4254a..64f1b7553 100644 --- a/dep/ACE_wrappers/ace/os_include/os_pthread.h +++ b/dep/ACE_wrappers/ace/os_include/os_pthread.h @@ -6,7 +6,7 @@ * * threads * - * $Id: os_pthread.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_pthread.h 91781 2010-09-15 12:49:15Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -43,10 +43,6 @@ # define ACE_DONT_INCLUDE_ACE_SIGNAL_H # include "ace/os_include/os_signal.h" # undef ACE_DONT_INCLUDE_ACE_SIGNAL_H -# if defined (DIGITAL_UNIX) -# define pthread_self __pthread_self -extern "C" pthread_t pthread_self (void); -# endif /* DIGITAL_UNIX */ # endif /* ACE_HAS_PTHREADS */ @@ -79,8 +75,7 @@ extern "C" pthread_t pthread_self (void); // programs to have their own ACE-wide "default". // PROCESS-level values -# if (defined (_POSIX_PRIORITY_SCHEDULING) || defined (ACE_TANDEM_T1248_PTHREADS)) \ - && !defined(_UNICOS) && !defined(UNIXWARE_7_1) +# if (defined (_POSIX_PRIORITY_SCHEDULING) || defined (ACE_TANDEM_T1248_PTHREADS)) # define ACE_PROC_PRI_FIFO_MIN (sched_get_priority_min(SCHED_FIFO)) # define ACE_PROC_PRI_RR_MIN (sched_get_priority_min(SCHED_RR)) # if defined (HPUX) @@ -94,14 +89,13 @@ extern "C" pthread_t pthread_self (void); # else # define ACE_PROC_PRI_OTHER_MIN (sched_get_priority_min(SCHED_OTHER)) # endif /* HPUX */ -# else /* UNICOS is missing a sched_get_priority_min() implementation, - SCO too */ +# else /* UNICOS is missing a sched_get_priority_min() implementation */ # define ACE_PROC_PRI_FIFO_MIN 0 # define ACE_PROC_PRI_RR_MIN 0 # define ACE_PROC_PRI_OTHER_MIN 0 # endif -# if defined (_POSIX_PRIORITY_SCHEDULING) && !defined(UNIXWARE_7_1) +# if defined (_POSIX_PRIORITY_SCHEDULING) # define ACE_PROC_PRI_FIFO_MAX (sched_get_priority_max(SCHED_FIFO)) # define ACE_PROC_PRI_RR_MAX (sched_get_priority_max(SCHED_RR)) # if defined (HPUX) @@ -110,7 +104,7 @@ extern "C" pthread_t pthread_self (void); # else # define ACE_PROC_PRI_OTHER_MAX (sched_get_priority_max(SCHED_OTHER)) # endif /* HPUX */ -# else /* SCO missing sched_get_priority_max() implementation */ +# else # define ACE_PROC_PRI_FIFO_MAX 59 # define ACE_PROC_PRI_RR_MAX 59 # define ACE_PROC_PRI_OTHER_MAX 59 @@ -298,7 +292,6 @@ extern "C" pthread_t pthread_self (void); # endif /* ACE_HAS_STHREADS */ /* MM-Graz: prevent warnings */ -# if !defined (UNIXWARE_7_1) # undef THR_BOUND # undef THR_NEW_LWP # undef THR_DETACHED @@ -313,15 +306,10 @@ extern "C" pthread_t pthread_self (void); # define THR_SCHED_FIFO 0x00020000 # define THR_SCHED_RR 0x00040000 # define THR_SCHED_DEFAULT 0x00080000 -# endif /* UNIXWARE_7_1 */ # define THR_JOINABLE 0x00010000 -# if defined (ACE_HAS_IRIX62_THREADS) -# define THR_SCOPE_SYSTEM 0x00100000 -# else -# define THR_SCOPE_SYSTEM THR_BOUND -# endif /*ACE_HAS_IRIX62_THREADS*/ +# define THR_SCOPE_SYSTEM 0x00100000 # define THR_SCOPE_PROCESS 0x00200000 # define THR_INHERIT_SCHED 0x00400000 diff --git a/dep/ACE_wrappers/ace/os_include/os_pwd.h b/dep/ACE_wrappers/ace/os_include/os_pwd.h index b1bc94af3..be00448a9 100644 --- a/dep/ACE_wrappers/ace/os_include/os_pwd.h +++ b/dep/ACE_wrappers/ace/os_include/os_pwd.h @@ -6,7 +6,7 @@ * * password structure * - * $Id: os_pwd.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_pwd.h 91683 2010-09-09 09:07:49Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -45,11 +45,6 @@ extern "C" # endif /* AIX and VAC++ 4 */ #endif /* !ACE_WIN32 */ -#if defined (DIGITAL_UNIX) - extern int _Pgetpwnam_r (const char *, struct passwd *, - char *, size_t, struct passwd **); -#endif /* DIGITAL_UNIX */ - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/dep/ACE_wrappers/ace/os_include/os_signal.h b/dep/ACE_wrappers/ace/os_include/os_signal.h index dbda2a67b..667f28401 100644 --- a/dep/ACE_wrappers/ace/os_include/os_signal.h +++ b/dep/ACE_wrappers/ace/os_include/os_signal.h @@ -6,7 +6,7 @@ * * signals * - * $Id: os_signal.h 87480 2009-11-11 11:38:15Z olli $ + * $Id: os_signal.h 91781 2010-09-15 12:49:15Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -32,12 +32,6 @@ } #endif /* !ACE_LACKS_SIGNAL_H */ -// This must come after signal.h is #included. -#if defined (SCO) -# define SIGIO SIGPOLL -# include /**/ -#endif /* SCO */ - #if defined (ACE_HAS_SIGINFO_T) # if !defined (ACE_LACKS_SIGINFO_H) # if defined (__QNX__) || defined (__OpenBSD__) || defined (__INTERIX) @@ -175,9 +169,6 @@ extern "C" #elif defined (ACE_WIN32) typedef void (__cdecl *ACE_SignalHandler)(int); typedef void (__cdecl *ACE_SignalHandlerV)(int); -#elif defined (ACE_HAS_UNIXWARE_SVR4_SIGNAL_T) - typedef void (*ACE_SignalHandler)(int); - typedef void (*ACE_SignalHandlerV)(...); #elif defined (INTEGRITY) typedef void (*ACE_SignalHandler)(); typedef void (*ACE_SignalHandlerV)(int); @@ -215,26 +206,6 @@ extern "C" # endif /* ACE_SIGRTMAX */ #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ -#if defined (DIGITAL_UNIX) - // sigwait is yet another macro on Digital UNIX 4.0, just causing - // trouble when introducing member functions with the same name. - // Thanks to Thilo Kielmann" for - // this fix. -# if defined (__DECCXX_VER) -# undef sigwait - // cxx on Digital Unix 4.0 needs this declaration. With it, - // <::_Psigwait> works with cxx -pthread. g++ does _not_ need - // it. - int _Psigwait __((const sigset_t *set, int *sig)); -# endif /* __DECCXX_VER */ -#elif !defined (ACE_HAS_SIGWAIT) -# if defined(ACE_HAS_RTEMS) - int sigwait (const sigset_t *set, int *sig); -# else - int sigwait (sigset_t *set); -# endif /* ACE_HAS_RTEMS */ -#endif /* ! DIGITAL_UNIX && ! ACE_HAS_SIGWAIT */ - #if !defined (ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE) int pthread_sigmask(int, const sigset_t *, sigset_t *); #endif /*!ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE */ diff --git a/dep/ACE_wrappers/ace/os_include/os_stdlib.h b/dep/ACE_wrappers/ace/os_include/os_stdlib.h index 6a675d54e..863a50802 100644 --- a/dep/ACE_wrappers/ace/os_include/os_stdlib.h +++ b/dep/ACE_wrappers/ace/os_include/os_stdlib.h @@ -6,7 +6,7 @@ * * standard library definitions * - * $Id: os_stdlib.h 83948 2008-12-02 13:55:34Z jtc $ + * $Id: os_stdlib.h 91683 2010-09-09 09:07:49Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -53,10 +53,6 @@ extern "C" #else #endif /* ACE_HAS_BROKEN_RANDR */ -#if defined (DIGITAL_UNIX) - extern int _Prand_r (unsigned int *seedptr); -#endif /* DIGITAL_UNIX */ - #if defined (ACE_LACKS_PUTENV_PROTOTYPE) int putenv (char *); #endif /* ACE_LACKS_PUTENV_PROTOTYPE */ diff --git a/dep/ACE_wrappers/ace/os_include/os_stropts.h b/dep/ACE_wrappers/ace/os_include/os_stropts.h index e64717a95..daf7d41a2 100644 --- a/dep/ACE_wrappers/ace/os_include/os_stropts.h +++ b/dep/ACE_wrappers/ace/os_include/os_stropts.h @@ -6,7 +6,7 @@ * * STREAMS interface (STREAMS) * - * $Id: os_stropts.h 84660 2009-03-01 20:22:37Z olli $ + * $Id: os_stropts.h 92179 2010-10-08 07:50:07Z olli $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -34,7 +34,7 @@ #if !defined (ACE_LACKS_SYS_IOCTL_H) # include /**/ -#endif /* !ACE_LACKS_IOCTL_H */ +#endif /* !ACE_LACKS_SYS_IOCTL_H */ #if defined (ACE_HAS_SYS_FILIO_H) # include /**/ diff --git a/dep/ACE_wrappers/ace/os_include/os_time.h b/dep/ACE_wrappers/ace/os_include/os_time.h index e10a3b316..65972496c 100644 --- a/dep/ACE_wrappers/ace/os_include/os_time.h +++ b/dep/ACE_wrappers/ace/os_include/os_time.h @@ -6,7 +6,7 @@ * * time types * - * $Id: os_time.h 87270 2009-10-29 21:47:47Z olli $ + * $Id: os_time.h 91683 2010-09-09 09:07:49Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -104,13 +104,6 @@ typedef struct timespec * ACE_TIMESPEC_PTR; typedef const struct timespec * ACE_TIMESPEC_PTR; #endif /* ACE_LACKS_CONST_TIMESPEC_PTR */ -#if defined (DIGITAL_UNIX) - extern char *_Pctime_r (const time_t *, char *); - extern struct tm *_Plocaltime_r (const time_t *, struct tm *); - extern struct tm *_Pgmtime_r (const time_t *, struct tm *); - extern char *_Pasctime_r (const struct tm *, char *); -#endif /* DIGITAL_UNIX */ - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/dep/ACE_wrappers/ace/os_include/os_unistd.h b/dep/ACE_wrappers/ace/os_include/os_unistd.h index ee685d262..61b07cdd3 100644 --- a/dep/ACE_wrappers/ace/os_include/os_unistd.h +++ b/dep/ACE_wrappers/ace/os_include/os_unistd.h @@ -6,7 +6,7 @@ * * standard symbolic constants and types * - * $Id: os_unistd.h 87125 2009-10-15 17:34:25Z wotte $ + * $Id: os_unistd.h 92183 2010-10-08 08:44:15Z olli $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -130,21 +130,6 @@ extern "C" u_int ualarm (u_int usecs, u_int interval); #endif /* ACE_LACKS_UALARM_PROTOTYPE */ -#if defined (ACE_LACKS_PREAD_PROTOTYPE) && (_XOPEN_SOURCE - 0) < 500 - // _XOPEN_SOURCE == 500 Single Unix conformance - // It seems that _XOPEN_SOURCE == 500 means that the prototypes are - // already defined in the system headers. - ssize_t pread (int fd, - void *buf, - size_t nbytes, - ACE_OFF_T offset); - - ssize_t pwrite (int fd, - const void *buf, - size_t n, - ACE_OFF_T offset); -#endif /* ACE_LACKS_PREAD_PROTOTYPE && (_XOPEN_SOURCE - 0) < 500 */ - #if defined (ACE_LACKS_GETPGID_PROTOTYPE) && \ !defined (_XOPEN_SOURCE) && !defined (_XOPEN_SOURCE_EXTENDED) pid_t getpgid (pid_t pid); diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_mman.h b/dep/ACE_wrappers/ace/os_include/sys/os_mman.h index b39fc48cb..5a8337d21 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_mman.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_mman.h @@ -6,7 +6,7 @@ * * memory management declarations * - * $Id: os_mman.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_mman.h 91688 2010-09-09 11:21:50Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -31,14 +31,7 @@ #endif /* ACE_LACKS_MMAP */ #if !defined (ACE_LACKS_SYS_MMAN_H) - // Fixes a problem with HP/UX. -# if defined (ACE_HAS_BROKEN_MMAP_H) - extern "C" { -# endif /* ACE_HAS_BROKEN_MMAP_H */ # include /**/ -# if defined (ACE_HAS_BROKEN_MMAP_H) - } -# endif /* ACE_HAS_BROKEN_MMAP_H */ #endif /* ACE_LACKS_SYS_MMAN_H */ // Place all additions (especially function declarations) within extern "C" {} @@ -88,13 +81,12 @@ PAGE_NOCACHE */ # define ACE_MAP_FIXED MAP_FIXED # endif /* ! ACE_MAP_FIXED */ -# if !defined (MAP_FAILED) || defined (ACE_HAS_BROKEN_MAP_FAILED) -# undef MAP_FAILED +# if !defined (MAP_FAILED) # define MAP_FAILED ((void *) -1) # elif defined (ACE_HAS_LONG_MAP_FAILED) # undef MAP_FAILED # define MAP_FAILED ((void *) -1L) -# endif /* !MAP_FAILED || ACE_HAS_BROKEN_MAP_FAILED */ +# endif /* !MAP_FAILED */ #if !defined (PROT_RDWR) # define PROT_RDWR (PROT_READ|PROT_WRITE) diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_resource.h b/dep/ACE_wrappers/ace/os_include/sys/os_resource.h index 23486b616..7f644a09d 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_resource.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_resource.h @@ -6,7 +6,7 @@ * * definitions for XSI resource operations * - * $Id: os_resource.h 81697 2008-05-14 18:33:11Z johnnyw $ + * $Id: os_resource.h 91781 2010-09-15 12:49:15Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -52,13 +52,13 @@ extern "C" // There must be a better way to do this... #if !defined (RLIMIT_NOFILE) && !defined (ACE_LACKS_RLIMIT_NOFILE) -# if defined (linux) || defined (AIX) || defined (SCO) +# if defined (linux) || defined (AIX) # if defined (RLIMIT_OFILE) # define RLIMIT_NOFILE RLIMIT_OFILE # else # define RLIMIT_NOFILE 200 # endif /* RLIMIT_OFILE */ -# endif /* defined (linux) || defined (AIX) || defined (SCO) */ +# endif /* defined (linux) || defined (AIX) */ #endif /* RLIMIT_NOFILE */ #if defined (ACE_WIN32) diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_socket.h b/dep/ACE_wrappers/ace/os_include/sys/os_socket.h index 676041747..9a2ff009f 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_socket.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_socket.h @@ -6,7 +6,7 @@ * * main sockets header * - * $Id: os_socket.h 85015 2009-04-03 12:27:59Z johnnyw $ + * $Id: os_socket.h 91781 2010-09-15 12:49:15Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -40,7 +40,7 @@ extern "C" { #endif /* __cplusplus */ -#if !defined (ACE_HAS_MSG) && !defined (SCO) +#if !defined (ACE_HAS_MSG) struct msghdr {}; #endif /* ACE_HAS_MSG */ diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_types.h b/dep/ACE_wrappers/ace/os_include/sys/os_types.h index 963826537..195f24cff 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_types.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_types.h @@ -6,7 +6,7 @@ * * data types * - * $Id: os_types.h 88515 2010-01-13 08:47:38Z johnnyw $ + * $Id: os_types.h 91683 2010-09-09 09:07:49Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -74,7 +74,7 @@ typedef double ACE_timer_t; #elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) || defined(ACE_MVS) || defined(__INTERIX) || \ (defined (ACE_OPENVMS) && defined (_LARGEFILE)) typedef off_t ACE_LOFF_T; -#elif defined (__sgi) || defined (AIX) || defined (HPUX) || defined (__QNX__) +#elif defined (AIX) || defined (HPUX) || defined (__QNX__) typedef off64_t ACE_LOFF_T; #elif defined (__sun) typedef offset_t ACE_LOFF_T; diff --git a/dep/ACE_wrappers/configure.ac b/dep/ACE_wrappers/configure.ac index dcf1aa233..fa5b4a55d 100644 --- a/dep/ACE_wrappers/configure.ac +++ b/dep/ACE_wrappers/configure.ac @@ -1,4 +1,4 @@ -dnl $Id: configure.ac 91345 2010-08-12 16:20:20Z shuston $ +dnl $Id: configure.ac 92183 2010-10-08 08:44:15Z olli $ dnl An autoconf script to automatically configure ACE. dnl Process this file with autoconf to produce a configure script. @@ -16,7 +16,7 @@ define([ACE_VERSION], patsubst(esyscmd(grep ACE_VERSION ace/Version.h | sed 's/. AC_INIT([ACE],[ACE_VERSION],[ace-bugs@cs.wustl.edu],[ace]) -AC_REVISION([$Id: configure.ac 91345 2010-08-12 16:20:20Z shuston $]) +AC_REVISION([$Id: configure.ac 92183 2010-10-08 08:44:15Z olli $]) AC_COPYRIGHT([ACE(TM), TAO(TM), CIAO(TM), and CoSMIC(TM) (henceforth referred to as "DOC software") are copyrighted by Douglas C. @@ -3480,30 +3480,6 @@ if test $ac_cv_func_gethrtime = "yes"; then [#include ]) fi -AC_CHECK_FUNC([pread], - [AC_CHECK_FUNC([pwrite], - [ - AC_DEFINE([ACE_HAS_P_READ_WRITE]) - dnl Check if _XOPEN_SOURCE=500 macro is needed to make the pread() and - dnl pwrite() prototypes visible. - ACE_CACHE_CHECK([for pread prototype], - [ace_cv_lib_has_pread_prototype], - [ - ace_save_CPPFLAGS="$CPPFLAGS" - ace_no_xopen="-U_XOPEN_SOURCE" - CPPFLAGS="$CPPFLAGS $ace_no_xopen" - AC_EGREP_HEADER([[^_]+pread], [unistd.h], - [ - ace_cv_lib_has_pread_prototype=yes - ], - [ - ace_cv_lib_has_pread_prototype=no - ]) - dnl Reset the compiler flags - CPPFLAGS="$ace_save_CPPFLAGS" - ],,[AC_DEFINE([ACE_LACKS_PREAD_PROTOTYPE])]) - ],)],) - ACE_CHECK_LACKS_FUNCS(readv writev) ACE_CHECK_HAS_FUNCS(set_t_errno) @@ -7118,7 +7094,7 @@ the generated ace/config.h file and the following information: ACE 'configure' Script Information ================================== - [RCS] translit([$Id: configure.ac 91345 2010-08-12 16:20:20Z shuston $], [$"]) + [RCS] translit([$Id: configure.ac 92183 2010-10-08 08:44:15Z olli $], [$"]) ACE Version: ACE_VERSION diff --git a/dep/ACE_wrappers/m4/config_h.m4 b/dep/ACE_wrappers/m4/config_h.m4 index a619ee9b8..f50ad591a 100644 --- a/dep/ACE_wrappers/m4/config_h.m4 +++ b/dep/ACE_wrappers/m4/config_h.m4 @@ -1,5 +1,5 @@ dnl ------------------------------------------------------------------------- -dnl $Id: config_h.m4 87480 2009-11-11 11:38:15Z olli $ +dnl $Id: config_h.m4 92183 2010-10-08 08:44:15Z olli $ dnl dnl config_h.m4 dnl @@ -781,9 +781,6 @@ AH_TEMPLATE([ACE_LACKS_TIMESPEC_T], AH_TEMPLATE([ACE_LACKS_STRTOK_R_PROTOTYPE], [Platform/compiler lacks the strtok_r() prototype]) -AH_TEMPLATE([ACE_LACKS_PREAD_PROTOTYPE], -[Platform/compiler lacks the pread() and pwrite() prototypes]) - AH_TEMPLATE([ACE_LACKS_CHAR_RIGHT_SHIFTS], [Compiler does not have any istream operator>> for chars, u_chars, or signed chars.]) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 4801a51c7..da266e981 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10873" + #define REVISION_NR "10874" #endif // __REVISION_NR_H__ diff --git a/win/VC100/ACE_vc10.vcxproj b/win/VC100/ACE_vc10.vcxproj index 74500a7e0..b0aa94832 100644 --- a/win/VC100/ACE_vc10.vcxproj +++ b/win/VC100/ACE_vc10.vcxproj @@ -159,7 +159,7 @@ true Level3 ProgramDatabase - 4355;%(DisableSpecificWarnings) + 4355;4244;4267;%(DisableSpecificWarnings) _DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) @@ -197,7 +197,7 @@ true Level3 ProgramDatabase - 4355;4244;%(DisableSpecificWarnings) + 4355;4244;4267;%(DisableSpecificWarnings) _DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions) @@ -233,7 +233,7 @@ MultiThreadedDLL true Level3 - 4355;%(DisableSpecificWarnings) + 4355;4244;4267;%(DisableSpecificWarnings) NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) @@ -270,7 +270,7 @@ MultiThreadedDLL true Level3 - 4355;4244;%(DisableSpecificWarnings) + 4355;4244;4267;%(DisableSpecificWarnings) NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions) @@ -311,7 +311,7 @@ true Level3 ProgramDatabase - 4355;%(DisableSpecificWarnings) + 4355;4244;4267;%(DisableSpecificWarnings) _DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) @@ -349,7 +349,7 @@ true Level3 ProgramDatabase - 4355;4244;%(DisableSpecificWarnings) + 4355;4244;4267;%(DisableSpecificWarnings) _DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions) @@ -528,7 +528,6 @@ - @@ -991,7 +990,6 @@ - @@ -1042,8 +1040,6 @@ - - @@ -1052,10 +1048,6 @@ - - - - @@ -1082,8 +1074,6 @@ - - @@ -1097,9 +1087,6 @@ - - - @@ -1111,7 +1098,6 @@ - @@ -1121,7 +1107,6 @@ - @@ -1155,7 +1140,6 @@ - @@ -1231,7 +1215,6 @@ - @@ -1248,7 +1231,6 @@ - @@ -1284,14 +1266,12 @@ - - @@ -1392,7 +1372,6 @@ - @@ -1424,7 +1403,6 @@ - @@ -1452,7 +1430,6 @@ - @@ -1475,7 +1452,6 @@ - @@ -1532,7 +1508,6 @@ - diff --git a/win/VC100/ACE_vc10.vcxproj.filters b/win/VC100/ACE_vc10.vcxproj.filters index 54e9a84ac..d2639ac83 100644 --- a/win/VC100/ACE_vc10.vcxproj.filters +++ b/win/VC100/ACE_vc10.vcxproj.filters @@ -978,9 +978,6 @@ Header Files - - Header Files - Header Files @@ -1131,12 +1128,6 @@ Header Files - - Header Files - - - Header Files - Header Files @@ -1161,18 +1152,6 @@ Header Files - - Header Files - - - Header Files - - - Header Files - - - Header Files - Header Files @@ -1251,12 +1230,6 @@ Header Files - - Header Files - - - Header Files - Header Files @@ -1296,15 +1269,6 @@ Header Files - - Header Files - - - Header Files - - - Header Files - Header Files @@ -1338,9 +1302,6 @@ Header Files - - Header Files - Header Files @@ -1368,9 +1329,6 @@ Header Files - - Header Files - Header Files @@ -1470,9 +1428,6 @@ Header Files - - Header Files - Header Files @@ -1698,9 +1653,6 @@ Header Files - - Header Files - Header Files @@ -1749,9 +1701,6 @@ Header Files - - Header Files - Header Files @@ -1857,9 +1806,6 @@ Header Files - - Header Files - Header Files @@ -1878,9 +1824,6 @@ Header Files - - Header Files - Header Files @@ -2184,9 +2127,6 @@ Header Files - - Header Files - Header Files @@ -2277,9 +2217,6 @@ Header Files - - Header Files - Header Files @@ -2361,9 +2298,6 @@ Header Files - - Header Files - Header Files @@ -2430,9 +2364,6 @@ Header Files - - Header Files - Header Files @@ -2601,9 +2532,6 @@ Header Files - - Header Files - Header Files @@ -3221,9 +3149,6 @@ Inline Files - - Inline Files - Inline Files diff --git a/win/VC80/ACE_vc8.vcproj b/win/VC80/ACE_vc8.vcproj index 7207668a3..bb56e1baf 100644 --- a/win/VC80/ACE_vc8.vcproj +++ b/win/VC80/ACE_vc8.vcproj @@ -60,7 +60,7 @@ WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" - DisableSpecificWarnings="4355" + DisableSpecificWarnings="4355;4244;4267" /> - - @@ -2067,14 +2063,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-all.h" > - - - - @@ -2107,22 +2095,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-integritySCA.h" > - - - - - - - - @@ -2231,14 +2203,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-rtems.h" > - - - - @@ -2291,18 +2255,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-tandem.h" > - - - - - - @@ -2347,10 +2299,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-win32-dmc.h" > - - @@ -2387,10 +2335,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-WinCE.h" > - - @@ -2823,10 +2767,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Manual_Event.h" > - - @@ -2891,10 +2831,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Message_Queue_Vx.h" > - - @@ -3035,14 +2971,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Obstack_T.h" > - - - - @@ -3579,10 +3507,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\OS_QoS.h" > - - @@ -3595,10 +3519,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.h" > - - @@ -3707,10 +3627,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Recyclable.h" > - - @@ -3799,10 +3715,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Service_Repository.h" > - - @@ -4027,10 +3939,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Synch_Options.h" > - - @@ -4856,10 +4764,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Obstack_T.inl" > - - diff --git a/win/VC90/ACE_vc9.vcproj b/win/VC90/ACE_vc9.vcproj index 78f62b01e..c07eacb99 100644 --- a/win/VC90/ACE_vc9.vcproj +++ b/win/VC90/ACE_vc9.vcproj @@ -60,7 +60,7 @@ WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" - DisableSpecificWarnings="4355;4244" + DisableSpecificWarnings="4355;4244;4267" /> - - @@ -2049,14 +2045,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-all.h" > - - - - @@ -2089,22 +2077,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-integritySCA.h" > - - - - - - - - @@ -2213,14 +2185,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-rtems.h" > - - - - @@ -2273,18 +2237,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-tandem.h" > - - - - - - @@ -2329,10 +2281,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-win32-dmc.h" > - - @@ -2369,10 +2317,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-WinCE.h" > - - @@ -2805,10 +2749,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Manual_Event.h" > - - @@ -2873,10 +2813,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Message_Queue_Vx.h" > - - @@ -3017,14 +2953,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Obstack_T.h" > - - - - @@ -3561,10 +3489,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\OS_QoS.h" > - - @@ -3577,10 +3501,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.h" > - - @@ -3689,10 +3609,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Recyclable.h" > - - @@ -3781,10 +3697,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Service_Repository.h" > - - @@ -4009,10 +3921,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Synch_Options.h" > - - @@ -4838,10 +4746,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Obstack_T.inl" > - -