diff options
Diffstat (limited to 'ace')
239 files changed, 11062 insertions, 13161 deletions
diff --git a/ace/ACE.bpg b/ace/ACE.bpg new file mode 100644 index 00000000000..7a32b122e67 --- /dev/null +++ b/ace/ACE.bpg @@ -0,0 +1,21 @@ +#------------------------------------------------------------------------------ +VERSION = BWS.01 +#------------------------------------------------------------------------------ +!ifndef ROOT +ROOT = $(MAKEDIR)\.. +!endif +#------------------------------------------------------------------------------ +MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** +DCC = $(ROOT)\bin\dcc32.exe $** +BRCC = $(ROOT)\bin\brcc32.exe $** +#------------------------------------------------------------------------------ +PROJECTS = ACER ACED +#------------------------------------------------------------------------------ +default: $(PROJECTS) +#------------------------------------------------------------------------------ + +ACER: ACER.bpr + $(MAKE) + +ACED: ACED.bpr + $(MAKE) diff --git a/ace/ACE.cpp b/ace/ACE.cpp index 0c6921c5b74..b1f02e5a883 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -123,10 +123,7 @@ ACE::compiler_beta_version (void) int ACE::terminate_process (pid_t pid) { -#if defined (ACE_HAS_PHARLAP) - ACE_UNUSED_ARG (pid); - ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) // Create a handle for the given process id. ACE_HANDLE process_handle = ::OpenProcess (PROCESS_TERMINATE, @@ -134,7 +131,7 @@ ACE::terminate_process (pid_t pid) pid); if (process_handle == ACE_INVALID_HANDLE - || process_handle == 0) + || process_handle == NULL) return -1; else { @@ -175,7 +172,7 @@ ACE::process_active (pid_t pid) ACE_HANDLE process_handle = ::OpenProcess (PROCESS_QUERY_INFORMATION, FALSE, pid); if (process_handle == ACE_INVALID_HANDLE - || process_handle == 0) + || process_handle == NULL) return 0; else { @@ -591,8 +588,8 @@ ACE::strrepl (char *s, char search, char replace) } #if !defined (ACE_HAS_WINCE) -ASYS_TCHAR * -ACE::strenvdup (const ASYS_TCHAR *str) +char * +ACE::strenvdup (const char *str) { ACE_TRACE ("ACE::strenvdup"); @@ -626,20 +623,13 @@ ACE::ldfind (const ASYS_TCHAR filename[], { ACE_TRACE ("ACE::ldfind"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && \ - !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) ASYS_TCHAR expanded_filename[MAXPATHLEN]; -#if !defined (ACE_HAS_MOSTLY_UNICODE_APIS) if (::ExpandEnvironmentStringsA (filename, expanded_filename, sizeof expanded_filename)) -#else - if (::ExpandEnvironmentStringsW (filename, - expanded_filename, - sizeof expanded_filename)) -#endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ filename = expanded_filename; -#endif /* ACE_WIN32 && !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ ASYS_TCHAR tempcopy[MAXPATHLEN + 1]; ASYS_TCHAR searchpathname[MAXPATHLEN + 1]; @@ -687,7 +677,11 @@ ACE::ldfind (const ASYS_TCHAR filename[], ASYS_TCHAR *s = ACE_OS::strrchr (searchfilename, '.'); const ASYS_TCHAR *dll_suffix = - ASYS_TEXT (ACE_DLL_SUFFIX); +#if !defined (ACE_HAS_MOSTLY_UNICODE_APIS) + ACE_DLL_SUFFIX; +#else + _TEXT (ACE_DLL_SUFFIX); +#endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ if (s != 0) { @@ -1048,9 +1042,7 @@ ACE::send (ACE_HANDLE handle, size_t n, ...) #if defined (ACE_HAS_ALLOCA) iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); #else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); + ACE_NEW_RETURN (iovp, iovec[total_tuples], -1); #endif /* !defined (ACE_HAS_ALLOCA) */ va_start (argp, n); @@ -1086,9 +1078,7 @@ ACE::recv (ACE_HANDLE handle, size_t n, ...) #if defined (ACE_HAS_ALLOCA) iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); #else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); + ACE_NEW_RETURN (iovp, iovec[total_tuples], -1); #endif /* !defined (ACE_HAS_ALLOCA) */ va_start (argp, n); @@ -1843,7 +1833,7 @@ ACE::handle_timed_open (ACE_Time_Value *timeout, && (errno == EWOULDBLOCK && (timeout->sec () > 0 || timeout->usec () > 0))) // This expression checks if we were polling. - errno = ETIMEDOUT; + errno = ETIME; return handle; } @@ -1905,7 +1895,7 @@ ACE::handle_timed_accept (ACE_HANDLE listener, && timeout->usec () == 0) errno = EWOULDBLOCK; else - errno = ETIMEDOUT; + errno = ETIME; return -1; /* NOTREACHED */ case 1: @@ -2665,8 +2655,6 @@ const ASYS_TCHAR * ACE::sock_error (int error) { #if defined (ACE_WIN32) - static ASYS_TCHAR unknown_msg[64]; - switch (error) { case WSAVERNOTSUPPORTED: @@ -2758,8 +2746,7 @@ ACE::sock_error (int error) return ASYS_TEXT ("address not available"); /* NOTREACHED */ default: - ACE_OS::sprintf (unknown_msg, ASYS_TEXT ("unknown error: %d"), error); - return unknown_msg; + return ASYS_TEXT ("unknown error"); /* NOTREACHED */ } #else @@ -3128,8 +3115,8 @@ ACE::get_ip_interfaces (size_t &count, 0, 0, info, sizeof(info), &bytes, - 0, - 0); + NULL, + NULL); closesocket (sock); if (status == SOCKET_ERROR) return -1; @@ -3138,9 +3125,7 @@ ACE::get_ip_interfaces (size_t &count, if (n_interfaces == 0) return 0; - ACE_NEW_RETURN (addrs, - ACE_INET_Addr[n_interfaces], - -1); + ACE_NEW_RETURN (addrs, ACE_INET_Addr[n_interfaces], -1); // Now go through the list and transfer the good ones to the list of // because they're down or don't have an IP address. @@ -3172,89 +3157,6 @@ ACE::get_ip_interfaces (size_t &count, #else /* Winsock 2 && MSVC 5 or later */ - // PharLap ETS has kernel routines to rummage through the device - // configs and extract the interface info. Sort of a pain in the - // butt, but better than trying to figure out where it moved to in - // the registry... :-| -# if defined (ACE_HAS_PHARLAP) -# if !defined (ACE_HAS_PHARLAP_RT) - ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PHARLAP_RT */ - - // Locate all of the IP devices in the system, saving a DEVHANDLE - // for each. Then allocate the ACE_INET_Addrs needed and fetch all - // the IP addresses. To locate the devices, try the available - // device name roots and increment the device number until the - // kernel says there are no more of that type. - const size_t ACE_MAX_ETS_DEVICES = 64; // Arbitrary, but should be enough. - DEVHANDLE ip_dev[ACE_MAX_ETS_DEVICES]; - EK_TCPIPCFG *devp; - size_t i, j; - char dev_name[16]; - - count = 0; - for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) - { - // Ethernet. - ACE_OS::sprintf (dev_name, - "ether%d", - i); - ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev[count] == 0) - break; - } - for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) - { - // SLIP. - ACE_OS::sprintf (dev_name, - "sl%d", - i); - ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev[count] == 0) - break; - } - for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) - { - // PPP. - ACE_OS::sprintf (dev_name, - "ppp%d", - i); - ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev[count] == 0) - break; - } - - if (count > 0) - ACE_NEW_RETURN (addrs, - ACE_INET_Addr[count], - -1); - else - addrs = 0; - - for (i = 0, j = 0; i < count; i++) - { - devp = EtsTCPGetDeviceCfg (ip_dev[i]); - if (devp != 0) - { - addrs[j].set (0, - devp->nwIPAddress, - 0); // Already in net order. - j++; - } - // There's no call to close the DEVHANDLE. - } - - count = j; - if (count == 0 && addrs != 0) - { - delete [] addrs; - addrs = 0; - } - - return 0; - -# else /* ACE_HAS_PHARLAP */ - const TCHAR *SVCS_KEY1 = ACE_TEXT ("SYSTEM\\CurrentControlSet\\Services\\"); const TCHAR *LINKAGE_KEY1 = @@ -3274,14 +3176,14 @@ ACE::get_ip_interfaces (size_t &count, raw_buffer, raw_buflen)) return -1; - // return buffer contains 0 delimited strings + // return buffer contains NULL delimited strings ACE_Tokenizer dev_names (raw_buffer); dev_names.delimiter (ACE_TEXT('\0')); int n_interfaces = 0; // Count the number of interfaces - while (dev_names.next () != 0) + while (dev_names.next () != NULL) n_interfaces ++; // case 1. no interfaces present, empty string? OS version change? @@ -3328,7 +3230,6 @@ ACE::get_ip_interfaces (size_t &count, } } return 0; -# endif /* ACE_HAS_PHARLAP */ # endif /* Winsock 2 && MSVC 5 or later */ #elif defined (__unix) || defined (__Lynx__) || defined (_AIX) diff --git a/ace/ACE.h b/ace/ACE.h index 7ff95db5d77..665afe8ffcf 100644 --- a/ace/ACE.h +++ b/ace/ACE.h @@ -43,11 +43,9 @@ class ACE_Export ACE public: // Initialize ACE library services. static int init (void); - // Returns 0 on success, -1 on failure, and 1 if it had already been called. // Shut down ACE library services. static int fini (void); - // Returns 0 on success, -1 on failure, and 1 if it had already been called. // = ACE version information. static u_int major_version (void); @@ -442,7 +440,7 @@ public: // = String functions #if !defined (ACE_HAS_WINCE) - static ASYS_TCHAR *strenvdup (const ASYS_TCHAR *str); + static char *strenvdup (const char *str); // Return a dynamically allocated duplicate of <str>, substituting // the environment variable if <str[0] == '$'>. Note that the // pointer is allocated with <ACE_OS::malloc> and must be freed by diff --git a/ace/ACED.bpr b/ace/ACED.bpr new file mode 100644 index 00000000000..87ecf2c146b --- /dev/null +++ b/ace/ACED.bpr @@ -0,0 +1,234 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = ACED.dll +OBJFILES = obj\ACED.obj obj\ACE.obj obj\Activation_Queue.obj obj\Acceptor.obj obj\Addr.obj \ + obj\Arg_Shifter.obj obj\ARGV.obj obj\Array.obj obj\Asynch_Acceptor.obj \ + obj\Asynch_IO.obj obj\Auto_Ptr.obj obj\Basic_Types.obj obj\Connector.obj \ + obj\Containers.obj obj\CORBA_Handler.obj obj\CORBA_Ref.obj obj\Date_Time.obj \ + obj\DEV.obj obj\DEV_Addr.obj obj\DEV_Connector.obj obj\DEV_IO.obj obj\Dump.obj \ + obj\Dump_T.obj obj\Dynamic.obj obj\Dynamic_Service.obj obj\Env_Value_T.obj \ + obj\Event_Handler.obj obj\Event_Handler_T.obj obj\FIFO.obj obj\FIFO_Recv.obj \ + obj\FIFO_Recv_Msg.obj obj\FIFO_Send.obj obj\FIFO_Send_Msg.obj obj\FILE.obj \ + obj\FILE_Addr.obj obj\FILE_Connector.obj obj\FILE_IO.obj obj\Filecache.obj \ + obj\Free_List.obj obj\Future.obj obj\Get_Opt.obj obj\Handle_Set.obj \ + obj\Hash_Map_Manager.obj obj\High_Res_Timer.obj obj\INET_Addr.obj \ + obj\IO_Cntl_Msg.obj obj\IO_SAP.obj obj\IOStream.obj obj\IOStream_T.obj \ + obj\IPC_SAP.obj obj\Local_Name_Space.obj obj\Local_Name_Space_T.obj \ + obj\Local_Tokens.obj obj\LOCK_SOCK_Acceptor.obj obj\Log_Msg.obj \ + obj\Log_Record.obj obj\LSOCK.obj obj\LSOCK_Acceptor.obj obj\LSOCK_CODgram.obj \ + obj\LSOCK_Connector.obj obj\LSOCK_Dgram.obj obj\LSOCK_Stream.obj obj\Malloc.obj \ + obj\Malloc_T.obj obj\Managed_Object.obj obj\Map_Manager.obj obj\Mem_Map.obj \ + obj\Memory_Pool.obj obj\Message_Block.obj obj\Message_Queue.obj \ + obj\Method_Request.obj obj\Module.obj obj\Msg_WFMO_Reactor.obj \ + obj\Multiplexor.obj obj\Name_Proxy.obj obj\Name_Request_Reply.obj \ + obj\Name_Space.obj obj\Naming_Context.obj obj\Object_Manager.obj \ + obj\Obstack.obj obj\OS.obj obj\Parse_Node.obj obj\Pipe.obj \ + obj\Priority_Reactor.obj obj\Proactor.obj obj\Process.obj \ + obj\Process_Manager.obj obj\Profile_Timer.obj obj\Reactor.obj \ + obj\Read_Buffer.obj obj\Registry.obj obj\Registry_Name_Space.obj \ + obj\Remote_Name_Space.obj obj\Remote_Tokens.obj obj\Sched_Params.obj \ + obj\Select_Reactor.obj obj\Service_Config.obj obj\Service_Manager.obj \ + obj\Service_Object.obj obj\Service_Repository.obj obj\Service_Types.obj \ + obj\Shared_Memory.obj obj\Shared_Memory_MM.obj obj\Shared_Memory_SV.obj \ + obj\Shared_Object.obj obj\Signal.obj obj\Singleton.obj obj\SOCK.obj \ + obj\SOCK_Acceptor.obj obj\SOCK_CODgram.obj obj\SOCK_Connector.obj \ + obj\SOCK_Dgram.obj obj\SOCK_Dgram_Bcast.obj obj\SOCK_Dgram_Mcast.obj \ + obj\SOCK_IO.obj obj\SOCK_Stream.obj obj\SPIPE.obj obj\SPIPE_Acceptor.obj \ + obj\SPIPE_Addr.obj obj\SPIPE_Connector.obj obj\SPIPE_Stream.obj obj\SString.obj \ + obj\Stats.obj obj\Strategies.obj obj\Strategies_T.obj obj\Stream.obj obj\Stream_Modules.obj \ + obj\SV_Message.obj obj\SV_Message_Queue.obj obj\SV_Semaphore_Complex.obj \ + obj\SV_Semaphore_Simple.obj obj\SV_Shared_Memory.obj obj\Svc_Conf_l.obj \ + obj\Svc_Conf_y.obj obj\Svc_Handler.obj obj\Synch.obj obj\Synch_Options.obj \ + obj\Synch_T.obj obj\System_Time.obj obj\Task.obj obj\Task_T.obj obj\Thread.obj \ + obj\Thread_Manager.obj obj\Time_Request_Reply.obj obj\Timer_Hash.obj \ + obj\Timer_Hash_T.obj obj\Timer_Heap.obj obj\Timer_Heap_T.obj obj\Timer_List.obj \ + obj\Timer_List_T.obj obj\Timer_Queue.obj obj\Timer_Queue_Adapters.obj \ + obj\Timer_Queue_T.obj obj\Timer_Wheel.obj obj\Timer_Wheel_T.obj obj\TLI.obj \ + obj\TLI_Acceptor.obj obj\TLI_Connector.obj obj\TLI_Stream.obj obj\Token.obj \ + obj\Token_Collection.obj obj\Token_Invariants.obj obj\Token_Manager.obj \ + obj\Token_Request_Reply.obj obj\Trace.obj obj\TTY_IO.obj \ + obj\Typed_SV_Message.obj obj\Typed_SV_Message_Queue.obj obj\UNIX_Addr.obj \ + obj\UPIPE_Acceptor.obj obj\UPIPE_Connector.obj obj\UPIPE_Stream.obj \ + obj\WFMO_Reactor.obj obj\XtReactor.obj +RESFILES = +DEFFILE = +RESDEPEN = $(RESFILES) +LIBFILES = +LIBRARIES = VCL35.lib +SPARELIBS = VCL35.lib +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -WD -Od -Hc -w-par -w-inl -Ve -r- -k -y -v -vi- -c -b- -Vx +CFLAG2 = -D_RTLDLL -I..;$(BCB)\include;$(BCB)\include\vcl \ + -H=ace.csm +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_RTLDLL -N2obj -N0obj \ + -U.;$(BCB)\lib\obj;$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include;$(BCB)\include\vcl -$Y -$W \ + -$O- -v -JPHN -M +RFLAGS = -D_RTLDLL -i..;$(BCB)\include;$(BCB)\include\vcl +AFLAGS = /i.. /i$(BCB)\include /i$(BCB)\include\vcl \ + /d_RTLDLL /mx /w2 /zi +LFLAGS = -L.;$(BCB)\lib\obj;$(BCB)\lib;$(DEBUGLIBPATH) \ + -aa -Tpd -x -Gn -Gi -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0d32.obj sysinit.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=1 +Item0=..;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=.;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_RTLDLL +Item1=_RTLDLL;USEPACKAGES + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/ace/ACER.bpr b/ace/ACER.bpr new file mode 100644 index 00000000000..5b1c7ca3e7c --- /dev/null +++ b/ace/ACER.bpr @@ -0,0 +1,234 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = ACER.dll +OBJFILES = obj\ACER.obj obj\ACE.obj obj\Activation_Queue.obj obj\Acceptor.obj obj\Addr.obj \ + obj\Arg_Shifter.obj obj\ARGV.obj obj\Array.obj obj\Asynch_Acceptor.obj \ + obj\Asynch_IO.obj obj\Auto_Ptr.obj obj\Basic_Types.obj obj\Connector.obj \ + obj\Containers.obj obj\CORBA_Handler.obj obj\CORBA_Ref.obj obj\Date_Time.obj \ + obj\DEV.obj obj\DEV_Addr.obj obj\DEV_Connector.obj obj\DEV_IO.obj obj\Dump.obj \ + obj\Dump_T.obj obj\Dynamic.obj obj\Dynamic_Service.obj obj\Env_Value_T.obj \ + obj\Event_Handler.obj obj\Event_Handler_T.obj obj\FIFO.obj obj\FIFO_Recv.obj \ + obj\FIFO_Recv_Msg.obj obj\FIFO_Send.obj obj\FIFO_Send_Msg.obj obj\FILE.obj \ + obj\FILE_Addr.obj obj\FILE_Connector.obj obj\FILE_IO.obj obj\Filecache.obj \ + obj\Free_List.obj obj\Future.obj obj\Get_Opt.obj obj\Handle_Set.obj \ + obj\Hash_Map_Manager.obj obj\High_Res_Timer.obj obj\INET_Addr.obj \ + obj\IO_Cntl_Msg.obj obj\IO_SAP.obj obj\IOStream.obj obj\IOStream_T.obj \ + obj\IPC_SAP.obj obj\Local_Name_Space.obj obj\Local_Name_Space_T.obj \ + obj\Local_Tokens.obj obj\LOCK_SOCK_Acceptor.obj obj\Log_Msg.obj \ + obj\Log_Record.obj obj\LSOCK.obj obj\LSOCK_Acceptor.obj obj\LSOCK_CODgram.obj \ + obj\LSOCK_Connector.obj obj\LSOCK_Dgram.obj obj\LSOCK_Stream.obj obj\Malloc.obj \ + obj\Malloc_T.obj obj\Managed_Object.obj obj\Map_Manager.obj obj\Mem_Map.obj \ + obj\Memory_Pool.obj obj\Message_Block.obj obj\Message_Queue.obj \ + obj\Method_Request.obj obj\Module.obj obj\Msg_WFMO_Reactor.obj \ + obj\Multiplexor.obj obj\Name_Proxy.obj obj\Name_Request_Reply.obj \ + obj\Name_Space.obj obj\Naming_Context.obj obj\Object_Manager.obj \ + obj\Obstack.obj obj\OS.obj obj\Parse_Node.obj obj\Pipe.obj \ + obj\Priority_Reactor.obj obj\Proactor.obj obj\Process.obj \ + obj\Process_Manager.obj obj\Profile_Timer.obj obj\Reactor.obj \ + obj\Read_Buffer.obj obj\Registry.obj obj\Registry_Name_Space.obj \ + obj\Remote_Name_Space.obj obj\Remote_Tokens.obj obj\Sched_Params.obj \ + obj\Select_Reactor.obj obj\Service_Config.obj obj\Service_Manager.obj \ + obj\Service_Object.obj obj\Service_Repository.obj obj\Service_Types.obj \ + obj\Shared_Memory.obj obj\Shared_Memory_MM.obj obj\Shared_Memory_SV.obj \ + obj\Shared_Object.obj obj\Signal.obj obj\Singleton.obj obj\SOCK.obj \ + obj\SOCK_Acceptor.obj obj\SOCK_CODgram.obj obj\SOCK_Connector.obj \ + obj\SOCK_Dgram.obj obj\SOCK_Dgram_Bcast.obj obj\SOCK_Dgram_Mcast.obj \ + obj\SOCK_IO.obj obj\SOCK_Stream.obj obj\SPIPE.obj obj\SPIPE_Acceptor.obj \ + obj\SPIPE_Addr.obj obj\SPIPE_Connector.obj obj\SPIPE_Stream.obj obj\SString.obj \ + obj\Stats.obj obj\Strategies.obj obj\Strategies_T.obj obj\Stream.obj obj\Stream_Modules.obj \ + obj\SV_Message.obj obj\SV_Message_Queue.obj obj\SV_Semaphore_Complex.obj \ + obj\SV_Semaphore_Simple.obj obj\SV_Shared_Memory.obj obj\Svc_Conf_l.obj \ + obj\Svc_Conf_y.obj obj\Svc_Handler.obj obj\Synch.obj obj\Synch_Options.obj \ + obj\Synch_T.obj obj\System_Time.obj obj\Task.obj obj\Task_T.obj obj\Thread.obj \ + obj\Thread_Manager.obj obj\Time_Request_Reply.obj obj\Timer_Hash.obj \ + obj\Timer_Hash_T.obj obj\Timer_Heap.obj obj\Timer_Heap_T.obj obj\Timer_List.obj \ + obj\Timer_List_T.obj obj\Timer_Queue.obj obj\Timer_Queue_Adapters.obj \ + obj\Timer_Queue_T.obj obj\Timer_Wheel.obj obj\Timer_Wheel_T.obj obj\TLI.obj \ + obj\TLI_Acceptor.obj obj\TLI_Connector.obj obj\TLI_Stream.obj obj\Token.obj \ + obj\Token_Collection.obj obj\Token_Invariants.obj obj\Token_Manager.obj \ + obj\Token_Request_Reply.obj obj\Trace.obj obj\TTY_IO.obj \ + obj\Typed_SV_Message.obj obj\Typed_SV_Message_Queue.obj obj\UNIX_Addr.obj \ + obj\UPIPE_Acceptor.obj obj\UPIPE_Connector.obj obj\UPIPE_Stream.obj \ + obj\WFMO_Reactor.obj obj\XtReactor.obj +RESFILES = +DEFFILE = +RESDEPEN = $(RESFILES) +LIBFILES = +LIBRARIES = VCL35.lib +SPARELIBS = VCL35.lib +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -WD -O2 -Hc -w-par -w-inl -Ve -k- -vi -c -b- -Vx +CFLAG2 = -D_RTLDLL -I..;$(BCB)\include;$(BCB)\include\vcl \ + -H=obj\ace.csm +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_RTLDLL -N2obj -N0obj \ + -U..\ace;$(BCB)\lib\obj;$(BCB)\lib;$(RELEASELIBPATH) \ + -I..;$(BCB)\include;$(BCB)\include\vcl -$L- -$D- \ + -v -JPHN -M +RFLAGS = -D_RTLDLL -i..;$(BCB)\include;$(BCB)\include\vcl +AFLAGS = /i.. /i$(BCB)\include /i$(BCB)\include\vcl \ + /d_RTLDLL /mx /w2 /zn +LFLAGS = -L..\ace;$(BCB)\lib\obj;$(BCB)\lib;$(RELEASELIBPATH) \ + -aa -Tpd -x -Gn -Gi +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0d32.obj sysinit.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=1 +Item0=..;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=..\ace;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_RTLDLL +Item1=_RTLDLL;USEPACKAGES + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/ace/ARGV.cpp b/ace/ARGV.cpp index f01f3e87689..73460c87b44 100644 --- a/ace/ARGV.cpp +++ b/ace/ARGV.cpp @@ -59,8 +59,7 @@ ACE_ARGV::ACE_ARGV (const ASYS_TCHAR buf[], argc_ (0), argv_ (0), buf_ (0), - length_ (0), - queue_ () + length_ (0) { ACE_TRACE ("ACE_ARGV::ACE_ARGV ASYS_TCHAR[] to ASYS_TCHAR *[]"); @@ -86,8 +85,7 @@ ACE_ARGV::ACE_ARGV (ASYS_TCHAR *argv[], argc_ (0), argv_ (0), buf_ (0), - length_ (0), - queue_ () + length_ (0) { ACE_TRACE ("ACE_ARGV::ACE_ARGV ASYS_TCHAR*[] to ASYS_TCHAR[]"); @@ -117,8 +115,7 @@ ACE_ARGV::ACE_ARGV (ASYS_TCHAR *argv[], // Step through all argv params and copy each one into buf; separate // each param with white space. - ACE_NEW (this->buf_, - ASYS_TCHAR[buf_len + 1]); + ACE_NEW (this->buf_, ASYS_TCHAR[buf_len + 1]); ASYS_TCHAR *end = this->buf_; int j; @@ -155,8 +152,7 @@ ACE_ARGV::ACE_ARGV (ASYS_TCHAR *first_argv[], argc_ (0), argv_ (0), buf_ (0), - length_ (0), - queue_ () + length_ (0) { ACE_TRACE ("ACE_ARGV::ACE_ARGV ASYS_TCHAR*[] + ASYS_TCHAR *[] to ASYS_TCHAR[]"); @@ -178,8 +174,7 @@ ACE_ARGV::ACE_ARGV (ASYS_TCHAR *first_argv[], int buf_len = ACE_OS::strlen (first_buf) + ACE_OS::strlen (second_buf) + 1; // Allocate memory to the lenght of the combined argv string. - ACE_NEW (this->buf_, - ASYS_TCHAR[buf_len + 1]); + ACE_NEW (this->buf_, ASYS_TCHAR[buf_len + 1]); // copy the first argv string to the buffer ACE_OS::strcpy (this->buf_,first_buf); @@ -201,8 +196,7 @@ ACE_ARGV::ACE_ARGV (int substitute_env_args) argc_ (0), argv_ (0), buf_ (0), - length_ (0), - queue_ () + length_ (0) { ACE_TRACE ("ACE_ARGV::ACE_ARGV Iterative"); diff --git a/ace/Active_Map_Manager_T.h b/ace/Active_Map_Manager_T.h index eda8383dc2c..e0cb4f4fa8c 100644 --- a/ace/Active_Map_Manager_T.h +++ b/ace/Active_Map_Manager_T.h @@ -142,10 +142,10 @@ public: // the map resizes or when this slot is reused. Therefore, the user // should use the pointer immediately and not hold on to it. - size_t current_size (void) const; + size_t current_size (void); // Return the current size of the map. - size_t total_size (void) const; + size_t total_size (void); // Return the total size of the map. static const ACE_Active_Map_Manager_Key npos (void); diff --git a/ace/Active_Map_Manager_T.i b/ace/Active_Map_Manager_T.i index 29197057d0c..54388cd354d 100644 --- a/ace/Active_Map_Manager_T.i +++ b/ace/Active_Map_Manager_T.i @@ -238,13 +238,13 @@ ACE_Active_Map_Manager<T>::close (void) } template <class T> ACE_INLINE size_t -ACE_Active_Map_Manager<T>::current_size (void) const +ACE_Active_Map_Manager<T>::current_size (void) { return ACE_AMM_BASE::current_size (); } template <class T> ACE_INLINE size_t -ACE_Active_Map_Manager<T>::total_size (void) const +ACE_Active_Map_Manager<T>::total_size (void) { return ACE_AMM_BASE::total_size (); } diff --git a/ace/Arg_Shifter.cpp b/ace/Arg_Shifter.cpp index 938ecde49dc..dce44bcab60 100644 --- a/ace/Arg_Shifter.cpp +++ b/ace/Arg_Shifter.cpp @@ -6,9 +6,7 @@ ACE_RCSID(ace, Arg_Shifter, "$Id$") -ACE_Arg_Shifter::ACE_Arg_Shifter (int &argc, - char **argv, - char **temp) +ACE_Arg_Shifter::ACE_Arg_Shifter (int &argc, char **argv, char **temp) : argc_ (argc), total_size_ (argc), temp_ (temp), @@ -19,8 +17,7 @@ ACE_Arg_Shifter::ACE_Arg_Shifter (int &argc, { // If not provided with one, allocate a temporary array. if (this->temp_ == 0) - ACE_NEW (this->temp_, - char *[this->total_size_]); + this->temp_ = new char *[this->total_size_]; if (this->temp_ != 0) { diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp index 13c3153915c..5a07b53c72f 100644 --- a/ace/Asynch_Acceptor.cpp +++ b/ace/Asynch_Acceptor.cpp @@ -301,13 +301,11 @@ ACE_Asynch_Acceptor<HANDLER>::cancel (void) // All I/O operations that are canceled will complete with the error // ERROR_OPERATION_ABORTED. All completion notifications for the I/O // operations will occur normally. -#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) \ - && ( (defined (_MSC_VER) && (_MSC_VER > 1020)) \ - || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530))) +#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && (defined (_MSC_VER) && (_MSC_VER > 1020)) return (int) ::CancelIo (this->listen_handle_); #else ACE_NOTSUP_RETURN (-1); -#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && ((defined (_MSC_VER) && (_MSC_VER > 1020)) || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530))) */ +#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && (defined (_MSC_VER) && (_MSC_VER > 1020)) */ } template <class HANDLER> void @@ -411,9 +409,7 @@ ACE_Asynch_Acceptor<HANDLER>::make_handler (void) { // Default behavior HANDLER *handler = 0; - ACE_NEW_RETURN (handler, - HANDLER, - 0); + ACE_NEW_RETURN (handler, HANDLER, 0); return handler; } diff --git a/ace/Atomic_Op.i b/ace/Atomic_Op.i index 805ead114e8..28f1bab5d89 100644 --- a/ace/Atomic_Op.i +++ b/ace/Atomic_Op.i @@ -149,21 +149,18 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::operator= (const TYPE &i) #if defined (ACE_WIN32) -ACE_TEMPLATE_SPECIALIZATION inline long ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator++ (void) { return ::InterlockedIncrement (&this->value_); } -ACE_TEMPLATE_SPECIALIZATION inline long ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator-- (void) { return ::InterlockedDecrement (&this->value_); } -ACE_TEMPLATE_SPECIALIZATION inline void ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (const long &i) { @@ -171,7 +168,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (const long &i) i); } -ACE_TEMPLATE_SPECIALIZATION inline void ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, long> &rhs) { @@ -181,14 +177,12 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (const ACE_Atomic_Op<ACE_Thread #if defined (ACE_HAS_INTERLOCKED_EXCHANGEADD) -ACE_TEMPLATE_SPECIALIZATION inline long ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator+= (const long &i) { return ::InterlockedExchangeAdd (&this->value_, i); } -ACE_TEMPLATE_SPECIALIZATION inline long ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator-= (const long &i) { diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h index 1fb575c8c12..fdf00e2cdbc 100644 --- a/ace/Auto_Ptr.h +++ b/ace/Auto_Ptr.h @@ -54,8 +54,7 @@ protected: X *p_; }; -#if !defined (ACE_LACKS_AUTO_PTR) && \ - defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ +#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ (ACE_HAS_STANDARD_CPP_LIBRARY != 0) #include <memory> #if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ diff --git a/ace/Auto_Ptr.i b/ace/Auto_Ptr.i index dae25bdf271..74281c2dc88 100644 --- a/ace/Auto_Ptr.i +++ b/ace/Auto_Ptr.i @@ -67,8 +67,7 @@ ACE_Auto_Basic_Ptr<X>::operator *() const return *this->get (); } -#if defined (ACE_LACKS_AUTO_PTR) || \ - !defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \ +#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \ (ACE_HAS_STANDARD_CPP_LIBRARY == 0) template<class X> ACE_INLINE diff --git a/ace/Based_Pointer_Repository.cpp b/ace/Based_Pointer_Repository.cpp deleted file mode 100644 index cf2f54d61f4..00000000000 --- a/ace/Based_Pointer_Repository.cpp +++ /dev/null @@ -1,106 +0,0 @@ -// $Id$ - -#define ACE_BUILD_DLL -#include "ace/Based_Pointer_Repository.h" - -ACE_Based_Pointer_Repository::ACE_Based_Pointer_Repository (void) -{ -} - -ACE_Based_Pointer_Repository::~ACE_Based_Pointer_Repository (void) -{ -} - -// Search for appropriate base address in repository - -int -ACE_Based_Pointer_Repository::find (void *addr, - void *&base_addr) -{ - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, -1); - MAP_ITERATOR iter = addr_map_; - - for (MAP_ENTRY *ce = 0; - iter.next (ce) != 0; - iter.advance ()) - // Check to see if <addr> is within any of the regions. - if (addr >= ce->ext_id_ - && addr < ((char *) ce->ext_id_ + *(ce->int_id_))) - { - // Assign the base address. - base_addr = ce->ext_id_; - return 1; - } - - // Assume base address 0 (e.g. if new'ed). - base_addr = 0; - return 0; -} - -// Bind a new entry to the repository or update the size of an -// existing entry. - -int -ACE_Based_Pointer_Repository::bind (void *addr, size_t size) -{ - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, -1); - - size_t *sizep; - - if (addr_map_.find (addr, sizep) != -1) - { - // Store new size. - *sizep = size; - return 0; - } - else - { - ACE_NEW_RETURN (sizep, - size_t, - -1); - *sizep = size; - return addr_map_.bind (addr, sizep); - } -} - -// Unbind a base from the repository. - -int -ACE_Based_Pointer_Repository::unbind (void *addr) -{ - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, -1); - MAP_ITERATOR iter = addr_map_; - - // Search for service handlers that requested notification. - - for (MAP_ENTRY *ce = 0; - iter.next (ce) != 0; - iter.advance ()) - { - // Check to see if <addr> is within any of the regions. - if (addr >= ce->ext_id_ - && addr < ((char *) ce->ext_id_ + * (ce->int_id_))) - delete ce->int_id_; - - // Unbind base address. - return addr_map_.unbind (ce->ext_id_); - } - - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton <ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Entry<void *, size_t *>; -template class ACE_Map_Manager<void *, size_t *, ACE_Null_Mutex>; -template class ACE_Map_Iterator<void *, size_t *, ACE_Null_Mutex>; -template class ACE_Map_Reverse_Iterator<void *, size_t *, ACE_Null_Mutex>; -template class ACE_Map_Iterator_Base<void *, size_t *, ACE_Null_Mutex>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton <ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Entry<void *, size_t *> -#pragma instantiate ACE_Map_Manager<void *, size_t *, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator<void *, size_t *, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Reverse_Iterator<void *, size_t *, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator_Base<void *, size_t *, ACE_Null_Mutex> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Based_Pointer_Repository.h b/ace/Based_Pointer_Repository.h deleted file mode 100644 index b3180c008b9..00000000000 --- a/ace/Based_Pointer_Repository.h +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// Based_Pointer_Repository.h -// -// = AUTHOR -// Dietrich Quehl <Dietrich.Quehl@med.siemens.de> and -// Douglas C. Schmidt <schmidt@.cs.wustl.edu> -// -// ============================================================================ - -#ifndef ACE_BASED_POINTER_REPOSITORY_H -#define ACE_BASED_POINTER_REPOSITORY_H - -#include "ace/Singleton.h" -#include "ace/Map_Manager.h" - -class ACE_Export ACE_Based_Pointer_Repository -{ - // = TITLE - // Maps pointers to the base address of the region to which each - // pointer belongs. - // - // = DESCRIPTION - // Every memory pool in ACE binds it's mapping base address and - // the mapped size to this repository every time it maps/remaps a - // new chunk of memory successfully. -public: - // = Use <ACE_Null_Mutex> to allow locking while iterating. - typedef ACE_Map_Manager <void *, size_t *, ACE_Null_Mutex> - MAP_MANAGER; - typedef ACE_Map_Iterator < void *, size_t *, ACE_Null_Mutex> - MAP_ITERATOR; - typedef ACE_Map_Entry <void *, size_t *> - MAP_ENTRY; - - // = Initialization and termination methods. - ACE_Based_Pointer_Repository (void); - ~ACE_Based_Pointer_Repository (void); - - // = Search structure methods. - int find (void *addr, - void *&base_addr); - // Return the appropriate <base_addr> region that contains <addr>. - // Returns 1 on success and 0 if the <addr> isn't contained in any - // <base_addr> region. - - int bind (void *addr, - size_t size); - // Bind a new entry to the repository or update the size of an - // existing entry. Returns 0 on success and -1 on failure. - - int unbind (void *addr); - // Unbind from the repository the <base_addr> that <addr> is - // contained within. - -private: - MAP_MANAGER addr_map_; - // Keeps track of the mapping between addresses and their associated - // values. - - ACE_SYNCH_MUTEX lock_; - // Synchronize concurrent access to the map. -}; - -// Provide a Singleton access point to the based pointer repository. -typedef ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX> - ACE_BASED_POINTER_REPOSITORY; - -#endif /* ACE_BASED_POINTER_REPOSITORY_H */ diff --git a/ace/Based_Pointer_T.cpp b/ace/Based_Pointer_T.cpp deleted file mode 100644 index 6a01f656f8c..00000000000 --- a/ace/Based_Pointer_T.cpp +++ /dev/null @@ -1,55 +0,0 @@ -// $Id$ - -#ifndef ACE_BASED_POINTER_T_CPP -#define ACE_BASED_POINTER_T_CPP - -#include "ace/Based_Pointer_Repository.h" -#include "ace/Based_Pointer_T.h" - -template <class CONCRETE> -ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (void) - : target_ (0), - base_offset_ (0) -{ - void *base_addr = 0; - - // Find the base address associated with our <this> pointer. Note - // that it's ok for <find> to return 0, which simply indicates that - // the address is not in memory-mapped virtual address space. - ACE_BASED_POINTER_REPOSITORY::instance ()->find (this, - base_addr); - this->base_offset_ = (char *) this - (char *) base_addr; -} - -template <class CONCRETE> CONCRETE * -ACE_Based_Pointer<CONCRETE>::operator->(void) -{ - char *base_addr = (char *) this - this->base_offset_; - - return (CONCRETE *)(base_addr + (long) this->target_); -} - -template <class CONCRETE> CONCRETE * -ACE_Based_Pointer<CONCRETE>::operator =(CONCRETE *from) -{ - char *base_addr = (char *) this - this->base_offset_; - this->target_ = (CONCRETE *)((char *) from - (char *) base_addr); - return from; -} - -template <class CONCRETE> CONCRETE -ACE_Based_Pointer<CONCRETE>::operator *(void) -{ - char *base_addr = (char *) this - this->base_offset_; - return *(CONCRETE *)(base_addr + (long) this->target_); -} - -template <class CONCRETE> CONCRETE -ACE_Based_Pointer<CONCRETE>::operator [] (int index) -{ - char *base_addr = (char *) this - this->base_offset_; - return *((CONCRETE *)(base_addr + (long) this->target_) + index); -} - -#endif/* ACE_BASED_POINTER_T_CPP */ - diff --git a/ace/Based_Pointer_T.h b/ace/Based_Pointer_T.h deleted file mode 100644 index 31f4547776b..00000000000 --- a/ace/Based_Pointer_T.h +++ /dev/null @@ -1,88 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// Based_Pointer_T.h -// -// = AUTHOR -// Dietrich Quehl <Dietrich.Quehl@med.siemens.de> and -// Douglas C. Schmidt <schmidt@.cs.wustl.edu> -// -// ============================================================================ - -#ifndef ACE_BASED_POINTER_T_H -#define ACE_BASED_POINTER_T_H - -#if defined (_MSC_VER) -// Suppress warning e.g. "return type for -// 'ACE_Based_Pointer<long>::operator ->' is 'long *' (i.e., not a UDT -// or reference to a UDT. Will produce errors if applied using infix -// notation)" -#pragma warning(disable: 4284) -#endif /* _MSC_VER */ - -template <class CONCRETE> -class ACE_Based_Pointer -{ - // = TITLE - // A proxy that keeps track of the relative offset of a "pointer" - // from its base address. - // - // = DESCRIPTION - // This class makes it possible to transparently use "pointers" in - // shared memory as easily as programming with pointers to local - // memory. In particular, we don't need to ensure that the base - // addresses of all the pointers are mapped into separate - // processes at the same absolute memory base address. -public: - // = Initialization method. - ACE_Based_Pointer (void); - // This constructor initializes the <base_offset_> by asking the - // <ACE_BASED_POINTER_REPOSITORY> Singleton for the base address of - // the memory region within which it is instantiated. Two results - // are possible: - // - // 1. An <ACE_*_Memory_Pool> has stored a base address/size pair and the - // new based-pointer instance is located between the base address and - // the base address + size - 1. In this case, the repository - // returns the base address. - // - // 2. No suitable address/size pair was found. The repository - // assumes an address in the regular (not mapped) virtual address - // space of the process and returns 0. In this case, the - // based-pointer uses its address as an offset to it's base - // address 0. - - CONCRETE *operator->(void); - // The C++ "delegation operator". - - CONCRETE *operator =(CONCRETE *from); - // Pseudo-assignment operator. - - CONCRETE operator *(void); - // Dereference operator. - - CONCRETE operator [](int index); - // Subscript operator. - -private: - CONCRETE *target_; - - long base_offset_; - // Keep track of our offset from the base pointer. -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Based_Pointer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Based_Pointer_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#endif /* ACE_BASED_POINTER_T_H */ diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h index c9a14474b19..367710a3c1f 100644 --- a/ace/Basic_Types.h +++ b/ace/Basic_Types.h @@ -355,13 +355,8 @@ typedef ACE_UINT16 ACE_USHORT16; // 64-bit literals require special marking on some platforms. # if defined (ACE_WIN32) -# if defined (__IBMCPP__) && (__IBMCPP__ >= 400) -# define ACE_UINT64_LITERAL(n) n ## LL -# define ACE_INT64_LITERAL(n) n ## LL -#else # define ACE_UINT64_LITERAL(n) n ## ui64 # define ACE_INT64_LITERAL(n) n ## i64 -#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */ # elif defined (ACE_LACKS_LONGLONG_T) // Can only specify 32-bit arguments. # define ACE_UINT64_LITERAL(n) (ACE_U_LongLong (n)) diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp index 9220778588b..aa026c9b1bc 100644 --- a/ace/CDR_Stream.cpp +++ b/ace/CDR_Stream.cpp @@ -117,29 +117,6 @@ ACE_CDR::LongDouble::operator!= (const ACE_CDR::LongDouble &rhs) const } #endif /* NONNATIVE_LONGDOUBLE */ -#if defined(_UNICOS) -// placeholders to get things compiling -ACE_CDR::Float::Float() -{ -} - -ACE_CDR::Float::Float(const float & init)) -{ -} - -float -ACE_CDR::Float::operator= (const ACE_CDR::Float &rhs) const -{ - return 0.0f; -} - -int -ACE_CDR::Float::operator!= (const ACE_CDR::Float &rhs) const -{ - return 0; -} -#endif /* _UNICOS */ - // **************************************************************** ACE_OutputCDR::ACE_OutputCDR (size_t size, @@ -736,9 +713,7 @@ ACE_InputCDR::read_string (char *&x) this->read_ulong (len); if (len > 0) { - ACE_NEW_RETURN (x, - ACE_CDR::Char[len], - 0); + ACE_NEW_RETURN (x, ACE_CDR::Char[len], 0); if (this->read_char_array (x, len)) return 1; delete [] x; @@ -776,9 +751,7 @@ ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x) this->read_ulong (len); if (this->good_bit()) { - ACE_NEW_RETURN (x, - ACE_CDR::WChar[len], - 0); + ACE_NEW_RETURN (x, ACE_CDR::WChar[len], 0); if (this->read_wchar_array (x, len)) return 1; @@ -1049,9 +1022,3 @@ ACE_InputCDR::steal_contents (void) return block; } - -void -ACE_InputCDR::reset_contents (void) -{ - this->start_.data_block (this->start_.data_block ()->clone ()); -} diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h index bc01de7015f..5c773d7e810 100644 --- a/ace/CDR_Stream.h +++ b/ace/CDR_Stream.h @@ -154,8 +154,7 @@ public: typedef ACE_UINT32 ULong; typedef ACE_UINT64 ULongLong; - # if (defined (_MSC_VER) && (_MSC_VER >= 900)) \ - || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530)) + # if defined (_MSC_VER) && _MSC_VER >= 900 typedef __int64 LongLong; # elif ACE_SIZEOF_LONG == 8 typedef long LongLong; @@ -193,12 +192,6 @@ public: # else /* ACE_SIZEOF_INT != 4 */ // Applications will probably have trouble with this. char f[4]; - # if defined(_UNICOS) - Float (void); - Float (const float &init); - float operator= (const Float &rhs) const; - int operator!= (const Float &rhs) const; - # endif /* _UNICOS */ # endif /* ACE_SIZEOF_INT != 4 */ }; # endif /* ACE_SIZEOF_FLOAT != 4 */ @@ -729,13 +722,8 @@ public: // Re-initialize the CDR stream, copying the contents of the chain // of message_blocks starting from <data>. - ACE_Message_Block * steal_contents (void); - // Re-initialize the CDR stream, copying the contents of the chain - // of message_blocks starting from <data>. - - void reset_contents (void); - // Re-initialize the CDR stream, forgetting about the old contents - // of the stream and allocating a new buffer (from the allocators). + ACE_Message_Block *steal_contents (void); + // Steal the contents from the currect CDR. char* rd_ptr (void); // Returns the current position for the rd_ptr.... @@ -753,6 +741,10 @@ public: // If non-zero then this stream is writing in non-native byte order, // this is only meaningful if ACE_ENABLE_SWAP_ON_WRITE is defined. + int byte_order (void) const; + // If <do_byte_swap> returns 1, this returns ACE_CDR_BYTE_ORDER else + // it returns ~ACE_CDR_BYTE_ORDER. + ACE_Char_Codeset_Translator *char_translator (void) const; ACE_WChar_Codeset_Translator *wchar_translator (void) const; // Access the codeset translators. They can be nil! diff --git a/ace/CDR_Stream.i b/ace/CDR_Stream.i index 3b98423e2fa..3227976db1c 100644 --- a/ace/CDR_Stream.i +++ b/ace/CDR_Stream.i @@ -1227,6 +1227,15 @@ ACE_InputCDR::do_byte_swap (void) const } ACE_INLINE int +ACE_InputCDR::byte_order (void) const +{ + if (this->do_byte_swap ()) + return !ACE_CDR_BYTE_ORDER; + else + return ACE_CDR_BYTE_ORDER; +} + +ACE_INLINE int ACE_InputCDR::align_read_ptr (size_t alignment) { char *buf = ptr_align_binary (this->rd_ptr (), diff --git a/ace/CORBA_Handler.cpp b/ace/CORBA_Handler.cpp index 5ae478cc84e..1e74d6c21c5 100644 --- a/ace/CORBA_Handler.cpp +++ b/ace/CORBA_Handler.cpp @@ -306,9 +306,7 @@ ACE_ST_CORBA_Handler::instance (void) if (ACE_ST_CORBA_Handler::instance_ == 0) { - ACE_NEW_RETURN (ACE_ST_CORBA_Handler::instance_, - ACE_ST_CORBA_Handler, - 0); + ACE_NEW_RETURN (ACE_ST_CORBA_Handler::instance_, ACE_ST_CORBA_Handler, 0); ACE_ST_CORBA_Handler::instance_->get_orbix_descriptors (); } diff --git a/ace/CORBA_macros.h b/ace/CORBA_macros.h index e41d7dee878..b59c55ab285 100644 --- a/ace/CORBA_macros.h +++ b/ace/CORBA_macros.h @@ -80,35 +80,21 @@ # define ACE_CHECK_RETURN(RETV) // ACE_THROW_INT should not be used by the user. -# define ACE_THROW_INT(EXCEPTION) \ - do { \ - ACE_UNUSED_ARG(ACE_TRY_ENV); \ - throw EXCEPTION; \ - } while (0) +# 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) \ - do { \ - ACE_UNUSED_ARG(ACE_TRY_ENV); \ - throw EXCEPTION; \ - } while (0) - +# define ACE_THROW(EXCEPTION) throw EXCEPTION // Throwing an exception when the function reqires a return value. -# if defined (WIN32) || defined (__HP_aCC) +# if defined (WIN32) # define ACE_THROW_RETURN(EXCEPTION, RETV) \ do \ { \ - ACE_UNUSED_ARG(ACE_TRY_ENV); \ throw EXCEPTION; \ return RETV; \ } while (0) # else /* WIN32 */ -# define ACE_THROW_RETURN(EXCEPTION,RETV) \ - do { \ - ACE_UNUSED_ARG(ACE_TRY_ENV); \ - throw EXCEPTION; \ - } while (0) +# define ACE_THROW_RETURN(EXCEPTION,RETV) throw EXCEPTION # endif /* WIN32 */ // For compilers with native exceptions, we can simply use @@ -332,8 +318,8 @@ do { try { POINTER = new CONSTRUCTOR; } \ catch (ACE_bad_alloc) { errno = ENOMEM; ACE_THROW_INT (EXCEPTION); } \ } while (0) -// The following ACE_NEW_THROW* macros are to be deprecated soon. -// -------------------- Start Deprecated -------------------- +// The following ACE_NEW_THROW* macros are to be depricated soon. +// -------------------- Start Depricated -------------------- # define ACE_NEW_THROW(POINTER,CONSTRUCTOR,EXCEPTION) \ do { try { POINTER = new CONSTRUCTOR; } \ catch (ACE_bad_alloc) { errno = ENOMEM; TAO_THROW (EXCEPTION); } \ @@ -346,7 +332,7 @@ do { try { POINTER = new CONSTRUCTOR; } \ catch (ACE_bad_alloc) { errno = ENOMEM; TAO_TRY_THROW (EXCEPTION); } \ } while (0) -// -------------------- End Deprecated -------------------- +// -------------------- End Depricated -------------------- #else @@ -354,8 +340,8 @@ do { POINTER = new CONSTRUCTOR; \ if (POINTER == 0) { errno = ENOMEM; ACE_THROW_INT (EXCEPTION); } \ } while (0) -// The following ACE_NEW_THROW* macros are to be deprecated soon. -// -------------------- Start Deprecated -------------------- +// The following ACE_NEW_THROW* macros are to be depricated soon. +// -------------------- Start Depricated -------------------- # define ACE_NEW_THROW(POINTER,CONSTRUCTOR,EXCEPTION) \ do { POINTER = new CONSTRUCTOR; \ if (POINTER == 0) { errno = ENOMEM; TAO_THROW (EXCEPTION); } \ @@ -369,7 +355,7 @@ do { POINTER = new CONSTRUCTOR; \ if (POINTER == 0) { errno = ENOMEM; TAO_TRY_THROW (EXCEPTION); } \ } while (0) -// -------------------- End Deprecated -------------------- +// -------------------- End Depricated -------------------- #endif /* ACE_NEW_THROWS_EXCEPTIONS */ @@ -385,15 +371,15 @@ ACE_Write_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) ACE_THROW_INT (EXCEPTION); -// The following ACE_GUARD_THROW* macros are to be deprecated soon. -// -------------------- Start Deprecated -------------------- +// The following ACE_GUARD_THROW* macros are to be depricated soon. +// -------------------- Start Depricated -------------------- # define ACE_GUARD_THROW(MUTEX,OBJ,LOCK,EXCEPTION) \ ACE_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) TAO_THROW (EXCEPTION); # define ACE_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,EXCEPTION,RETURN) \ ACE_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) TAO_THROW_RETURN (EXCEPTION, RETURN); -// -------------------- End Deprecation -------------------- +// -------------------- End Deprication -------------------- // ============================================================ diff --git a/ace/Cache_Map_Manager_T.cpp b/ace/Cache_Map_Manager_T.cpp index 376f981e5e4..0a7cc36ec46 100644 --- a/ace/Cache_Map_Manager_T.cpp +++ b/ace/Cache_Map_Manager_T.cpp @@ -20,7 +20,7 @@ ACE_RCSID(ace, Cache_Map_Manager_T, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Manager) - + ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Iterator) ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Reverse_Iterator) @@ -28,36 +28,78 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Reverse_Iterator) #define T_1 class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES #define T_2 KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES - template <T_1> -ACE_Cache_Map_Manager<T_2>::ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_s, - size_t size, - ACE_Allocator *alloc) - : caching_strategy_ (caching_s) +template <T_1> +ACE_Cache_Map_Manager<T_2>::ACE_Cache_Map_Manager (size_t size, + ACE_Allocator *alloc, + CACHING_STRATEGY *caching_s, + int delete_caching_strategy) + : caching_strategy_ (0) { - if (this->open (size, alloc) == -1) + if (this->open (size, alloc, caching_s, delete_caching_strategy) == -1) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Cache_Map_Manager::ACE_Cache_Map_Manager"))); - + } template <T_1> ACE_Cache_Map_Manager<T_2>::~ACE_Cache_Map_Manager (void) { - this->close (); } template <T_1> int ACE_Cache_Map_Manager<T_2>::open (size_t length, - ACE_Allocator *alloc) + ACE_Allocator *alloc, + CACHING_STRATEGY *caching_s, + int delete_caching_strategy) { - return this->map_.open (length, - alloc); + // Create the map. + if (this->map_.open (length, + alloc) == -1) + return -1; + + // Initialise the caching strategy. + + // First we decide whether we need to clean up. + if (this->caching_strategy_ != 0 && + this->delete_caching_strategy_ == 1 && + caching_s != 0) + { + + delete this->caching_strategy_; + + this->caching_strategy_ = 0; + + this->delete_caching_strategy_ = delete_caching_strategy; + + } + + if (caching_s != 0) + this->caching_strategy_ = caching_s; + else if (this->caching_strategy_ == 0) + { + + ACE_NEW_RETURN (this->caching_strategy_, + CACHING_STRATEGY, + -1); + + this->delete_caching_strategy_ = delete_caching_strategy; + + } + + return 0; } template <T_1> int ACE_Cache_Map_Manager<T_2>::close (void) { + if (this->delete_caching_strategy_ == 1) + delete this->caching_strategy_; + + this->delete_caching_strategy_ = 0; + + this->caching_strategy_ = 0; + return this->map_.close (); } @@ -69,7 +111,7 @@ ACE_Cache_Map_Manager<T_2>::bind (const KEY &key, // is the combination of the <value> and the attributes of the // caching strategy. CACHE_VALUE cache_value (value, - this->caching_strategy_.attributes ()); + this->caching_strategy_->attributes ()); int bind_result = this->map_.bind (key, cache_value); @@ -77,8 +119,8 @@ ACE_Cache_Map_Manager<T_2>::bind (const KEY &key, if (bind_result != -1) { - int result = this->caching_strategy_.notify_bind (bind_result, - cache_value.second ()); + int result = this->caching_strategy_->notify_bind (bind_result, + cache_value.second ()); if (result == -1) { @@ -102,7 +144,7 @@ ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key, const VALUE &value) { CACHE_VALUE cache_value (value, - this->caching_strategy_.attributes ()); + this->caching_strategy_->attributes ()); int rebind_result = this->map_.rebind (key, cache_value); @@ -110,8 +152,8 @@ ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key, if (rebind_result != -1) { - int result = this->caching_strategy_.notify_rebind (rebind_result, - cache_value.second ()); + int result = this->caching_strategy_->notify_rebind (rebind_result, + cache_value.second ()); if (result == -1) { @@ -140,10 +182,10 @@ ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key, VALUE &old_value) { CACHE_VALUE cache_value (value, - this->caching_strategy_.attributes ()); + this->caching_strategy_->attributes ()); CACHE_VALUE old_cache_value (old_value, - this->caching_strategy_.attributes ()); + this->caching_strategy_->attributes ()); int rebind_result = this->map_.rebind (key, cache_value, @@ -152,8 +194,8 @@ ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key, if (rebind_result != -1) { - int result = this->caching_strategy_.notify_rebind (rebind_result, - cache_value.second ()); + int result = this->caching_strategy_->notify_rebind (rebind_result, + cache_value.second ()); if (result == -1) { @@ -188,10 +230,10 @@ ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key, VALUE &old_value) { CACHE_VALUE cache_value (value, - this->caching_strategy_.attributes ()); + this->caching_strategy_->attributes ()); CACHE_VALUE old_cache_value (old_value, - this->caching_strategy_.attributes ()); + this->caching_strategy_->attributes ()); int rebind_result = this->map_.rebind (key, cache_value, @@ -201,8 +243,8 @@ ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key, if (rebind_result != -1) { - int result = this->caching_strategy_.notify_rebind (rebind_result, - cache_value.second ()); + int result = this->caching_strategy_->notify_rebind (rebind_result, + cache_value.second ()); if (result == -1) { @@ -235,17 +277,17 @@ ACE_Cache_Map_Manager<T_2>::trybind (const KEY &key, VALUE &value) { CACHE_VALUE cache_value (value, - this->caching_strategy_.attributes ()); + this->caching_strategy_->attributes ()); int trybind_result = this->map_.trybind (key, cache_value); if (trybind_result != -1) { - - int result = this->caching_strategy_.notify_trybind (trybind_result, - cache_value.second ()); - + + int result = this->caching_strategy_->notify_trybind (trybind_result, + cache_value.second ()); + if (result == -1) { @@ -259,14 +301,14 @@ ACE_Cache_Map_Manager<T_2>::trybind (const KEY &key, } else { - + // If an attempt is made to bind an existing entry the value // is overwritten with the value from the map. if (trybind_result == 1) value = cache_value.first (); - + } - + } return trybind_result; @@ -285,8 +327,8 @@ ACE_Cache_Map_Manager<T_2>::find (const KEY &key, if (find_result != -1) { - int result = this->caching_strategy_.notify_find (find_result, - cache_value.second ()); + int result = this->caching_strategy_->notify_find (find_result, + cache_value.second ()); // Unless the find and notification operations go thru, this // method is not successful. @@ -294,7 +336,7 @@ ACE_Cache_Map_Manager<T_2>::find (const KEY &key, find_result = -1; else { - + // Since the <cache_value> has now changed after the // notification, we need to bind to the map again. int rebind_result = this->map_.rebind (key, @@ -303,9 +345,9 @@ ACE_Cache_Map_Manager<T_2>::find (const KEY &key, find_result = -1; else value = cache_value.first (); - + } - + } return find_result; @@ -323,8 +365,8 @@ ACE_Cache_Map_Manager<T_2>::find (const KEY &key) if (find_result != -1) { - int result = this->caching_strategy_.notify_find (find_result, - cache_value.second ()); + int result = this->caching_strategy_->notify_find (find_result, + cache_value.second ()); // Unless the find and notification operations go thru, this // method is not successful. @@ -332,15 +374,15 @@ ACE_Cache_Map_Manager<T_2>::find (const KEY &key) find_result = -1; else { - + // Since the <cache_value> has now changed after the // notification, we need to bind to the map again. int rebind_result = this->map_.rebind (key, cache_value); - + if (rebind_result == -1) find_result = -1; - + } } @@ -360,13 +402,13 @@ ACE_Cache_Map_Manager<T_2>::unbind (const KEY &key) if (unbind_result != -1) { - - int result = this->caching_strategy_.notify_unbind (unbind_result, - cache_value.second ()); + + int result = this->caching_strategy_->notify_unbind (unbind_result, + cache_value.second ()); if (result == -1) unbind_result = -1; - + } return unbind_result; @@ -384,15 +426,15 @@ ACE_Cache_Map_Manager<T_2>::unbind (const KEY &key, if (unbind_result != -1) { - - int result = this->caching_strategy_.notify_unbind (unbind_result, - cache_value.second ()); - + + int result = this->caching_strategy_->notify_unbind (unbind_result, + cache_value.second ()); + if (result == -1) unbind_result = -1; else value = cache_value.first (); - + } return unbind_result; @@ -403,8 +445,8 @@ template <T_1> void ACE_Cache_Map_Manager<T_2>::dump (void) const { this->map_.dump (); - - this->caching_strategy_.dump (); + + this->caching_strategy_->dump (); } #undef T_1 diff --git a/ace/Cache_Map_Manager_T.h b/ace/Cache_Map_Manager_T.h index 20dfb3b9e1d..6d1c29f52fd 100644 --- a/ace/Cache_Map_Manager_T.h +++ b/ace/Cache_Map_Manager_T.h @@ -65,36 +65,42 @@ public: // are used by the strategy and is transparent to the user of this // class. - friend class ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>; - friend class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>; + friend class ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>; + friend class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>; // = ACE-style iterator typedefs. - typedef ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> + typedef ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> ITERATOR; - typedef ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> + typedef ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> REVERSE_ITERATOR; // = STL-style iterator typedefs. - typedef ITERATOR + typedef ITERATOR iterator; - typedef REVERSE_ITERATOR + typedef REVERSE_ITERATOR reverse_iterator; // = Initialization and termination methods. - ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_strategy, - size_t size = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); - // Initialize a <Cache_Map_Manager> with <caching_strategy> and - // <size> entries. + ACE_Cache_Map_Manager (size_t size = ACE_DEFAULT_MAP_SIZE, + ACE_Allocator *alloc = 0, + CACHING_STRATEGY *caching_s = 0, + int delete_caching_strategy = 1); + // Initialize a <Cache_Map_Manager> with <size> entries. + // By default the caching strategy is allocated and deallocated by + // the class but if needed it can be changed as per the users need. + // The <delete_on_destruction> flag simply tells the class whether + // the ownership is given to the class or not. virtual ~ACE_Cache_Map_Manager (void); // Close down a <Cache_Map_Manager> and release dynamically allocated // resources. int open (size_t length = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); - // Initialize a cache with size <length>. + ACE_Allocator *alloc = 0, + CACHING_STRATEGY *caching_s = 0, + int delete_caching_strategy = 1); + // Initialise a cache with size <length> and set the caching_strategy. int close (void); // Close down a cache and release dynamically allocated resources. @@ -159,10 +165,10 @@ public: int purge (void); // Remove entries from the cache depending upon the strategy. - size_t current_size (void) const; + size_t current_size (void); // Return the current size of the cache. - size_t total_size (void) const; + size_t total_size (void); // Return the total size of the cache. void dump (void) const; @@ -181,7 +187,7 @@ public: MAP &map (void); // The map managed by the Cache_Map_Manager. - CACHING_STRATEGY &caching_strategy (void); + CACHING_STRATEGY *caching_strategy (void); // The caching strategy used on the cache. protected: @@ -189,15 +195,12 @@ protected: MAP map_; // The underlying map which needs to be cached. - CACHING_STRATEGY &caching_strategy_; + CACHING_STRATEGY *caching_strategy_; // The strategy to be followed for caching entries in the map. -private: - - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Cache_Map_Manager (const ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES> &)) - + int delete_caching_strategy_; + // This flag denotes whether the ownership lies in the hands of the + // class or not. Is yes, then it deletes the strategy. }; template <class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> @@ -213,9 +216,9 @@ class ACE_Cache_Map_Iterator public: // = Traits. - typedef ACE_Reference_Pair<KEY, VALUE> + typedef ACE_Reference_Pair<KEY, VALUE> value_type; - typedef ACE_Pair <VALUE, ATTRIBUTES> + typedef ACE_Pair <VALUE, ATTRIBUTES> CACHE_VALUE; // The actual value mapped to the key in the cache. The <attributes> // are used by the strategy and is transperant to the cache user. @@ -231,7 +234,7 @@ public: // = Iteration methods. - ACE_Cache_Map_Iterator <KEY, VALUE, IMPLEMENTATION, + ACE_Cache_Map_Iterator <KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator= (const ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs); @@ -356,7 +359,7 @@ protected: #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Cache_Map_Manager_T.cpp") +#pragma implementation ("ace/Cache_Map_Manager_T.cpp") #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* CACHE_MAP_MANAGER_T_H */ diff --git a/ace/Cache_Map_Manager_T.i b/ace/Cache_Map_Manager_T.i index 1a199e8bc53..67fe9a3c19b 100644 --- a/ace/Cache_Map_Manager_T.i +++ b/ace/Cache_Map_Manager_T.i @@ -7,17 +7,17 @@ template <T_1> ACE_INLINE int ACE_Cache_Map_Manager<T_2>::purge (void) { - return this->caching_strategy ().clear_cache (this->map_); + return this->caching_strategy ()->clear_cache (this->map_); } template <T_1> ACE_INLINE size_t -ACE_Cache_Map_Manager<T_2>::current_size (void) const +ACE_Cache_Map_Manager<T_2>::current_size (void) { return this->map_.current_size (); } template <T_1> ACE_INLINE size_t -ACE_Cache_Map_Manager<T_2>::total_size (void) const +ACE_Cache_Map_Manager<T_2>::total_size (void) { return this->map_.total_size (); } @@ -28,7 +28,7 @@ ACE_Cache_Map_Manager<T_2>::map (void) return this->map_; } -template <T_1> ACE_INLINE CACHING_STRATEGY & +template <T_1> ACE_INLINE CACHING_STRATEGY * ACE_Cache_Map_Manager<T_2>::caching_strategy (void) { return this->caching_strategy_; @@ -92,13 +92,13 @@ ACE_Cache_Map_Iterator<T_2>::operator== (const ACE_Cache_Map_Iterator<T_2> &rhs) template <T_1> ACE_INLINE int ACE_Cache_Map_Iterator<T_2>::operator!= (const ACE_Cache_Map_Iterator<T_2> &rhs) const { - return this->iterator_implementation_ != rhs.iterator_implementation_; + return this->iterator_implementation_ != rhs.iterator_implementation_; } template <T_1> ACE_INLINE ACE_Reference_Pair<KEY, VALUE> ACE_Cache_Map_Iterator<T_2>::operator* (void) const { - value_type retn ((*this->iterator_implementation_).ext_id_, + value_type retn ((*this->iterator_implementation_).ext_id_, (*this->iterator_implementation_).int_id_.first ()); return retn; } @@ -151,7 +151,7 @@ ACE_Cache_Map_Iterator<T_2>::ACE_Cache_Map_Iterator (const IMPLEMENTATION &itera } template <T_1> ACE_INLINE IMPLEMENTATION & -ACE_Cache_Map_Iterator<T_2>::iterator_implementation (void) +ACE_Cache_Map_Iterator<T_2>::iterator_implementation (void) { return this->iterator_implementation_; } @@ -197,7 +197,7 @@ ACE_Cache_Map_Reverse_Iterator<T_2>::operator!= (const ACE_Cache_Map_Reverse_Ite template <T_1> ACE_INLINE ACE_Reference_Pair<KEY, VALUE> ACE_Cache_Map_Reverse_Iterator<T_2>::operator* (void) const { - value_type retv ((*this->reverse_iterator_implementation_).ext_id_, + value_type retv ((*this->reverse_iterator_implementation_).ext_id_, (*this->reverse_iterator_implementation_).int_id_.first ()); return retv; } diff --git a/ace/Cached_Connect_Strategy_T.cpp b/ace/Cached_Connect_Strategy_T.cpp index 92bb8accd6f..548cbe846b8 100644 --- a/ace/Cached_Connect_Strategy_T.cpp +++ b/ace/Cached_Connect_Strategy_T.cpp @@ -3,15 +3,12 @@ #ifndef CACHED_CONNECT_STRATEGY_T_C #define CACHED_CONNECT_STRATEGY_T_C -#define ACE_BUILD_DLL - -#include "ace/Cached_Connect_Strategy_T.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) #define ACE_LACKS_PRAGMA_ONCE #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/ACE.h" +#include "ace/Cached_Connect_Strategy_T.h" #include "ace/Service_Repository.h" #include "ace/Synch.h" #include "ace/Service_Types.h" @@ -25,26 +22,48 @@ ACE_RCSID(ace, Cached_Connect_Strategy_T, "$Id$") -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> +template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::ACE_Cached_Connect_Strategy_Ex -(CACHING_STRATEGY &caching_s, - ACE_Creation_Strategy<SVC_HANDLER> *cre_s, +(ACE_Creation_Strategy<SVC_HANDLER> *cre_s, ACE_Concurrency_Strategy<SVC_HANDLER> *con_s, ACE_Recycling_Strategy<SVC_HANDLER> *rec_s, - MUTEX *lock, - int delete_lock) - : CCSBASE (cre_s, con_s, rec_s, lock, delete_lock), - connection_cache_ (caching_s) + MUTEX *mutex, + int delete_mutex) + : ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX> (cre_s, + con_s, + rec_s, + mutex, + delete_mutex) { - if (this->open (cre_s, con_s, rec_s) == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>\n"))); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> +template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::~ACE_Cached_Connect_Strategy_Ex (void) { + if (this->delete_lock_) + delete this->lock_; + + if (this->delete_creation_strategy_) + delete this->creation_strategy_; + this->delete_creation_strategy_ = 0; + this->creation_strategy_ = 0; + + if (this->delete_concurrency_strategy_) + delete this->concurrency_strategy_; + this->delete_concurrency_strategy_ = 0; + this->concurrency_strategy_ = 0; + + if (this->delete_recycling_strategy_) + delete this->recycling_strategy_; + this->delete_recycling_strategy_ = 0; + this->recycling_strategy_ = 0; + + delete this->svc_cleanup_strategy_; + this->svc_cleanup_strategy_ = 0; + + delete this->caching_strategy_; + this->caching_strategy_ = 0; + // Close down all cached service handlers. for (CONNECTION_CACHE_ITERATOR iter = this->connection_cache_.begin (); iter != this->connection_cache_.end (); @@ -58,27 +77,91 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE } } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int +template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::open (ACE_Creation_Strategy<SVC_HANDLER> *cre_s, ACE_Concurrency_Strategy<SVC_HANDLER> *con_s, ACE_Recycling_Strategy<SVC_HANDLER> *rec_s) { - int result = this->CCSBASE::open (cre_s, con_s, rec_s); - if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("Base initialisation failed\n")), - -1); - - if (this->caching_strategy ().open (&this->svc_cleanup_strategy_, - 0) == -1) + // Set up the cleanup strategy for the svc_handler and give it to + // the caching_strategy for use. + ACE_NEW_RETURN (this->svc_cleanup_strategy_, + SVC_CLEANUP_STRATEGY, -1); + + ACE_NEW_RETURN (this->caching_strategy_, + CACHING_STRATEGY (this->svc_cleanup_strategy_, + 0), + -1); + + if (this->connection_cache_.open (ACE_DEFAULT_MAP_SIZE, + 0, + this->caching_strategy_, + 0) == -1) return -1; + // Initialize the creation strategy. + // First we decide if we need to clean up. + if (this->creation_strategy_ != 0 && + this->delete_creation_strategy_ != 0 && + cre_s != 0) + { + delete this->creation_strategy_; + this->creation_strategy_ = 0; + this->delete_creation_strategy_ = 0; + } + + if (cre_s != 0) + this->creation_strategy_ = cre_s; + else if (this->creation_strategy_ == 0) + { + ACE_NEW_RETURN (this->creation_strategy_, + CREATION_STRATEGY, -1); + this->delete_creation_strategy_ = 1; + } + + // Initialize the concurrency strategy. + if (this->concurrency_strategy_ != 0 && + this->delete_concurrency_strategy_ != 0 && + con_s != 0) + { + delete this->concurrency_strategy_; + this->concurrency_strategy_ = 0; + this->delete_concurrency_strategy_ = 0; + } + + if (con_s != 0) + this->concurrency_strategy_ = con_s; + else if (this->concurrency_strategy_ == 0) + { + ACE_NEW_RETURN (this->concurrency_strategy_, + CONCURRENCY_STRATEGY, -1); + this->delete_concurrency_strategy_ = 1; + } + + // Initialize the recycling strategy. + + if (this->recycling_strategy_ != 0 && + this->delete_recycling_strategy_ != 0 && + rec_s != 0) + { + delete this->recycling_strategy_; + this->recycling_strategy_ = 0; + this->delete_recycling_strategy_ = 0; + } + + if (rec_s != 0) + this->recycling_strategy_ = rec_s; + else if (this->recycling_strategy_ == 0) + { + ACE_NEW_RETURN (this->recycling_strategy_, + RECYCLING_STRATEGY, -1); + this->delete_recycling_strategy_ = 1; + } + return 0; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int +template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::check_hint_i (SVC_HANDLER *&sh, const ACE_PEER_CONNECTOR_ADDR &remote_addr, @@ -151,7 +234,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE return 0; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int +template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::find_or_create_svc_handler_i (SVC_HANDLER *&sh, const ACE_PEER_CONNECTOR_ADDR &remote_addr, @@ -175,9 +258,9 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE // Create a new svc_handler if (this->make_svc_handler (sh) == -1) return -1; - + // Connect using the svc_handler. - if (this->cached_connect (sh, + if (this->connect (sh, remote_addr, timeout, local_addr, @@ -216,8 +299,8 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int -ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cached_connect (SVC_HANDLER *&sh, +template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int +ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::connect (SVC_HANDLER *&sh, const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, @@ -240,7 +323,6 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE // there is no way for the non-blocking connects to complete and // for the <Connector> to notify the cache of the completion of // connect(). - if (errno == EWOULDBLOCK) errno = ENOTSUP; else if (errno == EMFILE) @@ -250,7 +332,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE // are done from the CONNECTION_CACHE. This frees the // descriptors which get used in the connect process and // hence the same method is called again! - if (this->purge_connections (this->caching_strategy ().purge_percent ()) == -1) + if (this->connection_cache_.purge () == -1) return -1; // Try connecting again. @@ -272,13 +354,13 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE return -1; } } - + return 0; - + } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int +template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::connect_svc_handler_i (SVC_HANDLER *&sh, const ACE_PEER_CONNECTOR_ADDR &remote_addr, @@ -337,7 +419,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int +template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cache_i (const void *recycling_act) { // The wonders and perils of ACT @@ -351,7 +433,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int +template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::purge_i (const void *recycling_act) { // The wonders and perils of ACT @@ -361,7 +443,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int +template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::mark_as_closed_i (const void *recycling_act) { // The wonders and perils of ACT @@ -373,7 +455,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE return 0; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int +template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cleanup_hint_i (const void *recycling_act) { // The wonders and perils of ACT @@ -395,20 +477,6 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE return 0; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int -ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::purge_connections (double percentage) -{ - // Set the percentage of entries to remove and then call purge on the cache. - this->caching_strategy_ ().purge_percent (percentage); - return this->connection_cache_.purge (); -} - -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> CACHING_STRATEGY & -ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::caching_strategy (void) -{ - return this->connection_cache_.caching_strategy (); -} - ACE_ALLOC_HOOK_DEFINE(ACE_Cached_Connect_Strategy_Ex) #endif /* CACHED_CONNECT_STRATEGY_T_C */ diff --git a/ace/Cached_Connect_Strategy_T.h b/ace/Cached_Connect_Strategy_T.h index 59f070c9a46..dea83658ee3 100644 --- a/ace/Cached_Connect_Strategy_T.h +++ b/ace/Cached_Connect_Strategy_T.h @@ -17,8 +17,6 @@ #ifndef CACHED_CONNECT_STRATEGY_T_H #define CACHED_CONNECT_STRATEGY_T_H -#include "ace/OS.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) #define ACE_LACKS_PRAGMA_ONCE #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -31,7 +29,7 @@ #include "ace/Synch.h" template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> -class ACE_Cached_Connect_Strategy_Ex : public ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX> +class ACE_Cached_Connect_Strategy_Ex : public ACE_Cached_Connect_Strategy< SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX> { // = TITLE // A connection strategy which caches connections to peers @@ -43,33 +41,33 @@ class ACE_Cached_Connect_Strategy_Ex : public ACE_Cached_Connect_Strategy<SVC_HA // plug-in connection strategy for <ACE_Strategy_Connector>. // It's added value is re-use of established connections and // tweaking the role of the cache as per the caching strategy. - + public: - ACE_Cached_Connect_Strategy_Ex (CACHING_STRATEGY &caching_s, - ACE_Creation_Strategy<SVC_HANDLER> *cre_s = 0, + ACE_Cached_Connect_Strategy_Ex (ACE_Creation_Strategy<SVC_HANDLER> *cre_s = 0, ACE_Concurrency_Strategy<SVC_HANDLER> *con_s = 0, ACE_Recycling_Strategy<SVC_HANDLER> *rec_s = 0, - MUTEX *lock = 0, - int delete_lock = 0); + MUTEX *mutex = 0, + int delete_mutex = 0); // Constructor virtual ~ACE_Cached_Connect_Strategy_Ex (void); // Destructor + virtual int open (ACE_Creation_Strategy<SVC_HANDLER> *cre_s, ACE_Concurrency_Strategy<SVC_HANDLER> *con_s, ACE_Recycling_Strategy<SVC_HANDLER> *rec_s); // This methods allow you to change the strategies used by the // cached connector. - virtual int cached_connect (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); + virtual int connect (SVC_HANDLER *&sh, + const ACE_PEER_CONNECTOR_ADDR &remote_addr, + ACE_Time_Value *timeout, + const ACE_PEER_CONNECTOR_ADDR &local_addr, + int reuse_addr, + int flags, + int perms); // Connection of the svc_handler with the remote host. // This method also encapsulates the connection done with // auto_purging under the hood. If the connect failed due to the @@ -78,32 +76,23 @@ public: // the descriptors which get used in the connect process and hence // the connect operation can succeed. - virtual int purge_connections (double percentage = 10); - // Explicit purging of connection entries from the connection cache. - // = Typedefs for managing the map typedef ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> REFCOUNTED_HASH_RECYCLABLE_ADDRESS; typedef ACE_Hash_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, CACHING_STRATEGY, ATTRIBUTES> CONNECTION_CACHE; - typedef ACE_TYPENAME CONNECTION_CACHE::CACHE_ENTRY + typedef ACE_TYPENAME CONNECTION_CACHE::CACHE_ENTRY CONNECTION_CACHE_ENTRY; typedef ACE_TYPENAME CONNECTION_CACHE::key_type KEY; - typedef ACE_TYPENAME CONNECTION_CACHE::mapped_type + typedef ACE_TYPENAME CONNECTION_CACHE::mapped_type VALUE; - typedef ACE_TYPENAME CONNECTION_CACHE::ITERATOR + typedef ACE_TYPENAME CONNECTION_CACHE::ITERATOR CONNECTION_CACHE_ITERATOR; // = Cleanup of the svc_handler. typedef ACE_Svc_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, ACE_Pair<SVC_HANDLER *, ATTRIBUTES>,ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, ACE_Pair<SVC_HANDLER *, ATTRIBUTES>, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, MUTEX> > - SVC_CLEANUP_STRATEGY; - - typedef ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX> - CCSBASE; - - // = Accessor. - CACHING_STRATEGY &caching_strategy (void); + SVC_CLEANUP_STRATEGY; protected: @@ -121,7 +110,7 @@ protected: // = Helpers - virtual int check_hint_i (SVC_HANDLER *&sh, + int check_hint_i (SVC_HANDLER *&sh, const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, @@ -131,8 +120,8 @@ protected: ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry, int &found); - - virtual int find_or_create_svc_handler_i (SVC_HANDLER *&sh, + + int find_or_create_svc_handler_i (SVC_HANDLER *&sh, const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, @@ -142,7 +131,7 @@ protected: ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry, int &found); - virtual int connect_svc_handler_i (SVC_HANDLER *&sh, + int connect_svc_handler_i (SVC_HANDLER *&sh, const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, @@ -154,9 +143,14 @@ protected: CONNECTION_CACHE connection_cache_; // Table that maintains the cache of connected <SVC_HANDLER>s. - SVC_CLEANUP_STRATEGY svc_cleanup_strategy_; + SVC_CLEANUP_STRATEGY *svc_cleanup_strategy_; // The strategy which controls the destruction and closing of the // svc_handler. + + CACHING_STRATEGY *caching_strategy_; + // The strategy which decides how and when entries are to be removed + // from the connection_cache. + }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) @@ -168,7 +162,7 @@ protected: #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Cached_Connect_Strategy_T.cpp") +#pragma implementation ("ace/Cached_Connect_Strategy_T.cpp") #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* CACHED_CONNECT_STRATEGY_T_H */ diff --git a/ace/Caching_Strategies_T.cpp b/ace/Caching_Strategies_T.cpp index 532064ae23e..72d5e1ab953 100644 --- a/ace/Caching_Strategies_T.cpp +++ b/ace/Caching_Strategies_T.cpp @@ -16,13 +16,6 @@ ACE_RCSID(ace, Caching_Strategies_T, "$Id$") template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> -ACE_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_Caching_Strategy (void) -{ -} - -////////////////////////////////////////////////////////////////////////////////// - -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::ACE_LRU_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s, int delete_cleanup_strategy, CACHING_STRATEGY_UTILITY *utility_s, @@ -50,13 +43,9 @@ ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI { if (this->delete_cleanup_strategy_ == 1) delete this->cleanup_strategy_; - this->delete_cleanup_strategy_ = 0; - this->cleanup_strategy_ = 0; if (this->delete_caching_strategy_utility_ == 1) delete this->caching_strategy_utility_; - this->delete_caching_strategy_utility_ = 0; - this->caching_strategy_utility_ = 0; } template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int @@ -68,27 +57,24 @@ ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI // Initialise the cleanup strategy. // First we decide whether we need to clean up. - if (this->cleanup_strategy_ != 0 && + if (this->cleanup_strategy_ != 0 && this->delete_cleanup_strategy_ == 1 && cleanup_s != 0) { delete this->cleanup_strategy_; this->cleanup_strategy_ = 0; - this->delete_cleanup_strategy_ = 0; + this->delete_cleanup_strategy_ = delete_cleanup_strategy; } if (cleanup_s != 0) - { - this->cleanup_strategy_ = cleanup_s; - this->delete_cleanup_strategy_ = delete_cleanup_strategy; - } + this->cleanup_strategy_ = cleanup_s; else if (this->cleanup_strategy_ == 0) { ACE_NEW_RETURN (this->cleanup_strategy_, CLEANUP_STRATEGY, -1); - this->delete_cleanup_strategy_ = 1; + this->delete_cleanup_strategy_ = delete_cleanup_strategy; } // Initialise the caching strategy utility. @@ -100,21 +86,18 @@ ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI { delete this->caching_strategy_utility_; this->caching_strategy_utility_ = 0; - this->delete_caching_strategy_utility_ = 0; + this->delete_caching_strategy_utility_ = delete_caching_strategy_utility; } if (utility_s != 0) - { - this->caching_strategy_utility_ = utility_s; - this->delete_caching_strategy_utility_ = delete_caching_strategy_utility; - } + this->caching_strategy_utility_ = utility_s; else if (this->caching_strategy_utility_ == 0) { ACE_NEW_RETURN (this->caching_strategy_utility_, CACHING_STRATEGY_UTILITY, -1); - this->delete_caching_strategy_utility_ = 1; + this->delete_caching_strategy_utility_ = delete_caching_strategy_utility; } return 0; @@ -125,7 +108,19 @@ ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI { return this->caching_strategy_utility_->clear_cache (container, this->cleanup_strategy_, - this->purge_percent_); + this->purge_percent_, + this->entries_); +} + +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int +ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container, + unsigned int &total_container_entries) +{ + + return this->caching_strategy_utility_->clear_cache (container, + this->cleanup_strategy_, + this->purge_percent_, + total_container_entries); } //////////////////////////////////////////////////////////////////////////////////////////////// @@ -155,15 +150,6 @@ ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_LFU_Caching_Strategy (void) { - if (this->delete_cleanup_strategy_ == 1) - delete this->cleanup_strategy_; - this->delete_cleanup_strategy_ = 0; - this->cleanup_strategy_ = 0; - - if (this->delete_caching_strategy_utility_ == 1) - delete this->caching_strategy_utility_; - this->delete_caching_strategy_utility_ = 0; - this->caching_strategy_utility_ = 0; } template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int @@ -192,7 +178,7 @@ ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI CLEANUP_STRATEGY, -1); - this->delete_cleanup_strategy_ = 1; + this->delete_cleanup_strategy_ = delete_cleanup_strategy; } // Initialise the caching strategy utility. @@ -215,7 +201,7 @@ ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI CACHING_STRATEGY_UTILITY, -1); - this->delete_caching_strategy_utility_ = 1; + this->delete_caching_strategy_utility_ = delete_caching_strategy_utility; } return 0; @@ -226,9 +212,19 @@ ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI { return this->caching_strategy_utility_->clear_cache (container, this->cleanup_strategy_, - this->purge_percent_); + this->purge_percent_, + this->entries_); } +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int +ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container, + unsigned int &total_container_entries) +{ + return this->caching_strategy_utility_->clear_cache (container, + this->cleanup_strategy_, + this->purge_percent_, + total_container_entries); +} //////////////////////////////////////////////////////////////////////////////////////////////// @@ -258,15 +254,6 @@ template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHIN ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_FIFO_Caching_Strategy (void) { - if (this->delete_cleanup_strategy_ == 1) - delete this->cleanup_strategy_; - this->delete_cleanup_strategy_ = 0; - this->cleanup_strategy_ = 0; - - if (this->delete_caching_strategy_utility_ == 1) - delete this->caching_strategy_utility_; - this->delete_caching_strategy_utility_ = 0; - this->caching_strategy_utility_ = 0; } template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int @@ -295,7 +282,7 @@ ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT CLEANUP_STRATEGY, -1); - this->delete_cleanup_strategy_ = 1; + this->delete_cleanup_strategy_ = delete_cleanup_strategy; } // Initialise the caching strategy utility. @@ -318,7 +305,7 @@ ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT CACHING_STRATEGY_UTILITY, -1); - this->delete_caching_strategy_utility_ = 1; + this->delete_caching_strategy_utility_ = delete_caching_strategy_utility; } return 0; @@ -329,7 +316,18 @@ ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT { return this->caching_strategy_utility_->clear_cache (container, this->cleanup_strategy_, - this->purge_percent_); + this->purge_percent_, + this->entries_); +} + +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int +ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container, + unsigned int &total_container_entries) +{ + return this->caching_strategy_utility_->clear_cache (container, + this->cleanup_strategy_, + this->purge_percent_, + total_container_entries); } //////////////////////////////////////////////////////////////////////////////////////////////// @@ -357,7 +355,7 @@ ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT ACE_UNUSED_ARG (delete_cleanup_strategy); ACE_UNUSED_ARG (utility_s); ACE_UNUSED_ARG (delete_caching_strategy_utility); - + return 0; } @@ -374,6 +372,16 @@ ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT return 0; } +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int +ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container, + unsigned int &total_container_entries) +{ + ACE_UNUSED_ARG (container); + ACE_UNUSED_ARG (total_container_entries); + + return 0; +} + /////////////////////////////////////////////////////////////////////////////////////////////// ACE_ALLOC_HOOK_DEFINE(ACE_LRU_Caching_Strategy) diff --git a/ace/Caching_Strategies_T.h b/ace/Caching_Strategies_T.h index 44b5e31f096..3b219015e02 100644 --- a/ace/Caching_Strategies_T.h +++ b/ace/Caching_Strategies_T.h @@ -19,7 +19,7 @@ #include "ace/OS.h" -#include "ace/Caching_Utility_T.h" +#include "ace/Caching_Strategy_Utility_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #define ACE_LACKS_PRAGMA_ONCE @@ -28,154 +28,6 @@ #include "ace/Cleanup_Strategies_T.h" template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> -class ACE_Caching_Strategy -{ - // = TITLE - // This class is an abstract base class for a caching strategy. - // - // = DESCRIPTION - // This class consists of all the interfaces a caching strategy should have and - // is used in association with the ACE_Caching_Strategy_Adaptor. - -public: - - virtual ~ACE_Caching_Strategy (void); - // Destructor. - - virtual int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0, - int delete_cleanup_strategy = 1, - CACHING_STRATEGY_UTILITY *utility_s = 0, - int delete_caching_strategy_utility = 1) = 0; - // This method which does the actual initialisation. - - virtual ATTRIBUTES attributes (void) = 0; - // Accessor method for the timer attributes. - - // = Accessor methods for the percentage of entries to purge. - virtual double purge_percent (void) = 0; - virtual void purge_percent (double percentage) = 0; - - // = Strategy related Operations - - virtual int notify_bind (int result, - const ATTRIBUTES &attr) = 0; - // This method acts as a notification about the CONTAINERs bind - // method call. - - virtual int notify_find (int result, - ATTRIBUTES &attr) = 0; - // This method acts as a notification about the CONTAINERs find - // method call - - virtual int notify_unbind (int result, - const ATTRIBUTES &attr) = 0; - // This method acts as a notification about the CONTAINERs unbind - // method call - - virtual int notify_trybind (int result, - ATTRIBUTES &attr) = 0; - // This method acts as a notification about the CONTAINERs trybind - // method call - - virtual int notify_rebind (int result, - const ATTRIBUTES &attr) = 0; - // This method acts as a notification about the CONTAINERs rebind - // method call - - virtual int clear_cache (CONTAINER &container) = 0; - // This is the method which looks at each ITEM's attributes and - // then decides on the one to remove. - - virtual void dump (void) const = 0; - // Dumps the state of the object. -}; - -////////////////////////////////////////////////////////////////////////// - -template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> -class ACE_Caching_Strategy_Adapter : public ACE_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY> -{ - // = TITLE - // This class follows the Adaptor pattern and is used to provide - // External Polymorphism by deriving from ACE_Caching_Strategy. - // - // = DESCRIPTION - // This class simply delegates all requests to the - // IMPLEMNETATION object within. This class should be passed in - // place of the the abstract base ACE_Caching_Strategy class as - // part of the External Polymorphism pattern. - -public: - - ACE_Caching_Strategy_Adapter (IMPLEMENTATION *implementation = 0, - int delete_implementation = 0); - // Constructor. - - ~ACE_Caching_Strategy_Adapter (void); - // Destructor. - - int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0, - int delete_cleanup_strategy = 1, - CACHING_STRATEGY_UTILITY *utility_s = 0, - int delete_caching_strategy_utility = 1); - // This method which does the actual initialisation. - - ATTRIBUTES attributes (void); - // Accessor method for the timer attributes. - - // = Accessor methods for the percentage of entries to purge. - double purge_percent (void); - void purge_percent (double percentage); - - // = Strategy related Operations - - int notify_bind (int result, - const ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs bind - // method call. - - int notify_find (int result, - ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs find - // method call - - int notify_unbind (int result, - const ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs unbind - // method call - - int notify_trybind (int result, - ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs trybind - // method call - - int notify_rebind (int result, - const ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs rebind - // method call - - int clear_cache (CONTAINER &container); - // This is the method which looks at each ITEM's attributes and - // then decides on the one to remove. - - IMPLEMENTATION &implementation (void); - // Accessor to the implementation. - - void dump (void) const; - // Dumps the state of the object. - -private: - - IMPLEMENTATION *implementation_; - // Implementation class. - - int delete_implementation_; - // Do we need to delete the implementation? -}; - -////////////////////////////////////////////////////////////////////////// - -template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> class ACE_LRU_Caching_Strategy { // = TITLE @@ -187,7 +39,7 @@ class ACE_LRU_Caching_Strategy // is updated whenever an item is inserted or looked up in the // container. When the need of purging entries arises, the items // with the lowest timer values are removed. - // + // // Explanation of the template parameter list: // CONTAINER is any map with entries of type <KEY, VALUE>. // The ATTRIBUTES are the deciding factor for purging of entries @@ -195,14 +47,14 @@ class ACE_LRU_Caching_Strategy // doing this are: As being a member of the VALUE or VALUE being // ACE_Pair<x, ATTRIBUTES>. The CACHING_STRATEGY_UTILITY is the // class which can be plugged in and which decides the entries - // to purge. + // to purge. public: // Traits. typedef ATTRIBUTES CACHING_ATTRIBUTES; typedef CONTAINER CACHE; - + // = Initialisation and termination. ACE_LRU_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0, @@ -218,7 +70,7 @@ public: // in the cache which can be purged automagically and by default is // set to 10%. The ultility which helps the caching strategy in the // purging of entries needs to be specified. By default a new one - // will be created of type CACHING_STRATEGY_UTILITY and + // will be created of type CACHING_STRATEGY_UTILITY and // <delete_caching_strategy_utility> decides whether to destroy the // utility object or not. @@ -236,9 +88,9 @@ public: // Accessor method for the timer attributes. // = Accessor methods for the percentage of entries to purge. - double purge_percent (void); - - void purge_percent (double percentage); + unsigned int purge_percent (void); + + void purge_percent (unsigned int percentage); // = Strategy related Operations @@ -249,29 +101,37 @@ public: int notify_find (int result, ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs find + //This method acts as a notification about the CONTAINERs find // method call int notify_unbind (int result, const ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs unbind + //This method acts as a notification about the CONTAINERs unbind // method call int notify_trybind (int result, ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs trybind + //This method acts as a notification about the CONTAINERs trybind // method call int notify_rebind (int result, const ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs rebind + //This method acts as a notification about the CONTAINERs rebind // method call int clear_cache (CONTAINER &container); // This is the method which looks at each ITEM's attributes and // then decides on the one to remove. + int clear_cache (CONTAINER &container, + unsigned int &total_container_entries); + // This is the method which looks at each ITEM's attributes and + // then decides on the one to remove. The <total_container_entries> + // can be specified explicitly and facilitates use of the caching + // strategy even when the <entries_> is not maintained by the + // strategy itself. + void dump (void) const; // Dumps the state of the object. @@ -283,12 +143,12 @@ private: // This element is the one which is the deciding factor for purging // of an ITEM. - double purge_percent_; + unsigned int purge_percent_; // The level about which the purging will happen automagically. unsigned int entries_; // The no of entries bound in the cache. - + ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy_; // The cleanup strategy which can be used to destroy the entries of // the container. @@ -300,7 +160,7 @@ private: CACHING_STRATEGY_UTILITY *caching_strategy_utility_; // This is the helper class which will decide and expunge entries // from the cache. - + int delete_caching_strategy_utility_; // The flag which denotes the ownership of the // caching_strategy_utility. If 1 then this class itself will @@ -330,7 +190,7 @@ class ACE_LFU_Caching_Strategy // doing this are: As being a member of the VALUE or VALUE being // ACE_Pair<x, ATTRIBUTES>. The CACHING_STRATEGY_UTILITY is the // class which can be plugged in and which decides the entries - // to purge. + // to purge. public: @@ -371,12 +231,12 @@ public: // Access the attributes. // = Accessor methods for the percentage of entries to purge. - double purge_percent (void); - - void purge_percent (double percentage); + unsigned int purge_percent (void); + + void purge_percent (unsigned int percentage); // = Strategy related Operations - + int notify_bind (int result, const ATTRIBUTES &attr); // This method acts as a notification about the CONTAINERs bind @@ -388,17 +248,17 @@ public: int notify_unbind (int result, const ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs unbind + //This method acts as a notification about the CONTAINERs unbind // method call int notify_trybind (int result, ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs trybind + //This method acts as a notification about the CONTAINERs trybind // method call int notify_rebind (int result, const ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs rebind + //This method acts as a notification about the CONTAINERs rebind // method call @@ -406,14 +266,22 @@ public: // This is the method which looks at each ITEM's attributes and // then decides on the one to remove. + int clear_cache (CONTAINER &container, + unsigned int &total_container_entries); + // This is the method which looks at each ITEM's attributes and + // then decides on the one to remove. The <total_container_entries> + // can be specified explicitly and facilitates use of the caching + // strategy even when the <entries_> is not maintained by the + // strategy itself. + void dump (void) const; // Dumps the state of the object. private: typedef ACE_Default_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY; - - double purge_percent_; + + unsigned int purge_percent_; // The level about which the purging will happen automagically. unsigned int entries_; @@ -457,7 +325,7 @@ class ACE_FIFO_Caching_Strategy // doing this are: As being a member of the VALUE or VALUE being // ACE_Pair<x, ATTRIBUTES>. The CACHING_STRATEGY_UTILITY is the // class which can be plugged in and which decides the entries - // to purge. + // to purge. public: @@ -481,8 +349,8 @@ public: // purging of entries will be default be the // ACE_Caching_Strategy_Utility and the // <delete_caching_strategy_utility> decides whether to destroy the - // utility or not. - + // utility or not. + ~ACE_FIFO_Caching_Strategy (void); int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0, @@ -497,9 +365,9 @@ public: // Accessor method. // = Accessor methods for the percentage of entries to purge. - double purge_percent (void); - - void purge_percent (double percentage); + unsigned int purge_percent (void); + + void purge_percent (unsigned int percentage); // = Strategy related Operations @@ -509,17 +377,17 @@ public: int notify_find (int result, ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs find + //This method acts as a notification about the CONTAINERs find // method call int notify_unbind (int result, const ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs unbind + //This method acts as a notification about the CONTAINERs unbind // method call int notify_trybind (int result, ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs trybind + //This method acts as a notification about the CONTAINERs trybind // method call int notify_rebind (int result, @@ -530,23 +398,31 @@ public: // This is the method which looks at each ITEM's attributes and // then decides on the one to remove. + int clear_cache (CONTAINER &container, + unsigned int &total_container_entries); + // This is the method which looks at each ITEM's attributes and + // then decides on the one to remove. The <total_container_entries> + // can be specified explicitly and facilitates use of the caching + // strategy even when the <entries_> is not maintained by the + // strategy itself. + void dump (void) const; // Dumps the state of the object. private: typedef ACE_Default_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY; - + ATTRIBUTES order_; // The order is the deciding factor for the item to be removed from // the cache. - double purge_percent_; + unsigned int purge_percent_; // The level about which the purging will happen automagically. unsigned int entries_; // The no of entries bound in the cache. - + ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy_; // The cleanup strategy which can be used to destroy the entries of // the container. @@ -605,9 +481,9 @@ public: // Accessor method. // = Accessor methods for the percentage of entries to purge. - double purge_percent (void); - - void purge_percent (double percentage); + unsigned int purge_percent (void); + + void purge_percent (unsigned int percentage); // = Strategy related Operations @@ -617,17 +493,17 @@ public: int notify_find (int result, ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs find + //This method acts as a notification about the CONTAINERs find // method call int notify_unbind (int result, const ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs unbind + //This method acts as a notification about the CONTAINERs unbind // method call int notify_trybind (int result, ATTRIBUTES &attr); - // This method acts as a notification about the CONTAINERs trybind + //This method acts as a notification about the CONTAINERs trybind // method call int notify_rebind (int result, @@ -638,9 +514,17 @@ public: // This is the method which looks at each ITEM's attributes and // then decides on the one to remove. + int clear_cache (CONTAINER &container, + unsigned int &total_container_entries); + // This is the method which looks at each ITEM's attributes and + // then decides on the one to remove. The <total_container_entries> + // can be specified explicitly and facilitates use of the caching + // strategy even when the <entries_> is not maintained by the + // strategy itself. + void dump (void) const; // Dumps the state of the object. - + }; #if defined (__ACE_INLINE__) @@ -652,7 +536,7 @@ public: #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Caching_Strategies_T.cpp") +#pragma implementation ("ace/Caching_Strategies_T.cpp") #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* CACHING_STRATEGIES_H */ diff --git a/ace/Caching_Strategies_T.i b/ace/Caching_Strategies_T.i index 8e114434cf2..eacd2bfcf59 100644 --- a/ace/Caching_Strategies_T.i +++ b/ace/Caching_Strategies_T.i @@ -1,160 +1,41 @@ /* -*-C++-*- */ //$Id$ -////////////////////////////////////////////////////////////////////////////////// - -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE -ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::ACE_Caching_Strategy_Adapter (IMPLEMENTATION *implementation, - int delete_implementation) - : implementation_ (implementation), - delete_implementation_ (delete_implementation) -{ - if (this->implementation_ == 0) - { - ACE_NEW (this->implementation_, - IMPLEMENTATION); - this->delete_implementation_ = 1; - } -} - -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE -ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::~ACE_Caching_Strategy_Adapter (void) -{ - if (this->delete_implementation_) - delete this->implementation_; - this->delete_implementation_ = 0; - this->implementation_ = 0; -} - -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int -ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s, - int delete_cleanup_strategy, - CACHING_STRATEGY_UTILITY *utility_s, - int delete_caching_strategy_utility) -{ - return this->implementation_->open (cleanup_s, - delete_cleanup_strategy, - utility_s, - delete_caching_strategy_utility); -} - -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE ATTRIBUTES -ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::attributes (void) -{ - return this->implementation_->attributes (); -} - -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE double -ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::purge_percent (void) -{ - return this->implementation_->purge_percent (); -} - -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE void -ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::purge_percent (double percentage) -{ - this->implementation_->purge_percent (percentage); -} - -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int -ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_bind (int result, - const ATTRIBUTES &attr) -{ - return this->implementation_->notify_bind (result, - attr); -} - -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int -ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_find (int result, - ATTRIBUTES &attr) -{ - return this->implementation_->notify_find (result, - attr); -} - -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int -ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_unbind (int result, - const ATTRIBUTES &attr) -{ - return this->implementation_->notify_unbind (result, - attr); -} - -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int -ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_trybind (int result, - ATTRIBUTES &attr) -{ - return this->implementation_->notify_trybind (result, - attr); -} - -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int -ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_rebind (int result, - const ATTRIBUTES &attr) -{ - return this->implementation_->notify_rebind (result, - attr); -} - -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int -ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::clear_cache (CONTAINER &container) -{ - return this->implementation_->clear_cache (container); -} - -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE IMPLEMENTATION & -ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::implementation (void) -{ - return *this->implementation_; -} - - -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE void -ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::dump (void) const -{ - ACE_TRACE ("ACE_Caching_Strategy_Adapter::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -////////////////////////////////////////////////////////////////////////////////// - template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE ATTRIBUTES ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::attributes (void) { return this->timer_; -} +} -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE unsigned int ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void) { return this->purge_percent_; } template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void -ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage) +ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (unsigned int percentage) { this->purge_percent_ = percentage; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result, +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int +ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result, const ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + if (result == 0) { ++this->timer_; ++this->entries_; } - + return result; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result, +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int +ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result, ATTRIBUTES &attr) { if (result == 0) @@ -166,29 +47,29 @@ ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI return result; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result, +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int +ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result, const ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); return result; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result, +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int +ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result, ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + return result; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result, +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int +ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result, const ATTRIBUTES &attr) -{ +{ ACE_UNUSED_ARG (attr); - + if (result == 0) ++this->timer_; @@ -196,10 +77,10 @@ ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI } template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void -ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const +ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const { ACE_TRACE ("ACE_LRU_Caching_Strategy::dump"); - + ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("timer_ = %d "), this->timer_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -213,24 +94,24 @@ ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI return 0; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE unsigned int ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void) { return this->purge_percent_; } template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void -ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage) +ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (unsigned int percentage) { this->purge_percent_ = percentage; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result, +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int +ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result, const ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + if (result == 0) ++this->entries_; @@ -238,43 +119,43 @@ ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI } template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result, +ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result, ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + if (result == 0) ++attr; - return result; + return result; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result, +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int +ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result, ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + return result; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result, +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int +ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result, const ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + if (result == 0) ++this->entries_; return result; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result, +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int +ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result, const ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + return result; } @@ -282,7 +163,7 @@ template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHIN ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const { ACE_TRACE ("ACE_LFU_Caching_Strategy::dump"); - + ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -294,24 +175,24 @@ ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT { return this->order_; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE unsigned int ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void) { return this->purge_percent_; } template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void -ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage) +ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (unsigned int percentage) { this->purge_percent_ = percentage; } template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result, +ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result, const ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + if (result == 0) { ++this->order_; @@ -322,39 +203,39 @@ ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result, +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int +ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result, ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + return result; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result, +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int +ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result, const ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + return result; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result, +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int +ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result, ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + return result; } template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result, - const ATTRIBUTES &attr) +ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result, + const ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + if (result == 0) { ++this->order_; @@ -362,14 +243,14 @@ ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT } return result; -} +} template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const { ACE_TRACE ("ACE_FIFO_Caching_Strategy::dump"); - + ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("order_ = %d "), this->order_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -383,68 +264,68 @@ ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT return 0; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE unsigned int ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void) { return 0; } template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void -ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage) +ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (unsigned int percentage) { ACE_UNUSED_ARG (percentage); } template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result, +ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result, const ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + return result; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result, +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int +ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result, ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + return result; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result, +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int +ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result, const ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + return result; } -template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result, +template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int +ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result, ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + return result; } template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int -ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result, - const ATTRIBUTES &attr) +ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result, + const ATTRIBUTES &attr) { ACE_UNUSED_ARG (attr); - + return result; -} +} template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const { ACE_TRACE ("ACE_Null_Caching_Strategy::dump"); - + ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Caching_Strategy_Utility_T.cpp b/ace/Caching_Strategy_Utility_T.cpp new file mode 100644 index 00000000000..7acbcad8c0a --- /dev/null +++ b/ace/Caching_Strategy_Utility_T.cpp @@ -0,0 +1,190 @@ +//$Id$ + +#ifndef CACHING_STRATEGY_UTILITY_T_C +#define CACHING_STRATEGY_UTILITY_T_C + +#include "ace/Caching_Strategy_Utility_T.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#define ACE_LACKS_PRAGMA_ONCE +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/Cleanup_Strategies_T.h" + +#if !defined (__ACE_INLINE__) +#include "ace/Caching_Strategy_Utility_T.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(ace, Caching_Strategy_Utility_T, "$Id$") + +template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> +ACE_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::~ACE_Caching_Strategy_Utility (void) +{ +} + +///////////////////////////////////////////////////////////////////////////////////////////////////// + +template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> int +ACE_Svc_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::clear_cache (CONTAINER &container, + ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s, + const unsigned int purge_percent, + unsigned int &entries) +{ + // Check that the purge_percent is non-zero. + if (purge_percent == 0) + return 0; + + // Also whether the number of entries in the cache is just one! + // Oops! then thers no way out but exiting. So return an error. + if (entries == 1) + return -1; + + // Calculate the no of entries to remove from the cache depending + // upon the <purge_percent>. + double val = (double) purge_percent / 100; + int no_of_entries = (int) (val * entries + 0.5); + + KEY *key_to_remove = 0; + VALUE *value_to_remove = 0; + + for (int i = 0; i < no_of_entries ; ++i) + { + this->minimum (container, + key_to_remove, + value_to_remove); + + if (cleanup_s->cleanup (container, key_to_remove, value_to_remove) == -1) + return -1; + + --entries; + + } + + return 0; +} + +template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> void +ACE_Svc_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::minimum (CONTAINER &container, + KEY *&key, + VALUE *&value) +{ + typedef ACE_TYPENAME CONTAINER::ITERATOR ITERATOR; + typedef ACE_TYPENAME CONTAINER::ENTRY ITEM; + + ITERATOR iter (container); + ATTRIBUTES min = 0; + ITEM *item = 0; + + // The iterator moves thru the container searching for the entry with the + // lowest ATTRIBUTES. + for (min = (*iter).int_id_.second (), key = &(*iter).ext_id_, value = &(*iter).int_id_; + iter.next (item) != 0; + ++iter) + { + // Ah! an item with lower ATTTRIBUTES... + if (min > (*iter).int_id_.second ()) + { + min = (*iter).int_id_.second (); + key = &(*iter).ext_id_; + value = &(*iter).int_id_; + + } + } +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////// + +template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> int +ACE_Handler_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::clear_cache (CONTAINER &container, + ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s, + const unsigned int purge_percent, + unsigned int &entries) +{ + // Check that the purge_percent is non-zero. + if (purge_percent == 0) + return 0; + + // Also whether the number of entries in the cache is just one! + // Oops! then thers no way out but exiting. So return an error. + if (entries == 1) + return -1; + + // Calculate the no of entries to remove from the cache depending + // upon the <purge_percent>. + double val = (double) purge_percent / 100; + int no_of_entries = (int) (val * entries + 0.5); + + KEY *key_to_remove = 0; + VALUE *value_to_remove = 0; + + for (int i = 0; i < no_of_entries ; ++i) + { + this->minimum (container, + key_to_remove, + value_to_remove); + + if (cleanup_s->cleanup (container, key_to_remove, value_to_remove) == -1) + return -1; + + --entries; + } + + return 0; +} + +template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> void +ACE_Handler_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::minimum (CONTAINER &container, + KEY *&key, + VALUE *&value) +{ + typedef ACE_TYPENAME CONTAINER::ITERATOR ITERATOR; + typedef ACE_TYPENAME CONTAINER::ENTRY ITEM; + + ITERATOR iter (container); + ATTRIBUTES min = 0; + ITEM *item = 0; + + for (min = (*iter).int_id_->caching_attributes (), key = &(*iter).ext_id_, value = &(*iter).int_id_; + iter.next (item) != 0; + ++iter) + { + // Ah! an item with lower ATTTRIBUTES... + if ((min.attributes () > (*iter).int_id_->caching_attributes ().attributes ()) && ((*iter).int_id_->active () != 1)) + { + min = (*iter).int_id_->caching_attributes (); + + key = &(*iter).ext_id_; + + value = &(*iter).int_id_; + } + } + +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////// + +template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> int +ACE_Null_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::clear_cache (CONTAINER &container, + ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s, + const unsigned int purge_percent, + unsigned int &entries) +{ + ACE_UNUSED_ARG (container); + ACE_UNUSED_ARG (cleanup_s); + ACE_UNUSED_ARG (purge_percent); + ACE_UNUSED_ARG (entries); + + return 0; +} + +template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> void +ACE_Null_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::minimum (CONTAINER &container, + KEY *&key, + VALUE *&value) +{ + ACE_UNUSED_ARG (container); + ACE_UNUSED_ARG (key); + ACE_UNUSED_ARG (value); +} + +#endif /* CACHING_STRATEGY_UTILITY_T_C */ diff --git a/ace/Caching_Strategy_Utility_T.h b/ace/Caching_Strategy_Utility_T.h new file mode 100644 index 00000000000..a04ea4e9f12 --- /dev/null +++ b/ace/Caching_Strategy_Utility_T.h @@ -0,0 +1,179 @@ +/* -*- C++ -*- */ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// ace +// +// = FILENAME +// Caching_Strategy_Utility_T.h +// +// = AUTHOR +// Kirthika Parameswaran <kirthika@cs.wustl.edu> +// +// ============================================================================ + +#ifndef CACHING_STRATEGY_UTILITY_H +#define CACHING_STRATEGY_UTILITY_H + +#include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#define ACE_LACKS_PRAGMA_ONCE +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +// Forward declaration +template <class KEY, class VALUE, class CONTAINER> +class ACE_Cleanup_Strategy; +template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> +class ACE_Caching_Strategy_Utility +{ + // = TITLE + // Defines a abstract helper class for the Caching Strategies. + // + // = DESCRIPTION + // This class defines the methods commonly used by the + // different caching strategies. For instance: clear_cache () + // method which decides and purges the entry from the container. + + public: + + virtual ~ACE_Caching_Strategy_Utility (void); + // Destructor. + + virtual int clear_cache (CONTAINER &container, + ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s, + const unsigned int purge_percent, + unsigned int &entries) = 0; + // This method will remove the entries from the cache. + + virtual void minimum (CONTAINER &container, + KEY *&key, + VALUE *&value) = 0; + // Find the entry with minimum caching attributes. + +}; + + +//////////////////////////////////////////////////////////////////////////////////// + +template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> +class ACE_Svc_Caching_Strategy_Utility : public ACE_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES> +{ + // = TITLE + // Defines a helper class for the Caching Strategies. + // + // = DESCRIPTION + // This class defines the methods commonly used by the + // different caching strategies. For instance: clear_cache () + // method which decides and purges the entry from the container. + // Note: This class helps in the caching_strategies using a + // container containing entries of <KEY, ACE_Pair<VALUE, + // attributes>> kind. The attributes helps in deciding the + // entries to be purged. + + public: + + virtual int clear_cache (CONTAINER &container, + ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s, + const unsigned int purge_percent, + unsigned int &entries); + // Purge entries from the <container>. The Cleanup_Strategy will do + // the actual job of cleanup once the entries to be cleaned up are + // decided. + + virtual void minimum (CONTAINER &container, + KEY *&key, + VALUE *&value); + // Find the entry with minimum caching attributes. + +}; + + +//////////////////////////////////////////////////////////////////////////////////////// + +template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> +class ACE_Handler_Caching_Strategy_Utility : public ACE_Caching_Strategy_Utility <KEY, VALUE, CONTAINER, ATTRIBUTES> +{ + // = TITLE + // Defines a helper class for the Caching Strategies. + // + // = DESCRIPTION + // This class defines the methods commonly used by the + // different caching strategies. For instance: clear_cache () + // method which decides and purges the entry from the container. + // Note: This class helps in the caching_strategies using a + // container containing entries of <KEY, HANDLER> kind where the + // HANDLER contains the caching attributes which help in deciding + // the entries to be purged. + +public: + + virtual int clear_cache (CONTAINER &container, + ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s, + const unsigned int purge_percent, + unsigned int &entries); + // Purge entries from the <container>. The Cleanup_Strategy will do + // the actual job of cleanup once the entries to be cleaned up are + // decided. + + virtual void minimum (CONTAINER &container, + KEY *&key, + VALUE *&value); + // Find the entry with minimum caching attributes. + // This is handler specific since this utility is to be used very + // specifically for handler who have caching_attributes for server + // side acched connection management. + +}; + +/////////////////////////////////////////////////////////////////////////// + +template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> +class ACE_Null_Caching_Strategy_Utility : public ACE_Caching_Strategy_Utility <KEY, VALUE, CONTAINER, ATTRIBUTES> +{ + // = TITLE + // Defines a dummy helper class for the Caching Strategies. + // + // = DESCRIPTION + // This class defines the methods commonly used by the + // different caching strategies. For instance: clear_cache () + // method which decides and purges the entry from the container. + // Note: This class is be used with the Null_Caching_Strategy. + +public: + + virtual int clear_cache (CONTAINER &container, + ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s, + const unsigned int purge_percent, + unsigned int &entries); + // Purge entries from the <container>. The Cleanup_Strategy will do + // the actual job of cleanup once the entries to be cleaned up are + // decided. NOte: Here it is a no-op. + + virtual void minimum (CONTAINER &container, + KEY *&key, + VALUE *&value); + // Find the entry with minimum caching attributes. + // This is handler specific since this utility is to be used very + // specifically for handler who have caching_attributes for server + // side acched connection management.Note: Here it is a no-op. + +}; + +/////////////////////////////////////////////////////////////////////////// + +#if defined (__ACE_INLINE__) +#include "ace/Caching_Strategy_Utility_T.i" +#endif /* __ACE_INLINE__ */ + +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) +#include "ace/Caching_Strategy_Utility_T.cpp" +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ + +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) +#pragma implementation ("ace/Caching_Strategy_Utility_T.cpp") +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ + +#endif /* CACHING_STRATEGY_UTILITY_H */ diff --git a/ace/Caching_Utility_T.i b/ace/Caching_Strategy_Utility_T.i index acecbfb986d..0b4fb4c956b 100644 --- a/ace/Caching_Utility_T.i +++ b/ace/Caching_Strategy_Utility_T.i @@ -1,2 +1,4 @@ /* -*-C++-*- */ -// $Id$ +//$Id$ + + diff --git a/ace/Caching_Utility_T.cpp b/ace/Caching_Utility_T.cpp deleted file mode 100644 index 455f336fa7f..00000000000 --- a/ace/Caching_Utility_T.cpp +++ /dev/null @@ -1,183 +0,0 @@ -//$Id$ - -#ifndef CACHING_UTILITY_T_C -#define CACHING_UTILITY_T_C - -#include "ace/Caching_Utility_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#define ACE_LACKS_PRAGMA_ONCE -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Cleanup_Strategies_T.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Caching_Utility_T.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Caching_Utility_T, "$Id$") - -///////////////////////////////////////////////////////////////////////////////////////////////////// - -template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> int -ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cache (CONTAINER &container, - ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s, - double purge_percent) -{ - // Check that the purge_percent is non-zero. - if (purge_percent == 0) - return 0; - - // Get the number of entries in the container. - size_t current_map_size = container.current_size (); - - // Also whether the number of entries in the cache is just one! - // Oops! then there is no way out but exiting. So return an error. - if (current_map_size <= 1) - return 0; - - // Calculate the no of entries to remove from the cache depending - // upon the <purge_percent>. - size_t entries_to_remove = size_t ((double (purge_percent) / 100 * current_map_size) + 0.5); - - KEY *key_to_remove = 0; - VALUE *value_to_remove = 0; - - for (size_t i = 0; i < entries_to_remove ; ++i) - { - this->minimum (container, - key_to_remove, - value_to_remove); - - if (cleanup_s->cleanup (container, - key_to_remove, - value_to_remove) == -1) - return -1; - } - - return 0; -} - -template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> void -ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove) -{ - // Starting values. - ITERATOR iter = container.begin (); - ITERATOR end = container.end (); - ATTRIBUTES min = (*iter).int_id_.second (); - key_to_remove = &(*iter).ext_id_; - value_to_remove = &(*iter).int_id_; - - // The iterator moves thru the container searching for the entry - // with the lowest ATTRIBUTES. - for (++iter; - iter != end; - ++iter) - { - if (min > (*iter).int_id_.second ()) - { - // Ah! an item with lower ATTTRIBUTES... - min = (*iter).int_id_.second (); - key_to_remove = &(*iter).ext_id_; - value_to_remove = &(*iter).int_id_; - } - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////// - -template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> int -ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cache (CONTAINER &container, - ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s, - double purge_percent) -{ - // Check that the purge_percent is non-zero. - if (purge_percent == 0) - return 0; - - // Get the number of entries in the container. - size_t current_map_size = container.current_size (); - - // Also whether the number of entries in the cache is just one! - // Oops! then there is no way out but exiting. So return an error. - if (current_map_size <= 1) - return 0; - - // Calculate the no of entries to remove from the cache depending - // upon the <purge_percent>. - size_t entries_to_remove = (purge_percent / 100 * current_map_size) + 0.5; - - KEY *key_to_remove = 0; - VALUE *value_to_remove = 0; - - for (size_t i = 0; i < entries_to_remove ; ++i) - { - this->minimum (container, - key_to_remove, - value_to_remove); - - if (cleanup_s->cleanup (container, - key_to_remove, - value_to_remove) == -1) - return -1; - } - - return 0; -} - -template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> void -ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove) -{ - // Starting values. - ITERATOR iter = container.begin (); - ITERATOR end = container.end (); - ATTRIBUTES min = (*iter).int_id_->caching_attributes (); - key_to_remove = &(*iter).ext_id_; - value_to_remove = &(*iter).int_id_; - - // The iterator moves thru the container searching for the entry - // with the lowest ATTRIBUTES. - for (++iter; - iter != end; - ++iter) - { - if (min > (*iter).int_id_->caching_attributes () && - (*iter).int_id_->active () != 1) - { - // Ah! an item with lower ATTTRIBUTES... - min = (*iter).int_id_->caching_attributes (); - key_to_remove = &(*iter).ext_id_; - value_to_remove = &(*iter).int_id_; - } - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////// - -template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> int -ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cache (CONTAINER &container, - ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s, - double purge_percent) -{ - ACE_UNUSED_ARG (container); - ACE_UNUSED_ARG (cleanup_s); - ACE_UNUSED_ARG (purge_percent); - - return 0; -} - -template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> void -ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove) -{ - ACE_UNUSED_ARG (container); - ACE_UNUSED_ARG (key_to_remove); - ACE_UNUSED_ARG (value_to_remove); -} - -#endif /* CACHING_UTILITY_T_C */ diff --git a/ace/Caching_Utility_T.h b/ace/Caching_Utility_T.h deleted file mode 100644 index b3264f8841c..00000000000 --- a/ace/Caching_Utility_T.h +++ /dev/null @@ -1,145 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// Caching_Utility_T.h -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -// ============================================================================ - -#ifndef CACHING_UTILITY_H -#define CACHING_UTILITY_H - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#define ACE_LACKS_PRAGMA_ONCE -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Forward declaration -template <class KEY, class VALUE, class CONTAINER> -class ACE_Cleanup_Strategy; - -template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> -class ACE_Pair_Caching_Utility -{ - // = TITLE - // Defines a helper class for the Caching Strategies. - // - // = DESCRIPTION - // This class defines the methods commonly used by the - // different caching strategies. For instance: clear_cache () - // method which decides and purges the entry from the container. - // Note: This class helps in the caching_strategies using a - // container containing entries of <KEY, ACE_Pair<VALUE, - // attributes>> kind. The attributes helps in deciding the - // entries to be purged. -public: - - int clear_cache (CONTAINER &container, - ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s, - double purge_percent); - // Purge entries from the <container>. The Cleanup_Strategy will do - // the actual job of cleanup once the entries to be cleaned up are - // decided. - -protected: - - void minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove); - // Find the entry with minimum caching attributes. -}; - - -//////////////////////////////////////////////////////////////////////////////////////// - -template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> -class ACE_Handler_Caching_Utility -{ - // = TITLE - // Defines a helper class for the Caching Strategies. - // - // = DESCRIPTION - // This class defines the methods commonly used by the - // different caching strategies. For instance: clear_cache () - // method which decides and purges the entry from the container. - // Note: This class helps in the caching_strategies using a - // container containing entries of <KEY, HANDLER> kind where the - // HANDLER contains the caching attributes which help in deciding - // the entries to be purged. -public: - - int clear_cache (CONTAINER &container, - ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s, - double purge_percent); - // Purge entries from the <container>. The Cleanup_Strategy will do - // the actual job of cleanup once the entries to be cleaned up are - // decided. - -protected: - - void minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove); - // Find the entry with minimum caching attributes. This is handler - // specific since this utility is to be used very specifically for - // handler who have caching_attributes for server side acched - // connection management. -}; - -/////////////////////////////////////////////////////////////////////////// - -template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> -class ACE_Null_Caching_Utility -{ - // = TITLE - // Defines a dummy helper class for the Caching Strategies. - // - // = DESCRIPTION - // This class defines the methods commonly used by the - // different caching strategies. For instance: clear_cache () - // method which decides and purges the entry from the container. - // Note: This class is be used with the Null_Caching_Strategy. -public: - - int clear_cache (CONTAINER &container, - ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s, - double purge_percent); - // Purge entries from the <container>. The Cleanup_Strategy will do - // the actual job of cleanup once the entries to be cleaned up are - // decided. NOte: Here it is a no-op. - -protected: - - void minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove); - // Find the entry with minimum caching attributes. This is handler - // specific since this utility is to be used very specifically for - // handler who have caching_attributes for server side acched - // connection management.Note: Here it is a no-op. -}; - -/////////////////////////////////////////////////////////////////////////// - -#if defined (__ACE_INLINE__) -#include "ace/Caching_Utility_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Caching_Utility_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Caching_Utility_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#endif /* CACHING_UTILITY_H */ diff --git a/ace/Cleanup_Strategies_T.h b/ace/Cleanup_Strategies_T.h index 6c266ffc1c5..09f85cf3a05 100644 --- a/ace/Cleanup_Strategies_T.h +++ b/ace/Cleanup_Strategies_T.h @@ -141,7 +141,7 @@ public: #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Cleanup_Strategies_T.cpp") +#pragma implementation ("ace/Cleanup_Strategies_T.cpp") #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* CLEANUP_STRATEGIES_H */ diff --git a/ace/Connector.cpp b/ace/Connector.cpp index 02d3e1d54b8..b77fe99f276 100644 --- a/ace/Connector.cpp +++ b/ace/Connector.cpp @@ -747,8 +747,7 @@ ACE_Strategy_Connector<SH, PR_CO_2>::open else if (this->creation_strategy_ == 0) { ACE_NEW_RETURN (this->creation_strategy_, - CREATION_STRATEGY, - -1); + CREATION_STRATEGY, -1); this->delete_creation_strategy_ = 1; } @@ -769,11 +768,11 @@ ACE_Strategy_Connector<SH, PR_CO_2>::open else if (this->connect_strategy_ == 0) { ACE_NEW_RETURN (this->connect_strategy_, - CONNECT_STRATEGY, - -1); + CONNECT_STRATEGY, -1); this->delete_connect_strategy_ = 1; } + // Initialize the concurrency strategy. if (this->concurrency_strategy_ != 0 && @@ -790,8 +789,7 @@ ACE_Strategy_Connector<SH, PR_CO_2>::open else if (this->concurrency_strategy_ == 0) { ACE_NEW_RETURN (this->concurrency_strategy_, - CONCURRENCY_STRATEGY, - -1); + CONCURRENCY_STRATEGY, -1); this->delete_concurrency_strategy_ = 1; } diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp index 9956bdcdb52..bf85900e970 100644 --- a/ace/Containers_T.cpp +++ b/ace/Containers_T.cpp @@ -32,8 +32,7 @@ ACE_Bounded_Stack<T>::ACE_Bounded_Stack (size_t size) : top_ (0), size_ (size) { - ACE_NEW (this->stack_, - T[size]); + ACE_NEW (this->stack_, T[size]); ACE_TRACE ("ACE_Bounded_Stack<T>::ACE_Bounded_Stack"); } @@ -42,8 +41,7 @@ ACE_Bounded_Stack<T>::ACE_Bounded_Stack (const ACE_Bounded_Stack<T> &s) : top_ (s.top_), size_ (s.size_) { - ACE_NEW (this->stack_, - T[s.size_]); + ACE_NEW (this->stack_, T[s.size_]); ACE_TRACE ("ACE_Bounded_Stack<T>::ACE_Bounded_Stack"); @@ -799,15 +797,6 @@ ACE_Double_Linked_List_Iterator<T>::ACE_Double_Linked_List_Iterator (ACE_Double_ // the list } -template <class T> void -ACE_Double_Linked_List_Iterator<T>::reset (ACE_Double_Linked_List<T> &dll) -{ - this->ACE_Double_Linked_List_Iterator_Base <T>::reset (dll); - this->current_ = ACE_static_cast (T*, dll.head_->next_); - // Advance current_ out of the null area and onto the first item in - // the list -} - template <class T> int ACE_Double_Linked_List_Iterator<T>::first (void) { @@ -899,15 +888,6 @@ ACE_Double_Linked_List_Reverse_Iterator<T>::ACE_Double_Linked_List_Reverse_Itera // the list } -template <class T> void -ACE_Double_Linked_List_Reverse_Iterator<T>::reset (ACE_Double_Linked_List<T> &dll) -{ - this->ACE_Double_Linked_List_Iterator_Base <T>::reset (dll); - this->current_ = ACE_static_cast (T*, dll.head_->prev_); - // Advance current_ out of the null area and onto the last item in - // the list -} - template <class T> int ACE_Double_Linked_List_Reverse_Iterator<T>::first (void) { @@ -1488,8 +1468,8 @@ ACE_Bounded_Set<T>::operator= (const ACE_Bounded_Set<T> &bs) if (this->max_size_ < bs.cur_size_) { delete [] this->search_structure_; - ACE_NEW (this->search_structure_, - ACE_TYPENAME ACE_Bounded_Set<T>::Search_Structure[bs.cur_size_]); + ACE_NEW (this->search_structure_, ACE_TYPENAME + ACE_Bounded_Set<T>::Search_Structure[bs.cur_size_]); this->max_size_ = bs.cur_size_; } diff --git a/ace/Containers_T.h b/ace/Containers_T.h index acfadb4c9b5..eca8af5e6df 100644 --- a/ace/Containers_T.h +++ b/ace/Containers_T.h @@ -620,15 +620,6 @@ public: // = Initialization method. ACE_Double_Linked_List_Iterator (ACE_Double_Linked_List<T> &); - void reset (ACE_Double_Linked_List<T> &); - // Retasks the iterator to iterate over a new - // Double_Linked_List. This allows clients to reuse an iterator - // without incurring the constructor overhead. If you do use this, - // be aware that if there are more than one reference to this - // iterator, the other "clients" may be very bothered when their - // iterator changes. - // @@ Here be dragons. Comments? - int first (void); // Move to the first element in the list. Returns 0 if the // list is empty, else 1. @@ -683,15 +674,6 @@ public: // = Initialization method. ACE_Double_Linked_List_Reverse_Iterator (ACE_Double_Linked_List<T> &); - void reset (ACE_Double_Linked_List<T> &); - // Retasks the iterator to iterate over a new - // Double_Linked_List. This allows clients to reuse an iterator - // without incurring the constructor overhead. If you do use this, - // be aware that if there are more than one reference to this - // iterator, the other "clients" may be very bothered when their - // iterator changes. - // @@ Here be dragons. Comments? - int first (void); // Move to the first element in the list. Returns 0 if the // list is empty, else 1. @@ -882,7 +864,6 @@ class ACE_DLList : public ACE_DLList_Base friend class ACE_DLList_Reverse_Iterator<T>; public: - void operator= (ACE_DLList<T> &l); // Delegates to ACE_Double_Linked_List. @@ -945,30 +926,16 @@ public: // = Initialization method. ACE_DLList_Iterator (ACE_DLList<T> &l); - void reset (ACE_DLList<T> &l); - // Retasks the iterator to iterate over a new - // Double_Linked_List. This allows clients to reuse an iterator - // without incurring the constructor overhead. If you do use this, - // be aware that if there are more than one reference to this - // iterator, the other "clients" may be very bothered when their - // iterator changes. - // @@ Here be dragons. Comments? - // = Iteration methods. int advance (void); // Move forward by one element in the set. Returns 0 when all the // items in the set have been seen, else 1. - int next (T *&); - // Pass back the <next_item> that hasn't been seen in the Stack. - // Returns 0 when all items have been seen, else 1. - T *next (void) const; // Delegates to ACE_Double_Linked_List_Iterator, except that whereas // the Double_Linked_List version of next returns the node, this next // returns the contents of the node - // DEPRECATED - + int remove (void); // Removes the current item (i.e., this->next()) from the list. @@ -998,27 +965,13 @@ public: // = Initialization method. ACE_DLList_Reverse_Iterator (ACE_DLList<T> &l); - void reset (ACE_DLList<T> &l); - // Retasks the iterator to iterate over a new - // Double_Linked_List. This allows clients to reuse an iterator - // without incurring the constructor overhead. If you do use this, - // be aware that if there are more than one reference to this - // iterator, the other "clients" may be very bothered when their - // iterator changes. - // @@ Here be dragons. Comments? - // = Iteration methods. int advance (void); // Move forward by one element in the set. Returns 0 when all the // items in the set have been seen, else 1. - int next (T *&); - // Pass back the <next_item> that hasn't been seen in the Stack. - // Returns 0 when all items have been seen, else 1. - T *next (void) const; // Delegates to ACE_Double_Linked_List_Iterator. - // DEPRECATED int remove (void); // Removes the current item (i.e., this->next()) from the list. diff --git a/ace/Containers_T.i b/ace/Containers_T.i index b9ef057be2c..78cfdb03dfe 100644 --- a/ace/Containers_T.i +++ b/ace/Containers_T.i @@ -495,23 +495,6 @@ ACE_DLList_Iterator<T>::ACE_DLList_Iterator (ACE_DLList<T> &l) { } -template <class T> ACE_INLINE void -ACE_DLList_Iterator<T>::reset (ACE_DLList<T> &l) -{ - list_ = l; - this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::reset ((ACE_DLList_Base &)l); -} - -template <class T> ACE_INLINE int -ACE_DLList_Iterator<T>::next (T *&ptr) -{ - ACE_DLList_Node *temp = - ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::next (); - if (temp) - ptr = (T *) temp->item_; - return temp ? 1 : 0; -} - template <class T> ACE_INLINE T * ACE_DLList_Iterator<T>::next (void) const { @@ -547,28 +530,12 @@ ACE_DLList_Reverse_Iterator<T>::ACE_DLList_Reverse_Iterator (ACE_DLList<T> &l) { } -template <class T> ACE_INLINE void -ACE_DLList_Reverse_Iterator<T>::reset (ACE_DLList<T> &l) -{ - list_ = l; - this->ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::reset ((ACE_DLList_Base &)l); -} - template <class T> ACE_INLINE int ACE_DLList_Reverse_Iterator<T>::advance (void) { return ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::advance (); } -template <class T> ACE_INLINE int -ACE_DLList_Reverse_Iterator<T>::next (T *&ptr) -{ - ACE_DLList_Node *temp = - ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::next (); - ptr = (T *) temp->item_; - return ptr ? 1 : 0; -} - template <class T> ACE_INLINE T * ACE_DLList_Reverse_Iterator<T>::next (void) const { diff --git a/ace/Containers_bad.i b/ace/Containers_bad.i deleted file mode 100644 index 471a9d559d5..00000000000 --- a/ace/Containers_bad.i +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE -ACE_DLList_Node::ACE_DLList_Node (void) - : item_ (0), - next_ (0), - prev_ (0) -{ -} - -ACE_INLINE -ACE_DLList_Node::ACE_DLList_Node (void *&i, - ACE_DLList_Node *n, - ACE_DLList_Node *p) - : item_ (i), - next_ (n), - prev_ (p) -{ -} - -ACE_INLINE -ACE_DLList_Node::~ACE_DLList_Node (void) -{ -} diff --git a/ace/DEV_IO.cpp b/ace/DEV_IO.cpp index 2b9e86f370e..de00433333d 100644 --- a/ace/DEV_IO.cpp +++ b/ace/DEV_IO.cpp @@ -66,9 +66,7 @@ ACE_DEV_IO::send (size_t n, ...) const #if defined (ACE_HAS_ALLOCA) iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); #else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); + ACE_NEW_RETURN (iovp, iovec[total_tuples], -1); #endif /* !defined (ACE_HAS_ALLOCA) */ va_start (argp, n); @@ -103,9 +101,7 @@ ACE_DEV_IO::recv (size_t n, ...) const #if defined (ACE_HAS_ALLOCA) iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); #else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); + ACE_NEW_RETURN (iovp, iovec[total_tuples], -1); #endif /* !defined (ACE_HAS_ALLOCA) */ va_start (argp, n); diff --git a/ace/DLL.cpp b/ace/DLL.cpp index 4e4e81858df..7d84ff9705f 100644 --- a/ace/DLL.cpp +++ b/ace/DLL.cpp @@ -76,8 +76,7 @@ ACE_DLL::open (const char *dll_filename, return result; // The ACE_SHLIB_HANDLE object is obtained. - this->handle_ = ACE_OS::dlopen (ASYS_ONLY_MULTIBYTE_STRING (dll_pathname), - open_mode); + this->handle_ = ACE_OS::dlopen (dll_pathname, open_mode); if (this->handle_ == ACE_SHLIB_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, @@ -118,7 +117,7 @@ ACE_DLL::close (void) // This method is used on error in an library operation. -ASYS_TCHAR * +char * ACE_DLL::error (void) { return ACE_OS::dlerror (); diff --git a/ace/DLL.h b/ace/DLL.h index 361214fd551..d2f0594de3e 100644 --- a/ace/DLL.h +++ b/ace/DLL.h @@ -77,7 +77,7 @@ public: // If <symbol_name> is in the symbol table of the DLL a pointer to // the <symbol_name> is returned. Otherwise, returns 0. - ASYS_TCHAR *error (void); + char *error (void); // Returns a pointer to a string explaining why <symbol> or <open> // failed. diff --git a/ace/Dump.cpp b/ace/Dump.cpp index 7479f2489e1..6e578547bd3 100644 --- a/ace/Dump.cpp +++ b/ace/Dump.cpp @@ -63,9 +63,7 @@ ACE_ODB::instance (void) ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, 0)); if (ACE_ODB::instance_ == 0) - ACE_NEW_RETURN (ACE_ODB::instance_, - ACE_ODB, - 0); + ACE_NEW_RETURN (ACE_ODB::instance_, ACE_ODB, 0); } return ACE_ODB::instance_; diff --git a/ace/Env_Value_T.h b/ace/Env_Value_T.h index 726d1c7b4bb..3921321985f 100644 --- a/ace/Env_Value_T.h +++ b/ace/Env_Value_T.h @@ -42,7 +42,7 @@ public: // variable name or a default value. Before being useful it must // <open()>ed. - ACE_Env_Value (const ASYS_TCHAR *varname, + ACE_Env_Value (const char *varname, const T &vardefault); // Constructor that calls <open>. @@ -52,11 +52,11 @@ public: operator T (void); // Returns the value as type T. - void open (const ASYS_TCHAR *varname, const T &defval); + void open (const char *varname, const T &defval); // The constructor, read <varname> from the enviroment, using // <vardefault> as its value if it is not defined. - const ASYS_TCHAR *varname (void) const; + const char *varname (void) const; // Returns the name of the variable being tracked. private: @@ -66,11 +66,11 @@ private: void fetch_value (void); - const ASYS_TCHAR *varname_; + const char *varname_; T value_; }; -template <class T> void ACE_Convert (const ASYS_TCHAR *s, T &t); +template <class T> void ACE_Convert (const char *s, T &t); // Function to convert a string <s> into type <T>. #if defined (__ACE_INLINE__) @@ -89,62 +89,62 @@ template <class T> void ACE_Convert (const ASYS_TCHAR *s, T &t); // conversion will be necessary. template <class T> inline void -ACE_Convert (const ASYS_TCHAR *s, T &t) +ACE_Convert (const char *s, T &t) { t = T (s); } inline void -ACE_Convert (const ASYS_TCHAR *s, ASYS_TCHAR *&v) +ACE_Convert (const char *s, char *&v) { - v = (ASYS_TCHAR *) s; + v = (char *) s; } inline void -ACE_Convert (const ASYS_TCHAR *s, const ASYS_TCHAR *&v) +ACE_Convert (const char *s, const char *&v) { - v = (const ASYS_TCHAR *) s; + v = (const char *) s; } inline void -ACE_Convert (const ASYS_TCHAR *s, short &si) +ACE_Convert (const char *s, short &si) { si = ACE_static_cast (short, ACE_OS::strtol (s, 0, 10)); } inline void -ACE_Convert (const ASYS_TCHAR *s, u_short &us) +ACE_Convert (const char *s, u_short &us) { us = ACE_static_cast (u_short, ACE_OS::strtol (s, 0, 10)); } inline void -ACE_Convert (const ASYS_TCHAR *s, u_int &i) +ACE_Convert (const char *s, u_int &i) { i = ACE_static_cast (u_int, ACE_OS::strtol (s, 0, 10)); } inline void -ACE_Convert (const ASYS_TCHAR *s, long &l) +ACE_Convert (const char *s, long &l) { l = ACE_OS::strtol (s, 0, 10); } inline void -ACE_Convert (const ASYS_TCHAR *s, int &i) +ACE_Convert (const char *s, int &i) { i = ACE_static_cast (int, ACE_OS::strtol (s, 0, 10)); } inline void -ACE_Convert (const ASYS_TCHAR *s, u_long &ul) +ACE_Convert (const char *s, u_long &ul) { ul = ACE_OS::strtoul (s, 0, 10); } inline void -ACE_Convert (const ASYS_TCHAR *s, double &d) +ACE_Convert (const char *s, double &d) { d = ACE_OS::strtod (s, 0); } diff --git a/ace/Env_Value_T.i b/ace/Env_Value_T.i index 25598c8dad5..b01f9920110 100644 --- a/ace/Env_Value_T.i +++ b/ace/Env_Value_T.i @@ -13,7 +13,7 @@ ACE_Env_Value<T>::ACE_Env_Value (void) } template <class T> ACE_INLINE -ACE_Env_Value<T>::ACE_Env_Value (const ASYS_TCHAR *varname, +ACE_Env_Value<T>::ACE_Env_Value (const char *varname, const T &defval) : varname_ (varname), value_(defval) @@ -22,7 +22,7 @@ ACE_Env_Value<T>::ACE_Env_Value (const ASYS_TCHAR *varname, } template <class T> ACE_INLINE void -ACE_Env_Value<T>::open (const ASYS_TCHAR *varname, +ACE_Env_Value<T>::open (const char *varname, const T &defval) { varname_ = varname; @@ -33,13 +33,13 @@ ACE_Env_Value<T>::open (const ASYS_TCHAR *varname, template <class T> ACE_INLINE void ACE_Env_Value<T>::fetch_value (void) { - const ASYS_TCHAR *env = ACE_OS::getenv (varname_); + const char *env = ACE_OS::getenv (varname_); if (env != 0) ACE_Convert (env, value_); } -template <class T> ACE_INLINE const ASYS_TCHAR* +template <class T> ACE_INLINE const char* ACE_Env_Value<T>::varname (void) const { return varname_; diff --git a/ace/Event_Handler_T.h b/ace/Event_Handler_T.h index 572337e5e36..f32a110d011 100644 --- a/ace/Event_Handler_T.h +++ b/ace/Event_Handler_T.h @@ -26,7 +26,7 @@ #if defined (ACE_HAS_TEMPLATE_TYPEDEFS) template <class T> -class ACE_Event_Handler_T : public ACE_Event_Handler +class ACE_Export ACE_Event_Handler_T : public ACE_Event_Handler { // = TITLE // Enable a class that doesn't inherit from the diff --git a/ace/Event_Handler_T.i b/ace/Event_Handler_T.i index e048e45931d..160eac4e5e3 100644 --- a/ace/Event_Handler_T.i +++ b/ace/Event_Handler_T.i @@ -1,28 +1,30 @@ /* -*- C++ -*- */ // $Id$ -template<class T> ACE_INLINE void +// Event_Handler_T.i + +template<class T> void ACE_INLINE ACE_Event_Handler_T<T>::op_handler (T *op) { ACE_TRACE ("ACE_Event_Handler_T<T>::op_handler"); this->op_handler_ = op; } -template<class T> ACE_INLINE T * +template<class T> ACE_INLINE T * ACE_Event_Handler_T<T>::op_handler (void) { ACE_TRACE ("ACE_Event_Handler_T<T>::op_handler"); return this->op_handler_; } -template<class T> ACE_INLINE ACE_HANDLE +template<class T> ACE_HANDLE ACE_INLINE ACE_Event_Handler_T<T>::get_handle (void) const { ACE_TRACE ("ACE_Event_Handler_T<T>::get_handle"); return this->get_handle_ == 0 ? -1 : (this->op_handler_->*get_handle_) (); } -template<class T> ACE_INLINE void +template<class T> void ACE_INLINE ACE_Event_Handler_T<T>::set_handle (ACE_HANDLE h) { ACE_TRACE ("ACE_Event_Handler_T<T>::set_handle"); @@ -30,21 +32,21 @@ ACE_Event_Handler_T<T>::set_handle (ACE_HANDLE h) (this->op_handler_->*set_handle_) (h); } -template<class T> ACE_INLINE int +template<class T> int ACE_INLINE ACE_Event_Handler_T<T>::handle_input (ACE_HANDLE fd) { ACE_TRACE ("ACE_Event_Handler_T<T>::handle_input"); return this->input_handler_ == 0 ? 0 : (this->op_handler_->*input_handler_) (fd); } -template<class T> ACE_INLINE int +template<class T> int ACE_INLINE ACE_Event_Handler_T<T>::handle_output (ACE_HANDLE fd) { ACE_TRACE ("ACE_Event_Handler_T<T>::handle_output"); return this->output_handler_ == 0 ? 0 : (this->op_handler_->*output_handler_) (fd); } -template<class T> ACE_INLINE int +template<class T> ACE_INLINE int ACE_Event_Handler_T<T>::handle_exception (ACE_HANDLE fd) { ACE_TRACE ("ACE_Event_Handler_T<T>::handle_exception"); @@ -79,7 +81,7 @@ ACE_Event_Handler_T<T>::handle_get (void) return this->get_handle_; } -template<class T> ACE_INLINE void +template<class T> ACE_INLINE void ACE_Event_Handler_T<T>::handle_get (ACE_Event_Handler_T<T>::GET_HANDLE h) { ACE_TRACE ("ACE_Event_Handler_T<T>::handle_get"); @@ -114,7 +116,7 @@ ACE_Event_Handler_T<T>::input_handler (ACE_Event_Handler_T<T>::IO_HANDLER h) this->input_handler_ = h; } -template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER +template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER ACE_Event_Handler_T<T>::output_handler (void) { ACE_TRACE ("ACE_Event_Handler_T<T>::output_handler"); @@ -128,7 +130,7 @@ ACE_Event_Handler_T<T>::output_handler (ACE_Event_Handler_T<T>::IO_HANDLER h) this->output_handler_ = h; } -template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER +template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER ACE_Event_Handler_T<T>::except_handler (void) { ACE_TRACE ("ACE_Event_Handler_T<T>::except_handler"); @@ -142,7 +144,7 @@ ACE_Event_Handler_T<T>::except_handler (ACE_Event_Handler_T<T>::IO_HANDLER h) this->except_handler_ = h; } -template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::TO_HANDLER +template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::TO_HANDLER ACE_Event_Handler_T<T>::to_handler (void) { ACE_TRACE ("ACE_Event_Handler_T<T>::to_handler"); @@ -156,7 +158,7 @@ ACE_Event_Handler_T<T>::to_handler (ACE_Event_Handler_T<T>::TO_HANDLER h) this->to_handler_ = h; } -template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::CL_HANDLER +template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::CL_HANDLER ACE_Event_Handler_T<T>::cl_handler (void) { ACE_TRACE ("ACE_Event_Handler_T<T>::cl_handler"); @@ -170,7 +172,7 @@ ACE_Event_Handler_T<T>::cl_handler (ACE_Event_Handler_T<T>::CL_HANDLER h) this->cl_handler_ = h; } -template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::SIG_HANDLER +template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::SIG_HANDLER ACE_Event_Handler_T<T>::sig_handler (void) { ACE_TRACE ("ACE_Event_Handler_T<T>::sig_handler"); diff --git a/ace/FIFO.cpp b/ace/FIFO.cpp index 6bca0a8d62e..7301dae0df9 100644 --- a/ace/FIFO.cpp +++ b/ace/FIFO.cpp @@ -25,7 +25,7 @@ ACE_FIFO::dump (void) const } int -ACE_FIFO::open (const ASYS_TCHAR *r, int flags, int perms, +ACE_FIFO::open (const char *r, int flags, int perms, LPSECURITY_ATTRIBUTES sa) { ACE_TRACE ("ACE_FIFO::open"); @@ -46,7 +46,7 @@ ACE_FIFO::open (const ASYS_TCHAR *r, int flags, int perms, return this->get_handle () == ACE_INVALID_HANDLE ? -1 : 0; } -ACE_FIFO::ACE_FIFO (const ASYS_TCHAR *fifo_name, +ACE_FIFO::ACE_FIFO (const char *fifo_name, int flags, int perms, LPSECURITY_ATTRIBUTES sa) diff --git a/ace/FIFO.h b/ace/FIFO.h index a671a1a50f6..1e5b20392a0 100644 --- a/ace/FIFO.h +++ b/ace/FIFO.h @@ -34,7 +34,7 @@ class ACE_Export ACE_FIFO : public ACE_IPC_SAP // IPC mechanism that will be portable to both UNIX and Win32, // take a look at the <ACE_SPIPE_*> classes. public: - int open (const ASYS_TCHAR *rendezvous, int flags, int perms, + int open (const char *rendezvous, int flags, int perms, LPSECURITY_ATTRIBUTES sa = 0); // Open up the named pipe on the <rendezvous> in accordance with the // flags. @@ -46,7 +46,7 @@ public: // Close down the ACE_FIFO and remove the rendezvous point from the // file system. - int get_local_addr (const ASYS_TCHAR *&rendezvous) const; + int get_local_addr (const char *&rendezvous) const; // Return the local address of this endpoint. void dump (void) const; @@ -60,13 +60,13 @@ protected: ACE_FIFO (void); // Default constructor. - ACE_FIFO (const ASYS_TCHAR *rendezvous, int flags, int perms, + ACE_FIFO (const char *rendezvous, int flags, int perms, LPSECURITY_ATTRIBUTES sa = 0); // Open up the named pipe on the <rendezvous> in accordance with the // flags. private: - ASYS_TCHAR rendezvous_[MAXPATHLEN + 1]; + char rendezvous_[MAXPATHLEN + 1]; // Rendezvous point in the file system. }; diff --git a/ace/FIFO.i b/ace/FIFO.i index 52f3555495a..d5aa8fb1943 100644 --- a/ace/FIFO.i +++ b/ace/FIFO.i @@ -3,8 +3,8 @@ // FIFO.i -ACE_INLINE int -ACE_FIFO::get_local_addr (const ASYS_TCHAR *&r) const +ACE_INLINE int +ACE_FIFO::get_local_addr (const char *&r) const { ACE_TRACE ("ACE_FIFO::get_local_addr"); r = this->rendezvous_; @@ -18,3 +18,4 @@ ACE_FIFO::remove (void) int result = this->close (); return ACE_OS::unlink (this->rendezvous_) == -1 || result == -1 ? -1 : 0; } + diff --git a/ace/FIFO_Recv.cpp b/ace/FIFO_Recv.cpp index bbdb3bb6672..ad9e57d09e4 100644 --- a/ace/FIFO_Recv.cpp +++ b/ace/FIFO_Recv.cpp @@ -41,7 +41,7 @@ ACE_FIFO_Recv::close (void) // aren't any writers at the moment! int -ACE_FIFO_Recv::open (const ASYS_TCHAR *fifo_name, +ACE_FIFO_Recv::open (const char *fifo_name, int flags, int perms, int persistent, @@ -66,7 +66,7 @@ ACE_FIFO_Recv::ACE_FIFO_Recv (void) ACE_TRACE ("ACE_FIFO_Recv::ACE_FIFO_Recv"); } -ACE_FIFO_Recv::ACE_FIFO_Recv (const ASYS_TCHAR *fifo_name, +ACE_FIFO_Recv::ACE_FIFO_Recv (const char *fifo_name, int flags, int perms, int persistent, @@ -82,3 +82,4 @@ ACE_FIFO_Recv::ACE_FIFO_Recv (const ASYS_TCHAR *fifo_name, sa) == -1) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_FIFO_Recv"))); } + diff --git a/ace/FIFO_Recv.h b/ace/FIFO_Recv.h index f5de468e91f..c1f9d0aad9c 100644 --- a/ace/FIFO_Recv.h +++ b/ace/FIFO_Recv.h @@ -33,14 +33,14 @@ public: ACE_FIFO_Recv (void); // Default constructor. - ACE_FIFO_Recv (const ASYS_TCHAR *rendezvous, + ACE_FIFO_Recv (const char *rendezvous, int flags = O_CREAT | O_RDONLY, int perms = ACE_DEFAULT_FILE_PERMS, int persistent = 1, LPSECURITY_ATTRIBUTES sa = 0); // Open up a bytestream named pipe for reading. - int open (const ASYS_TCHAR *rendezvous, + int open (const char *rendezvous, int flags = O_CREAT | O_RDONLY, int perms = ACE_DEFAULT_FILE_PERMS, int persistent = 1, diff --git a/ace/FIFO_Recv_Msg.cpp b/ace/FIFO_Recv_Msg.cpp index c4c9e2cf529..d9131331e44 100644 --- a/ace/FIFO_Recv_Msg.cpp +++ b/ace/FIFO_Recv_Msg.cpp @@ -25,8 +25,8 @@ ACE_FIFO_Recv_Msg::dump (void) const // reading." This ensures that the FIFO never gets EOF, even if there // aren't any writers at the moment! -int -ACE_FIFO_Recv_Msg::open (const ASYS_TCHAR *fifo_name, +int +ACE_FIFO_Recv_Msg::open (const char *fifo_name, int flags, int perms, int persistent, @@ -46,7 +46,7 @@ ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (void) ACE_TRACE ("ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg"); } -ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (const ASYS_TCHAR *fifo_name, +ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (const char *fifo_name, int flags, int perms, int persistent, @@ -56,7 +56,7 @@ ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (const ASYS_TCHAR *fifo_name, if (this->ACE_FIFO_Recv_Msg::open (fifo_name, flags, - perms, + perms, persistent, sa) == -1) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_FIFO_Recv_Msg"))); diff --git a/ace/FIFO_Recv_Msg.h b/ace/FIFO_Recv_Msg.h index 57a0697b5a2..7f5cabcfb2d 100644 --- a/ace/FIFO_Recv_Msg.h +++ b/ace/FIFO_Recv_Msg.h @@ -32,14 +32,14 @@ public: ACE_FIFO_Recv_Msg (void); // Default constructor. - ACE_FIFO_Recv_Msg (const ASYS_TCHAR *rendezvous, + ACE_FIFO_Recv_Msg (const char *rendezvous, int flags = O_CREAT | O_RDONLY, int perms = ACE_DEFAULT_FILE_PERMS, int persistent = 1, LPSECURITY_ATTRIBUTES sa = 0); // Open up a record-oriented named pipe for reading. - int open (const ASYS_TCHAR *rendezvous, + int open (const char *rendezvous, int flags = O_CREAT | O_RDONLY, int perms = ACE_DEFAULT_FILE_PERMS, int persistent = 1, diff --git a/ace/FIFO_Send.cpp b/ace/FIFO_Send.cpp index 5906f6c8e69..b0b9ae74e57 100644 --- a/ace/FIFO_Send.cpp +++ b/ace/FIFO_Send.cpp @@ -27,29 +27,17 @@ ACE_FIFO_Send::ACE_FIFO_Send (void) } int -ACE_FIFO_Send::open (const ASYS_TCHAR *rendezvous_name, - int flags, - int perms, +ACE_FIFO_Send::open (const char *rendezvous_name, int flags, int perms, LPSECURITY_ATTRIBUTES sa) { ACE_TRACE ("ACE_FIFO_Send::open"); - return ACE_FIFO::open (rendezvous_name, - flags | O_WRONLY, - perms, - sa); + return ACE_FIFO::open (rendezvous_name, flags | O_WRONLY, perms, sa); } -ACE_FIFO_Send::ACE_FIFO_Send (const ASYS_TCHAR *fifo_name, - int flags, - int perms, +ACE_FIFO_Send::ACE_FIFO_Send (const char *fifo_name, int flags, int perms, LPSECURITY_ATTRIBUTES sa) { ACE_TRACE ("ACE_FIFO_Send::ACE_FIFO_Send"); - if (this->ACE_FIFO_Send::open (fifo_name, - flags, - perms, - sa) == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_FIFO_Send::ACE_FIFO_Send"))); + if (this->ACE_FIFO_Send::open (fifo_name, flags, perms, sa) == -1) + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_FIFO_Send::ACE_FIFO_Send"))); } diff --git a/ace/FIFO_Send.h b/ace/FIFO_Send.h index 1a402f71746..65a36178071 100644 --- a/ace/FIFO_Send.h +++ b/ace/FIFO_Send.h @@ -32,13 +32,13 @@ public: ACE_FIFO_Send (void); // Default constructor. - ACE_FIFO_Send (const ASYS_TCHAR *rendezvous, + ACE_FIFO_Send (const char *rendezvous, int flags = O_WRONLY, int perms = ACE_DEFAULT_FILE_PERMS, LPSECURITY_ATTRIBUTES sa = 0); // Open up a bytestream named pipe for writing. - int open (const ASYS_TCHAR *rendezvous, + int open (const char *rendezvous, int flags = O_WRONLY, int perms = ACE_DEFAULT_FILE_PERMS, LPSECURITY_ATTRIBUTES sa = 0); @@ -62,3 +62,4 @@ public: #endif #endif /* ACE_FIFO_SEND_H */ + diff --git a/ace/FIFO_Send_Msg.cpp b/ace/FIFO_Send_Msg.cpp index 7691a16026c..e88c1243688 100644 --- a/ace/FIFO_Send_Msg.cpp +++ b/ace/FIFO_Send_Msg.cpp @@ -26,9 +26,9 @@ ACE_FIFO_Send_Msg::send (const ACE_Str_Buf &send_msg) { // ACE_TRACE ("ACE_FIFO_Send_Msg::send"); #if defined (ACE_HAS_STREAM_PIPES) - return ACE_OS::putmsg (this->get_handle (), - (strbuf *) 0, - (strbuf *) &send_msg, + return ACE_OS::putmsg (this->get_handle (), + (strbuf *) 0, + (strbuf *) &send_msg, 0); #else iovec iov[2]; @@ -49,8 +49,8 @@ ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (void) } int -ACE_FIFO_Send_Msg::open (const ASYS_TCHAR *fifo_name, - int flags, +ACE_FIFO_Send_Msg::open (const char *fifo_name, + int flags, int perms, LPSECURITY_ATTRIBUTES sa) { @@ -58,8 +58,8 @@ ACE_FIFO_Send_Msg::open (const ASYS_TCHAR *fifo_name, return ACE_FIFO_Send::open (fifo_name, flags | O_WRONLY, perms, sa); } -ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (const ASYS_TCHAR *fifo_name, - int flags, +ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (const char *fifo_name, + int flags, int perms, LPSECURITY_ATTRIBUTES sa) { diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h index 78b2f82ac4a..20dc659b880 100644 --- a/ace/FIFO_Send_Msg.h +++ b/ace/FIFO_Send_Msg.h @@ -33,13 +33,13 @@ public: ACE_FIFO_Send_Msg (void); // Default constructor. - ACE_FIFO_Send_Msg (const ASYS_TCHAR *rendezvous, + ACE_FIFO_Send_Msg (const char *rendezvous, int flags = O_WRONLY, int perms = ACE_DEFAULT_FILE_PERMS, LPSECURITY_ATTRIBUTES sa = 0); // Open up a record-oriented named pipe for writing. - int open (const ASYS_TCHAR *rendezvous, + int open (const char *rendezvous, int flags = O_WRONLY, int perms = ACE_DEFAULT_FILE_PERMS, LPSECURITY_ATTRIBUTES sa = 0); @@ -76,3 +76,4 @@ public: #endif #endif /* ACE_FIFO_SEND_MSG_H */ + diff --git a/ace/FILE_Connector.i b/ace/FILE_Connector.i index 608ce4a9bdc..a05db9b8e3d 100644 --- a/ace/FILE_Connector.i +++ b/ace/FILE_Connector.i @@ -3,10 +3,10 @@ // FILE_Connector.i -// Creates a Local ACE_FILE. +// Creates a Local ACE_FILE. ASYS_INLINE -ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io, +ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io, const ACE_FILE_Addr &remote_sap, ACE_Time_Value *timeout, const ACE_Addr &local_sap, @@ -15,13 +15,11 @@ ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io, int perms) { ACE_TRACE ("ACE_FILE_Connector::ACE_FILE_Connector"); - if (this->connect (new_io, remote_sap, timeout, local_sap, + if (this->connect (new_io, remote_sap, timeout, local_sap, reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("address %s, %p\n"), - remote_sap.get_path_name (), - ASYS_TEXT ("ACE_FILE_IO"))); + ACE_ERROR ((LM_ERROR, "address %s, %p\n", + remote_sap.get_path_name (), "ACE_FILE_IO")); } ASYS_INLINE int @@ -31,3 +29,4 @@ ACE_FILE_Connector::reset_new_handle (ACE_HANDLE handle) // Nothing to do here since the handle is not a socket return 0; } + diff --git a/ace/FILE_IO.cpp b/ace/FILE_IO.cpp index 353a8060672..9f5a848bcce 100644 --- a/ace/FILE_IO.cpp +++ b/ace/FILE_IO.cpp @@ -44,9 +44,7 @@ ACE_FILE_IO::send (size_t n, ...) const #if defined (ACE_HAS_ALLOCA) iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); #else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); + ACE_NEW_RETURN (iovp, iovec[total_tuples], -1); #endif /* !defined (ACE_HAS_ALLOCA) */ va_start (argp, n); @@ -83,9 +81,7 @@ ACE_FILE_IO::recv (size_t n, ...) const #if defined (ACE_HAS_ALLOCA) iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); #else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); + ACE_NEW_RETURN (iovp, iovec[total_tuples], -1); #endif /* !defined (ACE_HAS_ALLOCA) */ va_start (argp, n); diff --git a/ace/Filecache.cpp b/ace/Filecache.cpp index e421ff78905..6d5379eee91 100644 --- a/ace/Filecache.cpp +++ b/ace/Filecache.cpp @@ -124,6 +124,7 @@ ACE_Filecache_Handle::size (void) const return this->file_->size (); } + // ------------------ // ACE_Filecache_Hash // ------------------ @@ -203,9 +204,7 @@ ACE_Filecache::instance (void) // @@ James, please check each of the ACE_NEW_RETURN calls to // make sure that it is safe to return if allocation fails. if (ACE_Filecache::cvf_ == 0) - ACE_NEW_RETURN (ACE_Filecache::cvf_, - ACE_Filecache, - 0); + ACE_NEW_RETURN (ACE_Filecache::cvf_, ACE_Filecache, 0); } return ACE_Filecache::cvf_; @@ -645,7 +644,7 @@ int ACE_Filecache_Object::error_i (int error_value, const char *s) { s = s; - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p.\n"), s)); + ACE_ERROR ((LM_ERROR, "%p.\n", s)); this->error_ = error_value; return error_value; } diff --git a/ace/Free_List.cpp b/ace/Free_List.cpp index 703e2f7f572..7bb41473bed 100644 --- a/ace/Free_List.cpp +++ b/ace/Free_List.cpp @@ -64,7 +64,7 @@ ACE_Locked_Free_List<T, ACE_LOCK>::alloc (size_t n) { for (; n > 0; n--) { - T *temp = 0; + T *temp; ACE_NEW (temp, T); temp->set_next (this->free_list_); this->free_list_ = temp; diff --git a/ace/Functor.h b/ace/Functor.h index a38ad2f120e..c119b86a493 100644 --- a/ace/Functor.h +++ b/ace/Functor.h @@ -115,6 +115,7 @@ public: // Simply returns t }; + // @@ ADD HASHES FOR ACE TYPES ACE_TEMPLATE_SPECIALIZATION diff --git a/ace/Functor.i b/ace/Functor.i index 93759f5d176..abb2ca799a7 100644 --- a/ace/Functor.i +++ b/ace/Functor.i @@ -51,57 +51,48 @@ ACE_Command_Base::~ACE_Command_Base (void) // STL-style Functor Classes and Template Specializations // //////////////////////////////////////////////////////////// -ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_INLINE -u_long +ACE_INLINE u_long ACE_Hash<char>::operator () (char t) const { return t; } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE u_long ACE_Hash<signed char>::operator () (signed char t) const { return t; } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE u_long ACE_Hash<unsigned char>::operator () (unsigned char t) const { return t; } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE u_long ACE_Hash<ACE_INT16>::operator () (ACE_INT16 t) const { return t; } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE u_long ACE_Hash<ACE_UINT16>::operator () (ACE_UINT16 t) const { return t; } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE u_long ACE_Hash<ACE_INT32>::operator () (ACE_INT32 t) const { return t; } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE u_long ACE_Hash<ACE_UINT32>::operator () (ACE_UINT32 t) const { return t; } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE u_long ACE_Hash<ACE_UINT64>::operator () (ACE_UINT64 t) const { @@ -109,14 +100,12 @@ ACE_Hash<ACE_UINT64>::operator () (ACE_UINT64 t) const } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE u_long ACE_Hash<const char *>::operator () (const char *t) const { return ACE::hash_pjw (t); } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE u_long ACE_Hash<char *>::operator () (const char *t) const { @@ -124,14 +113,12 @@ ACE_Hash<char *>::operator () (const char *t) const } #if !defined (ACE_HAS_WCHAR_TYPEDEFS_CHAR) -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE u_long ACE_Hash<const wchar_t *>::operator () (const wchar_t *t) const { return ACE::hash_pjw (t); } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE u_long ACE_Hash<wchar_t *>::operator () (const wchar_t *t) const { @@ -140,14 +127,12 @@ ACE_Hash<wchar_t *>::operator () (const wchar_t *t) const #endif /* ! ACE_HAS_WCHAR_TYPEDEFS_CHAR */ #if !defined (ACE_HAS_WCHAR_TYPEDEFS_USHORT) -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE u_long ACE_Hash<const ACE_USHORT16 *>::operator () (const ACE_USHORT16 *t) const { return ACE::hash_pjw (t); } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE u_long ACE_Hash<ACE_USHORT16 *>::operator () (const ACE_USHORT16 *t) const { @@ -155,14 +140,12 @@ ACE_Hash<ACE_USHORT16 *>::operator () (const ACE_USHORT16 *t) const } #endif /* ! ACE_HAS_WCHAR_TYPEDEFS_USHORT */ -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Equal_To<const char *>::operator () (const char *lhs, const char *rhs) const { return !ACE_OS::strcmp (lhs, rhs); } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Equal_To<char *>::operator () (const char *lhs, const char *rhs) const { @@ -170,14 +153,12 @@ ACE_Equal_To<char *>::operator () (const char *lhs, const char *rhs) const } #if !defined (ACE_HAS_WCHAR_TYPEDEFS_CHAR) -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Equal_To<const wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) const { return !ACE_OS::strcmp (lhs, rhs); } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Equal_To<wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) const { @@ -186,14 +167,12 @@ ACE_Equal_To<wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) co #endif /* ! ACE_HAS_WCHAR_TYPEDEFS_CHAR */ #if !defined (ACE_HAS_WCHAR_TYPEDEFS_USHORT) -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Equal_To<const ACE_USHORT16 *>::operator () (const ACE_USHORT16 *lhs, const ACE_USHORT16 *rhs) const { return !ACE_OS::strcmp (lhs, rhs); } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Equal_To<ACE_USHORT16 *>::operator () (const ACE_USHORT16 *lhs, const ACE_USHORT16 *rhs) const { @@ -201,14 +180,12 @@ ACE_Equal_To<ACE_USHORT16 *>::operator () (const ACE_USHORT16 *lhs, const ACE_US } #endif /* ! ACE_HAS_WCHAR_TYPEDEFS_USHORT */ -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Less_Than<const char *>::operator () (const char *lhs, const char *rhs) const { return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0; } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Less_Than<char *>::operator () (const char *lhs, const char *rhs) const { @@ -216,14 +193,12 @@ ACE_Less_Than<char *>::operator () (const char *lhs, const char *rhs) const } #if !defined (ACE_HAS_WCHAR_TYPEDEFS_CHAR) -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Less_Than<const wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) const { return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0; } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Less_Than<wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) const { @@ -232,14 +207,12 @@ ACE_Less_Than<wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) c #endif /* ! ACE_HAS_WCHAR_TYPEDEFS_CHAR */ #if !defined (ACE_HAS_WCHAR_TYPEDEFS_USHORT) -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Less_Than<const ACE_USHORT16 *>::operator () (const ACE_USHORT16 *lhs, const ACE_USHORT16 *rhs) const { return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0; } -ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Less_Than<ACE_USHORT16 *>::operator () (const ACE_USHORT16 *lhs, const ACE_USHORT16 *rhs) const { diff --git a/ace/Functor_T.h b/ace/Functor_T.h index 238cea27650..710a2a22218 100644 --- a/ace/Functor_T.h +++ b/ace/Functor_T.h @@ -10,9 +10,9 @@ // Functor_T.h // // = DESCRIPTION -// Templatized classes for implementing function objects that are used in -// various places in ACE. There are currently two major categories of -// function objects in ACE: GOF Command Pattern objects, and STL-style +// Templatized classes for implementing function objects that are used in +// various places in ACE. There are currently two major categories of +// function objects in ACE: GOF Command Pattern objects, and STL-style // functors for comparison of container elements. The command objects // are invoked via an execute () method, while the STL-style functors are // invoked via an operator() () method. @@ -91,33 +91,21 @@ class ACE_Hash // Function object for hashing // public: - u_long operator () (const TYPE &t) const; + u_long operator () (const TYPE &t) const; // Simply calls t.hash () }; template <class TYPE> -class ACE_Pointer_Hash -{ - // = TITLE - // - // Function object for hashing pointers - // -public: - u_long operator () (TYPE t) const; - // Simply returns t. -}; - -template <class TYPE> class ACE_Equal_To { // = TITLE // - // Function object for comparing two objects of + // Function object for comparing two objects of // the given type for equality. // public: int operator () (const TYPE &lhs, - const TYPE &rhs) const; + const TYPE &rhs) const; // Simply calls operator== }; @@ -135,6 +123,7 @@ public: // Simply calls operator< }; + #if defined (__ACE_INLINE__) #include "ace/Functor_T.i" #endif /* __ACE_INLINE__ */ diff --git a/ace/Functor_T.i b/ace/Functor_T.i index 52e38166dac..0024cd3fd23 100644 --- a/ace/Functor_T.i +++ b/ace/Functor_T.i @@ -39,12 +39,6 @@ ACE_Hash<TYPE>::operator () (const TYPE &t) const return t.hash (); } -template <class TYPE> ACE_INLINE u_long -ACE_Pointer_Hash<TYPE>::operator () (TYPE t) const -{ - return u_long (t); -} - template <class TYPE> ACE_INLINE int ACE_Equal_To<TYPE>::operator () (const TYPE &lhs, const TYPE &rhs) const @@ -58,3 +52,4 @@ ACE_Less_Than<TYPE>::operator () (const TYPE &lhs, { return (lhs < rhs) ? 1 : 0; } + diff --git a/ace/Future.cpp b/ace/Future.cpp index eb54be3b2fa..236b2d681bf 100644 --- a/ace/Future.cpp +++ b/ace/Future.cpp @@ -1,3 +1,4 @@ +// Future.cpp // $Id$ #define ACE_BUILD_DLL @@ -11,36 +12,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_RCSID (ace, Future, "$Id$") +ACE_RCSID(ace, Future, "$Id$") #if defined (ACE_HAS_THREADS) -template <class T> -ACE_Future_Holder<T>::ACE_Future_Holder (void) -{ -} - -template <class T> -ACE_Future_Holder<T>::ACE_Future_Holder (const ACE_Future<T> &item) - : item_ (item) -{ -} - -template <class T> -ACE_Future_Holder<T>::~ACE_Future_Holder (void) -{ -} - -template <class T> -ACE_Future_Observer<T>::ACE_Future_Observer (void) -{ -} - -template <class T> -ACE_Future_Observer<T>::~ACE_Future_Observer (void) -{ -} - // Dump the state of an object. template <class T> void @@ -67,11 +42,7 @@ template <class T> ACE_Future_Rep<T> * ACE_Future_Rep<T>::create (void) { // Yes set ref count to zero. - ACE_Future_Rep<T> *t = 0; - ACE_NEW_RETURN (t, - ACE_Future_Rep<T>, - 0); - return t; + return new ACE_Future_Rep<T>(); } template <class T> ACE_Future_Rep<T> * @@ -79,7 +50,7 @@ ACE_Future_Rep<T>::attach (ACE_Future_Rep<T>*& rep) { ACE_ASSERT (rep != 0); // Use value_ready_mutex_ for both condition and ref count management - ACE_MT (ACE_Guard<ACE_Thread_Mutex> r_mon (rep->value_ready_mutex_)); + ACE_MT (ACE_Guard<ACE_Thread_Mutex> r_mon(rep->value_ready_mutex_)); ++rep->ref_count_; return rep; } @@ -87,7 +58,7 @@ ACE_Future_Rep<T>::attach (ACE_Future_Rep<T>*& rep) template <class T> void ACE_Future_Rep<T>::detach (ACE_Future_Rep<T>*& rep) { - ACE_ASSERT (rep != 0); + ACE_ASSERT(rep != 0); // Use value_ready_mutex_ for both condition and ref count management ACE_MT (ACE_GUARD (ACE_Thread_Mutex, r_mon, rep->value_ready_mutex_)); @@ -104,8 +75,8 @@ ACE_Future_Rep<T>::detach (ACE_Future_Rep<T>*& rep) template <class T> void ACE_Future_Rep<T>::assign (ACE_Future_Rep<T>*& rep, ACE_Future_Rep<T>* new_rep) { - ACE_ASSERT (rep != 0); - ACE_ASSERT (new_rep != 0); + 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_Thread_Mutex, r_mon, rep->value_ready_mutex_)); @@ -144,8 +115,7 @@ ACE_Future_Rep<T>::ready (void) } template <class T> int -ACE_Future_Rep<T>::set (const T &r, - ACE_Future<T> &caller) +ACE_Future_Rep<T>::set (const T &r) { // If the value is already produced, ignore it... if (this->value_ == 0) @@ -155,24 +125,7 @@ ACE_Future_Rep<T>::set (const T &r, // Double-checked locking pattern to avoid multiple allocations. if (this->value_ == 0) - ACE_NEW_RETURN (this->value_, - T (r), - -1); - - // Remove and notify all subscribed observers. - ACE_TYPENAME OBSERVER_COLLECTION::iterator iterator = - this->observer_collection_.begin (); - - ACE_TYPENAME OBSERVER_COLLECTION::iterator end = - this->observer_collection_.end (); - - for (; - iterator != end; - ++iterator) - { - OBSERVER *observer = *iterator; - observer->update (caller); - } + ACE_NEW_RETURN (this->value_, T (r), -1); // Signal all the waiting threads. return this->value_ready_.broadcast (); @@ -206,38 +159,6 @@ ACE_Future_Rep<T>::get (T &value, return 0; } -template <class T> int -ACE_Future_Rep<T>::attach (ACE_Future_Observer<T> *observer, - ACE_Future<T> &caller) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_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. - - int result = 1; - - // If the value is already produced, then notify observer - if (this->value_ == 0) - { - result = this->observer_collection_.insert (observer); - } - else - observer->update (caller); - - return result; -} - -template <class T> int -ACE_Future_Rep<T>::detach (ACE_Future_Observer<T> *observer) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->value_ready_mutex_, -1)); - - // Remove all occurrences of the specified observer from this - // objects hash map. - return this->observer_collection_.remove (observer); -} - template <class T> ACE_Future_Rep<T>::operator T () { @@ -273,7 +194,7 @@ ACE_Future<T>::ACE_Future (void) template <class T> ACE_Future<T>::ACE_Future (const ACE_Future<T> &r) - : future_rep_ (FUTURE_REP::attach (( (ACE_Future<T> &) r).future_rep_)) + : future_rep_ (FUTURE_REP::attach (((ACE_Future<T> &) r).future_rep_)) { } @@ -281,10 +202,8 @@ template <class T> ACE_Future<T>::ACE_Future (const T &r) : future_rep_ (FUTURE_REP::create ()) { - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT (" (%t) funny constructor\n"))); - this->future_rep_->set (r, - *this); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%t) funny constructor\n"))); + this->future_rep_->set (r); } template <class T> @@ -309,8 +228,7 @@ template <class T> int ACE_Future<T>::cancel (const T &r) { this->cancel (); - return this->future_rep_->set (r, - *this); + return this->future_rep_->set (r); } template <class T> int @@ -318,8 +236,7 @@ ACE_Future<T>::cancel (void) { // If this ACE_Future is already attached to a ACE_Future_Rep, // detach it (maybe delete the ACE_Future_Rep). - FUTURE_REP::assign (this->future_rep_, - FUTURE_REP::create ()); + FUTURE_REP::assign (this->future_rep_, FUTURE_REP::create ()); return 0; } @@ -327,10 +244,8 @@ template <class T> int ACE_Future<T>::set (const T &r) { // Give the pointer to the result to the ACE_Future_Rep. - return this->future_rep_->set (r, - *this); + return this->future_rep_->set (r); } - template <class T> int ACE_Future<T>::ready (void) { @@ -339,25 +254,12 @@ ACE_Future<T>::ready (void) } template <class T> int -ACE_Future<T>::get (T &value, - ACE_Time_Value *tv) +ACE_Future<T>::get (T &value, ACE_Time_Value *tv) { // We return the ACE_Future_rep. return this->future_rep_->get (value, tv); } -template <class T> int -ACE_Future<T>::attach (ACE_Future_Observer<T> *observer) -{ - return this->future_rep_->attach (observer, *this); -} - -template <class T> int -ACE_Future<T>::detach (ACE_Future_Observer<T> *observer) -{ - return this->future_rep_->detach (observer); -} - template <class T> ACE_Future<T>::operator T () { @@ -384,7 +286,7 @@ ACE_Future<T>::operator = (const ACE_Future<T> &rhs) // bind <this> to the same <ACE_Future_Rep> as <r>. // This will work if &r == this, by first increasing the ref count - ACE_Future<T> &r = (ACE_Future<T> &) rhs; + ACE_Future<T> &r = ( ACE_Future<T> &) rhs; FUTURE_REP::assign (this->future_rep_, FUTURE_REP::attach (r.future_rep_)); } @@ -392,20 +294,11 @@ ACE_Future<T>::operator = (const ACE_Future<T> &rhs) template <class T> void ACE_Future<T>::dump (void) const { - ACE_DEBUG ((LM_DEBUG, - ACE_BEGIN_DUMP, this)); + ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); if (this->future_rep_) this->future_rep_->dump (); - - ACE_DEBUG ((LM_DEBUG, - ACE_END_DUMP)); -} - -template <class T> ACE_Future_Rep<T> * -ACE_Future<T>::get_rep () -{ - return this->future_rep_; + ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } template <class T> void * @@ -420,7 +313,7 @@ ACE_Future<T>::operator delete (void *) } template <class T> void -ACE_Future<T>::operator & () +ACE_Future<T>::operator &() { } diff --git a/ace/Future.h b/ace/Future.h index 6a001c677ee..e512f627f26 100644 --- a/ace/Future.h +++ b/ace/Future.h @@ -10,10 +10,9 @@ // Future.h // // = AUTHOR -// Andres Kruse <Andres.Kruse@cern.ch>, -// Douglas C. Schmidt <schmidt@cs.wustl.edu>, -// Per Andersson <Per.Andersson@hfera.ericsson.se>, and -// John Tucker <jtucker@infoglide.com> +// Andres Kruse <Andres.Kruse@cern.ch>, Douglas C. Schmidt +// <schmidt@cs.wustl.edu>, and Per Andersson +// <Per.Andersson@hfera.ericsson.se>. // // ============================================================================ @@ -21,7 +20,6 @@ #define ACE_FUTURE_H #include "ace/Synch.h" -#include "ace/Strategies_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,104 +28,54 @@ #if defined (ACE_HAS_THREADS) // Forward decl. -template <class T> class ACE_Future_Holder; -template <class T> class ACE_Future_Observer; -template <class T> class ACE_Future_Rep; template <class T> class ACE_Future; template <class T> -class ACE_Export ACE_Future_Holder -{ - // = TITLE - // Implementation of object which has holds ACE_Future. - -public: - ACE_Future_Holder (const ACE_Future<T> &future); - ~ACE_Future_Holder (void); - - ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - - ACE_Future<T> item_; - -protected: - ACE_Future_Holder (void); -}; - -template <class T> -class ACE_Future_Observer -{ - // = TITLE - // ACE_Future_Observer<T> - // - // = DESCRIPTION - // An ACE_Future_Observer<T> object implements an object that is - // subscribed with an ACE_Future<T> object so that it may be - // notified when the value of the ACE_Future<T> object is - // written to by a writer thread. - // - // It uses the Observer pattern -public: - // = Destructor - virtual ~ACE_Future_Observer (void); - - virtual void update(const ACE_Future<T> &future) = 0; - // Called by the ACE_Future<T> in which we are subscribed to when - // its value is written to. - - ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. -protected: - - // = Constructor - ACE_Future_Observer (void); -}; - -template <class T> class ACE_Future_Rep { // = TITLE // ACE_Future_Rep<T> // // = DESCRIPTION - // An ACE_Future_Rep<T> object encapsules a pointer to an object - // of class T which is the result of an asynchronous method - // invocation. It is pointed to by ACE_Future<T> object[s] and - // only accessible through them. + // An ACE_Future_Rep<T> object encapsules a pointer to an + // object of class T which is the result of an asynchronous + // method invocation. It is pointed to by ACE_Future<T> object[s] + // and only accessible through them. private: friend class ACE_Future<T>; - int set (const T &r, - ACE_Future<T> &caller); - // Set the result value. The specified <caller> represents the - // future that invoked this <set> method, which is used to notify - // the list of future observers. + // Create, attach, detach and assign encapsulates the reference + // count handling and the object lifetime of ACE_Future_Rep<T> + // instances. + + static ACE_Future_Rep<T> *create (void); + // Create a ACE_Future_Rep<T> and initialize the reference count + + static ACE_Future_Rep<T> *attach (ACE_Future_Rep<T> *&rep); + // Precondition(rep != 0) + // Increase the reference count and return argument. Uses + // the attribute "value_ready_mutex_" to synchronize reference + // count updating + + static void detach (ACE_Future_Rep<T> *&rep); + // Precondition(rep != 0) + // Decreases the reference count and and deletes rep if + // there are no more references to rep. + + static void assign (ACE_Future_Rep<T> *&rep, + ACE_Future_Rep<T> *new_rep); + // Precondition(rep != 0 && new_rep != 0) + // Decreases the rep's reference count and and deletes rep if there + // are no more references to rep. Then assigns new_rep to rep + + int set (const T &r); + // Set the result value. int get (T &value, ACE_Time_Value *tv); // Wait up to <tv> time to get the <value>. Note that <tv> must be // specified in absolute time rather than relative time. - int attach (ACE_Future_Observer<T> *observer, - ACE_Future<T> &caller); - // Attaches the specified observer to a subject (i.e. the - // ACE_Future_Rep). The update method of the specified subject will - // be invoked with a copy of the written-to ACE_Future as input when - // the result gets set. - // - // Returns 0 if the observer is successfully attached, 1 if the - // observer is already attached, and -1 if failures occur. - - int detach (ACE_Future_Observer<T> *observer); - // Detaches the specified observer from a subject (i.e. the - // ACE_Future_Rep). The update method of the specified subject will - // not be invoked when the ACE_Future_Reps result gets set. Returns - // 1 if the specified observer was actually attached to the subject - // prior to this call and 0 if was not. - // - // Returns 0 if the observer was successfully detached, and -1 if the observer was - // not attached in the first place. - operator T (); // Type conversion. will block forever until the result is // available. Note that this method is going away in a subsequent @@ -150,49 +98,12 @@ private: int ready (void); // Is result available? - // = Handle ref counting and object lifetime for ACE_Future_Rep<T>. - - // These methods must go after the others to work around a bug with - // Borland's C++ Builder. - - static ACE_Future_Rep<T> *create (void); - // Create a ACE_Future_Rep<T> and initialize the reference count. - - static ACE_Future_Rep<T> *attach (ACE_Future_Rep<T> *&rep); - // Increase the reference count and return argument. Uses the - // attribute "value_ready_mutex_" to synchronize reference count - // updating. - // - // Precondition(rep != 0). - - static void detach (ACE_Future_Rep<T> *&rep); - // Decreases the reference count and and deletes rep if there are no - // more references to rep. - // - // Precondition(rep != 0) - - static void assign (ACE_Future_Rep<T> *&rep, - ACE_Future_Rep<T> *new_rep); - // Decreases the rep's reference count and and deletes rep if there - // are no more references to rep. Then assigns new_rep to rep. - // - // Precondition(rep != 0 && new_rep != 0) - T *value_; // Pointer to the result. int ref_count_; // Reference count. - typedef ACE_Future_Observer<T> - OBSERVER; - - typedef ACE_Unbounded_Set<OBSERVER *> - OBSERVER_COLLECTION; - - OBSERVER_COLLECTION observer_collection_; - // Keep a list of ACE_Future_Observers unread by client's reader thread. - // = Condition variable and mutex that protect the <value_>. ACE_Condition_Thread_Mutex value_ready_; ACE_Thread_Mutex value_ready_mutex_; @@ -265,35 +176,9 @@ public: int ready (void); // Check if the result is available. - int attach (ACE_Future_Observer<T> *observer); - // Attaches the specified observer to a subject (i.e. the - // ACE_Future). The update method of the specified subject will be - // invoked with a copy of the associated ACE_Future as input when - // the result gets set. If the result is already set when this - // method gets invoked, then the update method of the specified - // subject will be invoked immediately. - // - // Returns 0 if the observer is successfully attached, 1 if the - // observer is already attached, and -1 if failures occur. - - int detach (ACE_Future_Observer<T> *observer); - // Detaches the specified observer from a subject (i.e. the - // ACE_Future_Rep). The update method of the specified subject will - // not be invoked when the ACE_Future_Reps result gets set. Returns - // 1 if the specified observer was actually attached to the subject - // prior to this call and 0 if was not. - // - // Returns 0 if the observer was successfully detached, and -1 if the observer was - // not attached in the first place. - void dump (void) const; // Dump the state of an object. - ACE_Future_Rep<T> *get_rep(); - // Get the underlying ACE_Future_Rep<T>*. Note that this method should - // rarely, if ever, be used and that modifying the undlerlying ACE_Future_Rep<T>* - // should be done with extreme caution. - ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. @@ -323,3 +208,4 @@ private: #endif /* ACE_HAS_THREADS */ #endif /* ACE_FUTURE_H */ + diff --git a/ace/Future_Node.cpp b/ace/Future_Node.cpp deleted file mode 100644 index 79c8706dc7f..00000000000 --- a/ace/Future_Node.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// Future.cpp -// $Id$ - -#define ACE_BUILD_DLL - -#ifndef ACE_FUTURE_NODE_CPP -#define ACE_FUTURE_NODE_CPP - -#include "ace/OS.h" -#include "ace/Future_Node.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID(ace, Future_Node, "$Id$") - -#if defined (ACE_HAS_THREADS) - -template <class T> -ACE_DLList_Future_Node<T>::ACE_DLList_Future_Node (void) - : next_ (0), - prev_ (0) -{ -} - -template <class T> -ACE_DLList_Future_Node<T>::ACE_DLList_Future_Node (const ACE_Future<T> &item, - ACE_DLList_Future_Node<T> *n, - ACE_DLList_Future_Node<T> *p) -: item_ (item), - next_ (n), - prev_ (p) -{ -} - -template <class T> -ACE_DLList_Future_Node<T>::~ACE_DLList_Future_Node (void) -{ -} - -#endif /* ACE_HAS_THREADS */ -#endif /* ACE_FUTURE_NODE_CPP */ diff --git a/ace/Future_Node.h b/ace/Future_Node.h deleted file mode 100644 index 8590cbaccca..00000000000 --- a/ace/Future_Node.h +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// Future_Node.h -// -// = AUTHOR -// John Tucker <jtucker@infoglide.com> -// -// ============================================================================ - -#ifndef ACE_FUTURE_NODE_H -#define ACE_FUTURE_NODE_H - -#include "ace/Future.h" -#include "ace/Thread.h" -#include "ace/Containers_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_THREADS) - -// Forward decl. -template <class T> class ACE_Future_Node; -template <class T> class ACE_DLList_Future_Node; - -template <class T> -class ACE_DLList_Future_Node -{ - // = TITLE - // Implementation of element in a ACE_Future list. - // Needed for ACE_Double_Linked_List. - - friend class ACE_Double_Linked_List<ACE_DLList_Future_Node>; - friend class ACE_Double_Linked_List_Iterator<ACE_DLList_Future_Node>; - -public: - // = Initialization - ACE_DLList_Future_Node (const ACE_Future<T> &future, - ACE_DLList_Future_Node *n = 0, - ACE_DLList_Future_Node *p = 0); - ~ACE_DLList_Future_Node (void); - - ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - - ACE_Future<T> item_; - ACE_DLList_Future_Node *next_; - ACE_DLList_Future_Node *prev_; - -protected: - ACE_DLList_Future_Node (void); -}; - - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Future_Node.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Future_Node.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#endif /* ACE_HAS_THREADS */ -#endif /* ACE_FUTURE_NODE_H */ diff --git a/ace/Future_Set.cpp b/ace/Future_Set.cpp deleted file mode 100644 index d2872a530a8..00000000000 --- a/ace/Future_Set.cpp +++ /dev/null @@ -1,139 +0,0 @@ -// Future.cpp -// $Id$ - -#define ACE_BUILD_DLL - -#ifndef ACE_FUTURE_SET_CPP -#define ACE_FUTURE_SET_CPP - -#include "ace/Future_Set.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID(ace, Future_Set, "$Id$") - -#if defined (ACE_HAS_THREADS) - -template <class T> -ACE_Future_Set<T>::ACE_Future_Set (ACE_Message_Queue<ACE_SYNCH> *new_queue) - : delete_queue_ (0) -{ - if (new_queue) - this->future_notification_queue_ = new_queue; - else - { - ACE_NEW (this->future_notification_queue_, - ACE_Message_Queue<ACE_SYNCH>); - this->delete_queue_ = 1; - } -} - -template <class T> -ACE_Future_Set<T>::~ACE_Future_Set (void) -{ - // Detach ourselves from all remaining futures, if any, in our map. - ACE_TYPENAME FUTURE_HASH_MAP::iterator iterator = - this->future_map_.begin (); - - ACE_TYPENAME FUTURE_HASH_MAP::iterator end = - this->future_map_.end (); - - for (; - iterator != end; - ++iterator) - { - FUTURE_HOLDER *future_holder = (*iterator).int_id_; - future_holder->item_.detach (this); - delete future_holder; - } - - if (this->delete_queue_ != 0) - delete this->future_notification_queue_; -} - -template <class T> int -ACE_Future_Set<T>::is_empty () const -{ - return ( ((ACE_Future_Set<T>*)this)->future_map_.current_size () == 0 ); -} - -template <class T> int -ACE_Future_Set<T>::insert (ACE_Future<T> &future) -{ - FUTURE_HOLDER *future_holder; - ACE_NEW_RETURN (future_holder, - FUTURE_HOLDER (future), - -1); - - FUTURE_REP *future_rep = future.get_rep (); - int result = this->future_map_.bind (future_rep, - future_holder); - - // If a new map entry was created, then attach to the future, otherwise - // we were already attached to the future or some error occurred so just - // delete the future holder. - if ( result == 0 ) - // Attach ourself to the ACE_Futures list of observer - future.attach (this); - else - delete future_holder; - - return result; -} - -template <class T> void -ACE_Future_Set<T>::update (const ACE_Future<T> &future) -{ - ACE_Message_Block *mb; - FUTURE local_future = future; - - ACE_NEW (mb, - ACE_Message_Block ((char *) local_future.get_rep (), 0)); - - // Enqueue in priority order. - this->future_notification_queue_->enqueue (mb, 0); -} - -template <class T> int -ACE_Future_Set<T>::next_readable (ACE_Future<T> &future, - ACE_Time_Value *tv) -{ - if (this->is_empty ()) - return 0; - - ACE_Message_Block *mb; - FUTURE_REP *future_rep = 0; - - // Wait for a "readable future" signal from the message queue. - if (this->future_notification_queue_->dequeue_head (mb, - tv) != -1) - { - // Extract future rep from the message block. - future_rep = - ACE_reinterpret_cast (FUTURE_REP *, - mb->base ()); - - // Delete the message block. - mb->release (); - } - else - return 0; - - // Remove the hash map entry with the specified future rep from our map. - FUTURE_HOLDER *future_holder; - if ( this->future_map_.find (future_rep, - future_holder) != -1 ) - { - future = future_holder->item_; - this->future_map_.unbind (future_rep); - delete future_holder; - return 1; - } - - return 0; -} - -#endif /* ACE_HAS_THREADS */ -#endif /* ACE_FUTURE_SET_CPP */ diff --git a/ace/Future_Set.h b/ace/Future_Set.h deleted file mode 100644 index bd029009a06..00000000000 --- a/ace/Future_Set.h +++ /dev/null @@ -1,118 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// Future_Set.h -// -// = AUTHOR -// John Tucker <jtucker@infoglide.com> -// -// ============================================================================ - -#ifndef ACE_FUTURE_SET_H -#define ACE_FUTURE_SET_H - -#include "ace/Thread.h" -#include "ace/Message_Queue.h" -#include "ace/Future.h" -#include "ace/Hash_Map_Manager.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_THREADS) - -template <class T> -class ACE_Future_Set : public ACE_Future_Observer<T> -{ - // = TITLE - // This class implements a mechanism which allows the values of - // a collections of ACE_Future<T> objects to be accessed by - // reader threads as they become available. -public: - // = Initialization and termination methods. - - ACE_Future_Set (ACE_Message_Queue<ACE_SYNCH> *future_notification_queue_ = 0); - // Constructor. - - ~ACE_Future_Set (void); - // Destructor. - - int is_empty (void) const; - // Return 1 if their are no ACE_Future objects left on its queue and - // 0 otherwise - - int insert (ACE_Future<T> &future); - // Enqueus the given ACE_Future into this objects queue when it is - // readable. - // - // Returns 0 if the future is successfully inserted, 1 if the - // future is already inserted, and -1 if failures occur. - - int next_readable (ACE_Future<T> &result, - ACE_Time_Value *tv = 0); - // Wait up to <tv> time to get the <value>. Note that <tv> must be - // specified in absolute time rather than relative time.); get the - // next ACE_Future<T> that is readable. If <tv> = 0, the will block - // forever. - // - // If a readable future becomes available, then the input result - // will be assigned with it and 1 will will be returned. If the set - // is empty, then 0 is returned. - - virtual void update (const ACE_Future<T> &future); - // Called by the ACE_Future<T> subject in which we are subscribed to - // when its value is written to. - - ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - -private: - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Future_Set<T> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Future_Set (const ACE_Future_Set<T> &)) - - typedef ACE_Future<T> FUTURE; - - typedef ACE_Future_Rep<T> FUTURE_REP; - - typedef ACE_Future_Holder<T> FUTURE_HOLDER; - - typedef ACE_Pointer_Hash<FUTURE_REP *> FUTURE_REP_HASH; - - typedef ACE_Equal_To<FUTURE_REP *> FUTURE_REP_COMPARE; - - typedef ACE_Hash_Map_Manager_Ex<FUTURE_REP *, - FUTURE_HOLDER *, - FUTURE_REP_HASH, - FUTURE_REP_COMPARE, - ACE_Null_Mutex> FUTURE_HASH_MAP; - - FUTURE_HASH_MAP future_map_; - // Map of ACE_Futures, subjects, which have not been written to by - // client's writer thread. - - ACE_Message_Queue<ACE_SYNCH> *future_notification_queue_; - // Message queue for notifying the reader thread of ACE_Futures which - // have been written to by client's writer thread. - - int delete_queue_; - // Keeps track of whether we need to delete the message queue. -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Future_Set.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Future_Set.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#endif /* ACE_HAS_THREADS */ -#endif /* ACE_FUTURE_SET_H */ diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp index 5c0d98476c6..ac21a57ad8f 100644 --- a/ace/Get_Opt.cpp +++ b/ace/Get_Opt.cpp @@ -45,14 +45,14 @@ ACE_RCSID(ace, Get_Opt, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_Get_Opt) -ACE_Get_Opt::ACE_Get_Opt (int argc, +ACE_Get_Opt::ACE_Get_Opt (int argc, ASYS_TCHAR **argv, - const ASYS_TCHAR *optstring, - int skip, + const ASYS_TCHAR *optstring, + int skip, int report_errors) - : optarg (0), + : optarg (0), optind (skip), - opterr (report_errors), + opterr (report_errors), argc_ (argc), argv_ (argv), nextchar_ (0), @@ -87,30 +87,30 @@ ACE_Get_Opt::operator () (void) const ASYS_TCHAR *oli; // Option letter index. if (this->nextchar_ == 0 || *this->nextchar_ == '\0') - { + { // Update scanning pointer. - if (this->optind >= this->argc_ - || *(this->nextchar_ = this->argv_[this->optind]) != '-') + if (this->optind >= this->argc_ + || *(this->nextchar_ = this->argv_[this->optind]) != '-') { - this->nextchar_ = ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT ("")); + this->nextchar_ = ACE_const_cast (char *, ASYS_TEXT ("")); return EOF; } if (this->nextchar_[1] != 0 - && *++this->nextchar_ == '-') - { + && *++this->nextchar_ == '-') + { // Found "--". ++this->optind; - this->nextchar_ = ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT ("")); + this->nextchar_ = ACE_const_cast (char *, ASYS_TEXT ("")); return EOF; } - } + } - // Option letter okay? + // Option letter okay? opt = (int) *this->nextchar_++; - if (opt == (int) ':' + if (opt == (int) ':' || ((oli = ACE_OS::strchr (this->optstring_, opt)) == 0)) { // If the user didn't specify '-' as an option, assume it means @@ -123,26 +123,26 @@ ACE_Get_Opt::operator () (void) if (this->opterr && *this->optstring_ != ':') ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%s: illegal option -- %c\n"), + ASYS_TEXT ("%s: illegal option -- %c\n"), this->argv_[0], opt)); return '?'; } - if (*++oli != ':') + if (*++oli != ':') { // Don't need argument. this->optarg = 0; if (!*this->nextchar_) ++this->optind; } - else + else { // Need an argument. if (*this->nextchar_) // No white space. this->optarg = this->nextchar_; - else if (this->argc_ <= ++this->optind) - { + else if (this->argc_ <= ++this->optind) + { // No arg. - this->nextchar_ = ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT ("")); + this->nextchar_ = ACE_const_cast (char *, ASYS_TEXT ("")); if (*this->optstring_ == ':') return ':'; @@ -155,7 +155,7 @@ ACE_Get_Opt::operator () (void) else // White space. this->optarg = this->argv_[this->optind]; - this->nextchar_ = ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT ("")); + this->nextchar_ = ACE_const_cast (char *, ASYS_TEXT ("")); ++this->optind; } diff --git a/ace/Hash_Cache_Map_Manager_T.cpp b/ace/Hash_Cache_Map_Manager_T.cpp index 9abe0de904d..e09f09e3466 100644 --- a/ace/Hash_Cache_Map_Manager_T.cpp +++ b/ace/Hash_Cache_Map_Manager_T.cpp @@ -22,13 +22,15 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Hash_Cache_Map_Manager) #define T_1 class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES #define T_2 KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES - template <T_1> -ACE_Hash_Cache_Map_Manager<T_2>::ACE_Hash_Cache_Map_Manager (CACHING_STRATEGY &caching_s, - size_t size, - ACE_Allocator *alloc) - : ACE_HCMM_BASE (caching_s, - size, - alloc) +template <T_1> +ACE_Hash_Cache_Map_Manager<T_2>::ACE_Hash_Cache_Map_Manager (size_t size, + ACE_Allocator *alloc, + CACHING_STRATEGY *caching_s, + int delete_caching_strategy) + : ACE_HCMM_BASE (size, + alloc, + caching_s, + delete_caching_strategy) { } @@ -46,7 +48,7 @@ ACE_Hash_Cache_Map_Manager<T_2>:: bind (const KEY &key, // the combination of the <value> and the attributes of the caching // strategy. CACHE_VALUE cache_value (value, - this->caching_strategy_.attributes ()); + this->caching_strategy_->attributes ()); int bind_result = this->map_.bind (key, cache_value, @@ -55,8 +57,8 @@ ACE_Hash_Cache_Map_Manager<T_2>:: bind (const KEY &key, if (bind_result != -1) { - int result = this->caching_strategy_.notify_bind (bind_result, - cache_value.second ()); + int result = this->caching_strategy_->notify_bind (bind_result, + cache_value.second ()); if (result == -1) { @@ -79,7 +81,7 @@ ACE_Hash_Cache_Map_Manager<T_2>::rebind (const KEY &key, ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *&entry) { CACHE_VALUE cache_value (value, - this->caching_strategy_.attributes ()); + this->caching_strategy_->attributes ()); int rebind_result = this->map_.rebind (key, cache_value, @@ -88,12 +90,12 @@ ACE_Hash_Cache_Map_Manager<T_2>::rebind (const KEY &key, if (rebind_result != -1) { - int result = this->caching_strategy_.notify_rebind (rebind_result, - cache_value.second ()); + int result = this->caching_strategy_->notify_rebind (rebind_result, + cache_value.second ()); if (result == -1) { - + // Make sure the unbind operation is done only when the // notification fails after a bind which is denoted by // rebind_result = 0 @@ -117,7 +119,7 @@ ACE_Hash_Cache_Map_Manager<T_2>::trybind (const KEY &key, ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *&entry) { CACHE_VALUE cache_value (value, - this->caching_strategy_.attributes ()); + this->caching_strategy_->attributes ()); int trybind_result = this->map_.trybind (key, cache_value, @@ -125,30 +127,30 @@ ACE_Hash_Cache_Map_Manager<T_2>::trybind (const KEY &key, if (trybind_result != -1) { - int result = this->caching_strategy_.notify_trybind (trybind_result, - cache_value.second ()); - + int result = this->caching_strategy_->notify_trybind (trybind_result, + cache_value.second ()); + if (result == -1) { - + // If the entry has got inserted into the map, it is removed // due to failure. if (trybind_result == 0) this->map_.unbind (key); trybind_result = -1; - + } else { - + // If an attempt is made to bind an existing entry the value // is overwritten with the value from the map. if (trybind_result == 1) value = cache_value.first (); - + } - + } return trybind_result; @@ -161,22 +163,22 @@ ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key, // Lookup the key and populate the <value>. int find_result = this->map_.find (key, entry); - + if (find_result != -1) { - - int result = this->caching_strategy_.notify_find (find_result, - entry->int_id_.second ()); - + + int result = this->caching_strategy_->notify_find (find_result, + entry->int_id_.second ()); + // Unless the find and notification operations go thru, this // method is not successful. if (result == -1) find_result = -1; else find_result = 0; - + } - + return find_result; } @@ -188,13 +190,13 @@ ACE_Hash_Cache_Map_Manager<T_2>::unbind (ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, if (unbind_result != -1) { - - int result = this->caching_strategy_.notify_unbind (unbind_result, - entry->int_id_.second ()); - + + int result = this->caching_strategy_->notify_unbind (unbind_result, + entry->int_id_.second ()); + if (result == -1) unbind_result = -1; - + } return unbind_result; diff --git a/ace/Hash_Cache_Map_Manager_T.h b/ace/Hash_Cache_Map_Manager_T.h index cae1929c0c9..e8b3e6e6899 100644 --- a/ace/Hash_Cache_Map_Manager_T.h +++ b/ace/Hash_Cache_Map_Manager_T.h @@ -28,7 +28,7 @@ class ACE_Allocator; template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> -class ACE_Hash_Cache_Map_Manager : public ACE_Cache_Map_Manager< KEY, VALUE, +class ACE_Hash_Cache_Map_Manager : public ACE_Cache_Map_Manager< KEY, VALUE, ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, ACE_Hash_Map_Reverse_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, @@ -64,11 +64,16 @@ class ACE_Hash_Cache_Map_Manager : public ACE_Cache_Map_Manager< KEY, VALUE, // class. // = Initialization and termination methods. - ACE_Hash_Cache_Map_Manager (CACHING_STRATEGY &caching_s, - size_t size = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); + ACE_Hash_Cache_Map_Manager (size_t size = ACE_DEFAULT_MAP_SIZE, + ACE_Allocator *alloc = 0, + CACHING_STRATEGY *caching_s = 0, + int delete_caching_strategy = 1); // Initialize a <Hash_Cache_Map_Manager> with <size> entries. - + // By default the caching strategy is allocated and deallocated by + // the class but if needed it can be changed as per the users need. + // The <delete_on_destruction> flag simply tells the class whether + // the ownership is given to the class or not. + ~ACE_Hash_Cache_Map_Manager (void); // Close down a <Cache_Map_Manager> and release dynamically allocated // resources. @@ -160,7 +165,7 @@ class ACE_Hash_Cache_Map_Manager : public ACE_Cache_Map_Manager< KEY, VALUE, protected: - typedef ACE_Cache_Map_Manager<KEY, VALUE, + typedef ACE_Cache_Map_Manager<KEY, VALUE, ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, ACE_Hash_Map_Reverse_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, @@ -179,7 +184,7 @@ protected: #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Hash_Cache_Map_Manager_T.cpp") +#pragma implementation ("ace/Hash_Cache_Map_Manager_T.cpp") #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* HASH_CACHE_MAP_MANAGER_T_H */ diff --git a/ace/Hash_Map_Manager_T.h b/ace/Hash_Map_Manager_T.h index 4752511f2d5..b963bedefae 100644 --- a/ace/Hash_Map_Manager_T.h +++ b/ace/Hash_Map_Manager_T.h @@ -98,24 +98,17 @@ public: friend class ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>; friend class ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>; - typedef EXT_ID - KEY; - typedef INT_ID - VALUE; - typedef ACE_Hash_Map_Entry<EXT_ID, INT_ID> - ENTRY; + typedef EXT_ID KEY; + typedef INT_ID VALUE; + typedef ACE_Hash_Map_Entry<EXT_ID, INT_ID> ENTRY; // = ACE-style iterator typedefs. - typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> - ITERATOR; - typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> - REVERSE_ITERATOR; + typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> ITERATOR; + typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> REVERSE_ITERATOR; // = STL-style iterator typedefs. - typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> - iterator; - typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> - reverse_iterator; + typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> iterator; + typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> reverse_iterator; // = Initialization and termination methods. @@ -245,10 +238,10 @@ public: int unbind (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *entry); // Remove entry from map. - size_t current_size (void) const; + size_t current_size (void); // Return the current size of the map. - size_t total_size (void) const; + size_t total_size (void); // Return the total size of the map. ACE_LOCK &mutex (void); @@ -479,7 +472,9 @@ public: // = Initialization method. ACE_Hash_Map_Iterator_Ex (ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &mm, int tail = 0); + // = Iteration methods. + int advance (void); // Move forward by one element in the set. Returns 0 when all the // items in the set have been seen, else 1. @@ -522,7 +517,9 @@ public: // = Initialization method. ACE_Hash_Map_Reverse_Iterator_Ex (ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &mm, int head = 0); + // = Iteration methods. + int advance (void); // Move forward by one element in the set. Returns 0 when all the // items in the set have been seen, else 1. diff --git a/ace/Hash_Map_Manager_T.i b/ace/Hash_Map_Manager_T.i index f4e86244358..1f5f8e015f2 100644 --- a/ace/Hash_Map_Manager_T.i +++ b/ace/Hash_Map_Manager_T.i @@ -40,13 +40,13 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::~ACE_ } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE size_t -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::current_size (void) const +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::current_size (void) { return this->cur_size_; } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE size_t -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::total_size (void) const +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::total_size (void) { return this->total_size_; } diff --git a/ace/Hash_Map_With_Allocator_T.cpp b/ace/Hash_Map_With_Allocator_T.cpp deleted file mode 100644 index fa2a44ca06d..00000000000 --- a/ace/Hash_Map_With_Allocator_T.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// Hash_Map_With_Allocator_T.cpp -// $Id$ - -#ifndef ACE_HASH_MAP_WITH_ALLOCATOR_T_CPP -#define ACE_HASH_MAP_WITH_ALLOCATOR_T_CPP - -#include "ace/Hash_Map_With_Allocator_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (__ACE_INLINE__) -#include "ace/Hash_Map_With_Allocator_T.i" -#endif /* __ACE_INLINE__ */ - -template <class EXT_ID, class INT_ID> -ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::ACE_Hash_Map_With_Allocator (ACE_Allocator *alloc) - : ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_Null_Mutex> (alloc) -{ - ACE_TRACE ("ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::ACE_Hash_Map_With_Allocator"); -} - -template <class EXT_ID, class INT_ID> -ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::ACE_Hash_Map_With_Allocator (size_t size, - ACE_Allocator *alloc) - : ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_Null_Mutex> (size, alloc) -{ - ACE_TRACE ("ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::ACE_Hash_Map_With_Allocator"); -} - -#endif /* ACE_HASH_MAP_WITH_ALLOCATOR_T_CPP */ diff --git a/ace/Hash_Map_With_Allocator_T.h b/ace/Hash_Map_With_Allocator_T.h deleted file mode 100644 index e55c6209d21..00000000000 --- a/ace/Hash_Map_With_Allocator_T.h +++ /dev/null @@ -1,96 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// Hash_Map_With_Allocator_T.h -// -// = AUTHOR -// Marina Spivak <marina@cs.wustl.edu> and -// Irfan Pyarali <irfan@cs.wustl.edu> -// -// ============================================================================ - -#ifndef ACE_HASH_MAP_WITH_ALLOCATOR_T_H -#define ACE_HASH_MAP_WITH_ALLOCATOR_T_H - -#include "ace/Hash_Map_Manager.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -template <class EXT_ID, class INT_ID> -class ACE_Hash_Map_With_Allocator : - public ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_Null_Mutex> -{ - // = TITLE - // This class is a thin wrapper around ACE_Hash_Map_Manager, - // which comes handy when ACE_Hash_Map_Manager is to be used with a - // non-nil ACE_Allocator. This wrapper insures that the appropriate - // allocator is in place for every operation that accesses or - // updates the hash map. - // - // = DESCRIPTION - // If we use ACE_Hash_Map_Manager with a shared memory allocator - // (or memory-mapped file allocator, for example), the allocator - // pointer used by ACE_Hash_Map_Manager gets stored with it, in - // shared memory (or memory-mapped file). Naturally, this will - // cause horrible problems, since only the first process to set - // that pointer will be guaranteed the address of the allocator - // is meaningful! That is why we need this wrapper, which - // insures that appropriate allocator pointer is in place for - // each call. - // -public: - ACE_Hash_Map_With_Allocator (ACE_Allocator *alloc); - // Constructor. - - ACE_Hash_Map_With_Allocator (size_t size, - ACE_Allocator *alloc); - // Constructor that specifies hash table size. - - // = The following methods are Proxies to the corresponding methods - // in <ACE_Hash_Map_Manager>. Each method sets the allocator to - // the one specified by the invoking entity, and then calls the - // corresponding method in <ACE_Hash_Map_Manager> to do the - // actual work. - - int bind (const EXT_ID &, - const INT_ID &, - ACE_Allocator *alloc); - - int unbind (const EXT_ID &, - INT_ID &, - ACE_Allocator *alloc); - - int rebind (const EXT_ID &, - const INT_ID &, - EXT_ID &, - INT_ID &, - ACE_Allocator *alloc); - - int find (const EXT_ID &, - INT_ID &, - ACE_Allocator *alloc); - - int close (ACE_Allocator *alloc); -}; - -#if defined (__ACE_INLINE__) -#include "ace/Hash_Map_With_Allocator_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Hash_Map_With_Allocator_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Hash_Map_With_Allocator_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - - -#endif /* ACE_HASH_MAP_WITH_ALLOCATOR_T_H */ diff --git a/ace/Hash_Map_With_Allocator_T.i b/ace/Hash_Map_With_Allocator_T.i deleted file mode 100644 index 34476983b2b..00000000000 --- a/ace/Hash_Map_With_Allocator_T.i +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Hash_Map_With_Allocator_T.i - - -template <class EXT_ID, class INT_ID> ACE_INLINE int -ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::close (ACE_Allocator *alloc) -{ - ACE_TRACE ("ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::close"); - this->allocator_ = alloc; - return this->close_i (); -} - -template <class EXT_ID, class INT_ID> ACE_INLINE int -ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::bind (const EXT_ID &ext_id, - const INT_ID &int_id, - ACE_Allocator *alloc) -{ - ACE_TRACE ("ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::bind"); - this->allocator_ = alloc; - return this->bind_i (ext_id, int_id); -} - -template <class EXT_ID, class INT_ID> ACE_INLINE int -ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::unbind (const EXT_ID &ext_id, - INT_ID &int_id, - ACE_Allocator *alloc) -{ - ACE_TRACE ("ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::unbind"); - this->allocator_ = alloc; - return this->unbind_i (ext_id, int_id); -} - -template <class EXT_ID, class INT_ID> ACE_INLINE int -ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::rebind (const EXT_ID &ext_id, - const INT_ID &int_id, - EXT_ID &old_ext_id, - INT_ID &old_int_id, - ACE_Allocator *alloc) -{ - ACE_TRACE ("ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::rebind"); - this->allocator_ = alloc; - return this->rebind_i (ext_id, int_id, old_ext_id, old_int_id); -} - -template <class EXT_ID, class INT_ID> ACE_INLINE int -ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::find (const EXT_ID &ext_id, - INT_ID &int_id, - ACE_Allocator *alloc) -{ - ACE_TRACE ("ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::find"); - this->allocator_ = alloc; - return this->find_i (ext_id, int_id); -} diff --git a/ace/Hash_Purgable_Map_Manager_T.cpp b/ace/Hash_Purgable_Map_Manager_T.cpp new file mode 100644 index 00000000000..65ef645aaea --- /dev/null +++ b/ace/Hash_Purgable_Map_Manager_T.cpp @@ -0,0 +1,182 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// ace +// +// = FILENAME +// Hash_Purgable_Map_Manager_T.cpp +// +// = AUTHOR +// Kirthika Parameswaran <kirthika@cs.wustl.edu> +// +// ============================================================================ + +#ifndef ACE_HASH_PURGABLE_MAP_MANAGER_T_CPP +#define ACE_HASH_PURGABLE_MAP_MANAGER_T_CPP + +#include "ace/Hash_Purgable_Map_Manager_T.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#if !defined (__ACE_INLINE__) +# include "ace/Hash_Purgable_Map_Manager_T.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(ace, Hash_Purgable_Map_Manager_T, "$Id$") + +// Initialisation. +template <class EXT_ID, class INT_ID> +ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID>::ACE_Hash_Purgable_Map_Entry (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next, + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev, + int purge_tag) + : ACE_Hash_Map_Entry<EXT_ID, INT_ID> (next, + prev), + purge_tag_ (purge_tag) +{ +} + +template <class EXT_ID, class INT_ID> +ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID>::ACE_Hash_Purgable_Map_Entry (const EXT_ID &ext_id, + const INT_ID &int_id, + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next, + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev, + int purge_tag) + : ACE_Hash_Map_Entry<EXT_ID, INT_ID> (ext_id, + int_id, + next, + prev), + purge_tag_ (purge_tag) +{ +} +#if ! defined (ACE_HAS_BROKEN_NOOP_DTORS) +template <class EXT_ID, class INT_ID> +ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID>::~ACE_Hash_Purgable_Map_Entry (void) +{ +} +#endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */ + +template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_Hash_Map_Entry<EXT_ID, INT_ID>* +ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: create_entry (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next, + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev) +{ + ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID> *new_entry; + void *ptr; + + // Memory is allocated for the entry. + ACE_ALLOCATOR_RETURN (ptr, + this->allocator_->malloc (sizeof (ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID>)), + 0); + + // A entry is created with its purge_tag value set to the current + // timer value. + new_entry = new (ptr) ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID> (next, + prev, + this->timer_); + + // The timer ticks on...;) + ++this->timer_; + + return new_entry; +} + +template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_Hash_Map_Entry<EXT_ID, INT_ID>* +ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: create_entry (const EXT_ID &ext_id, + const INT_ID &int_id, + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next, + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev) +{ + ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID> *new_entry; + void *ptr; + + // Memory is allocated for the entry. + ACE_ALLOCATOR_RETURN (ptr, + this->allocator_->malloc (sizeof (ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID>)), + 0); + + // A entry is created with its purge_tag value set to the current + // timer value. + new_entry = new (ptr) ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID> (ext_id, + int_id, + next, + prev, + this->timer_); + // The timer moves on. + ++this->timer_; + + return new_entry; +} + +// This method finds the appropriate entry and also sets its purge_tag +// to the current timer value. +template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int +ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::shared_find (const EXT_ID &ext_id, + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry, + u_long &loc) +{ + // The entry is filled in depending upon the ext_id searched in the map. + int result = ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::shared_find (ext_id, + entry, + loc); + if (result == -1) + return -1; + + // On a successful find .. + if (result == 0) + { + PURGABLE_ENTRY *purgable_entry = ACE_dynamic_cast (PURGABLE_ENTRY *&, + entry); + + // Set the purge_tag to the current timer value showing the + // recent use of the entry. The timer is then incremented. + purgable_entry->set_purge_tag (this->timer_); + ++this->timer_; + } + + return result; +} + +template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int +ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::purge (void) +{ + // The minimum value has to be large enough to be able to fall + // thru the loop to find lesser valued entries. + unsigned int min= ULONG_MAX; + + ENTRY *entry = 0; + PURGABLE_ENTRY *purgable_entry = 0; + PURGABLE_ENTRY *purgable_entry_to_remove = 0; + + // The iterator moves thru the map searching for the entry with the + // lowest purge_tag. Such an entry is stored and later removing by + // unbinding it from the map. + for (ITERATOR iter (*this); + iter.next (entry) !=0; + iter.advance ()) + { + purgable_entry = ACE_dynamic_cast (PURGABLE_ENTRY *, + entry); + + // Ah! an entry with a lower purge_tag... + if (min > purgable_entry->get_purge_tag ()) + { + min = purgable_entry->get_purge_tag (); + purgable_entry_to_remove = purgable_entry; + } + } + + // The entry is removed from the map only if it is non-NULL. + if (purgable_entry_to_remove != 0) + { + return this->unbind_i (purgable_entry_to_remove); + } + else + { + return 0; + } +} + +#endif /* ACE_HASH_PURGABLE_MAP_MANAGER_T_CPP */ diff --git a/ace/Hash_Purgable_Map_Manager_T.h b/ace/Hash_Purgable_Map_Manager_T.h new file mode 100644 index 00000000000..6c49da3f98c --- /dev/null +++ b/ace/Hash_Purgable_Map_Manager_T.h @@ -0,0 +1,163 @@ +/* -*- C++ -*- */ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// ace +// +// = FILENAME +// Hash_Purgable_Map_Manager_T.h +// +// = AUTHOR +// Kirthika Parameswaran <kirthika@cs.wustl.edu> +// +// ============================================================================ + +#ifndef ACE_HASH_PURGABLE_MAP_MANAGER_T_H +#define ACE_HASH_PURGABLE_MAP_MANAGER_T_H + +#include "ace/Hash_Map_Manager_T.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +template <class EXT_ID, class INT_ID> +class ACE_Hash_Purgable_Map_Entry : public ACE_Hash_Map_Entry<EXT_ID, INT_ID> +{ + // = TITLE + // Define an purgable entry in the hash table. A purge_tag field + // helps in keeping track and deciding whether it has been used + // recently. +public: + + // = Initialization and termination methods. + ACE_Hash_Purgable_Map_Entry (const EXT_ID &ext_id, + const INT_ID &int_id, + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next = 0, + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev = 0, + int purge_tag = 0); + // Constructor. + + ACE_Hash_Purgable_Map_Entry (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next, + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev, + int purge_tag = 0); + // Constructor. + +#if ! defined (ACE_HAS_BROKEN_NOOP_DTORS) + ~ACE_Hash_Purgable_Map_Entry (void); + // Destructor. +#endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */ + + void set_purge_tag (u_long value); + // Used to change the purge_tag value. + + u_long get_purge_tag (void); + // Obtain the purge_tag value. +protected: + u_long purge_tag_; + // This is the purge_value which will decide the entry to be purged. +}; + +template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> +class ACE_Hash_Purgable_Map_Manager_Ex : public ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> +{ + // = TITLE + // Define a purgable map abstraction that efficiently associates + // <EXT_ID>s with <INT_ID>s. + // + // = DESCRIPTION + // + // This implementation of a map uses a purgable hash table. Key + // hashing is achieved through the HASH_KEY object and key + // comparison is achieved through the COMPARE_KEYS object. + // + // This class provides the feature of purging the entries on + // need based on the purging algorithm followed. By default the + // Least Recently Used algorithm is applied for purging "k" + // entires from the map. + // + // The Least Recently used algorithm is used to decide on the + // entry to purge. For this a timesatmp is used per entry with a + // virtual timer providing the timestamp-value. On a lookup or + // use of an entry, its timestamp value is updated proving that + // the entry has been used recently. When the map gets full and + // some entries need to be purged, the "K" entries with minimum + // timestamp are removed. +public: + + typedef ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID> PURGABLE_ENTRY; + // The purgable_entry has an extra purge_tag field which will act as + // the timestamp in deciding the entry to be purged from the map. + + // = Initialization and termination methods. + + ACE_Hash_Purgable_Map_Manager_Ex (ACE_Allocator *alloc = 0); + // Initialize a <Hash_Purgable_Map_Manager_Ex> with default size. + + ACE_Hash_Purgable_Map_Manager_Ex (size_t size, + ACE_Allocator *alloc = 0); + // Initialize a <Hash_Purgable_Map_Manager_Ex> with size <length>. + + ~ACE_Hash_Purgable_Map_Manager_Ex (void); + // Destruct a <Hash_Purgable_Map_Manager_Ex> with size <length>. + + int purge (int num); + // The <num> of entries specified are removed form the map based on + // the purging algorithm used. By default Least Recently Used + // algorithm is applied. Returns 0 on success and -1 on + // failure. This method is called with locks held. + +protected: + int purge_i (int num); + // The <num> of entries specified are removed form the map based on the + // purging algorithm used. By default Least Recently Used algorithm is + // applied. Returns 0 on success and -1 on failure. This method is + // called w.o. locks being held. + + int shared_find (const EXT_ID &ext_id, + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry, + u_long &loc); + // Returns the <ACE_Hash_Map_Entry> that corresponds to + // <ext_id>. This method interface has been inherited form the base + // class,i.e. Hash_Map_Manager_Ex. + + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *create_entry (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next = 0, + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev = 0); + // Creates an entry. This method interface has been inherited form + // the base class, i.e. Hash_Map_Manager_Ex. + + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *create_entry (const EXT_ID &ext_id, + const INT_ID &int_id, + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next = 0, + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev = 0); + // Creates an entry.This method interface has been inherited form + // the base class, i.e. Hash_Map_Manager_Ex. + + int purge (void); + // Removes the minimum element from the map. Selection Sort is used + // to find and remove the entry. This method purges a single entry. + + u_long timer_; + // The virtual clock which provides the purge_value for the entries. +}; +#if defined (__ACE_INLINE__) +#include "ace/Hash_Purgable_Map_Manager_T.i" +#endif /* __ACE_INLINE__ */ + +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) +#include "ace/Hash_Purgable_Map_Manager_T.cpp" +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ + +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) +#pragma implementation "ace/Hash_Purgable_Map_Manager_T.cpp" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ + +#endif /* ACE_HASH_PURGABLE_MAP_MANAGER_T_H */ + + + + + + diff --git a/ace/Hash_Purgable_Map_Manager_T.i b/ace/Hash_Purgable_Map_Manager_T.i new file mode 100644 index 00000000000..aff9839c2e3 --- /dev/null +++ b/ace/Hash_Purgable_Map_Manager_T.i @@ -0,0 +1,56 @@ +// $Id$ + +template <class EXT_ID, class INT_ID> ACE_INLINE void +ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID>::set_purge_tag (u_long value) +{ + this->purge_tag_ = value; +} + +template <class EXT_ID, class INT_ID> ACE_INLINE u_long +ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID>::get_purge_tag (void) +{ + return this->purge_tag_; +} + +template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE +ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_Hash_Purgable_Map_Manager_Ex (size_t size, + ACE_Allocator *alloc) + : ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> (size, + alloc), + timer_ (0) +{ +} + +template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE +ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_Hash_Purgable_Map_Manager_Ex (ACE_Allocator *alloc) + : ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> (alloc), + timer_ (0) +{ +} + +template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE +ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::~ACE_Hash_Purgable_Map_Manager_Ex (void) +{ +} + +template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int +ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: purge_i (int num) +{ + for (int i = 0; i < num; ++i) + { + if (this->purge () != 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Failure in removing minimum entry from cache\n"), + -1); + } + + return 0; +} + +template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int +ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: purge (int num) +{ + ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); + + return this->purge_i (num); +} diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp index 24cbb2988cf..503e52dcdbb 100644 --- a/ace/INET_Addr.cpp +++ b/ace/INET_Addr.cpp @@ -94,8 +94,7 @@ ACE_INET_Addr::set (const ACE_INET_Addr &sa) { ACE_TRACE ("ACE_INET_Addr::set"); - this->ACE_Addr::base_set (sa.get_type (), - sa.get_size ()); + this->ACE_Addr::base_set (sa.get_type (), sa.get_size ()); if (sa.get_type () == AF_ANY) // Ugh, this is really a base class, so don't copy it. @@ -127,7 +126,7 @@ ACE_INET_Addr::string_to_addr (const ASYS_TCHAR s[]) if (ip_addr == 0) // Assume it's a port number. { - if (ACE_OS::strspn (t, ASYS_TEXT ("1234567890")) + if (ACE_OS::strspn (t, "1234567890") == ACE_OS::strlen (t)) { // port number u_short port = (u_short) ACE_OS::atoi (t); @@ -135,7 +134,7 @@ ACE_INET_Addr::string_to_addr (const ASYS_TCHAR s[]) ACE_UINT32 (INADDR_ANY)); } else // port name - result = this->set (t, + result = this->set (t, ACE_UINT32 (INADDR_ANY)); } else @@ -143,10 +142,10 @@ ACE_INET_Addr::string_to_addr (const ASYS_TCHAR s[]) *ip_addr = '\0'; ++ip_addr; // skip over ':' if (ACE_OS::strspn (ip_addr, - ASYS_TEXT ("1234567890")) == + "1234567890") == ACE_OS::strlen (ip_addr)) { - u_short port = + u_short port = (u_short) ACE_OS::atoi (ip_addr); result = this->set (port, t); } @@ -233,11 +232,9 @@ ACE_INET_Addr::set (u_short port_number, errno = EINVAL; return -1; } - else if (ACE_OS::inet_aton (ASYS_ONLY_MULTIBYTE_STRING (host_name), - (struct in_addr *) &addr) == 1) - return this->set (port_number, - encode ? ntohl (addr) : addr, - encode); + else if (ACE_OS::inet_aton (ASYS_ONLY_MULTIBYTE_STRING (host_name), (struct in_addr *) &addr) == 1) + return this->set (port_number, encode ? ntohl (addr) : addr, encode); + else { #if defined (VXWORKS) || defined (CHORUS) @@ -499,7 +496,7 @@ ACE_INET_Addr::get_host_name (void) const static ASYS_TCHAR name[MAXHOSTNAMELEN + 1]; if (this->get_host_name (name, MAXHOSTNAMELEN + 1) == -1) - ACE_OS::strcpy (name, ASYS_TEXT ("<unknown>")); + ACE_OS::strcpy (name, "<unknown>"); return name; } diff --git a/ace/IOStream.cpp b/ace/IOStream.cpp index b77fc6c57dd..0603f926060 100644 --- a/ace/IOStream.cpp +++ b/ace/IOStream.cpp @@ -559,9 +559,7 @@ ACE_Streambuf::reset_get_buffer (char *newBuffer, this->eback_saved_ = newBuffer; } else - ACE_NEW_RETURN (this->eback_saved_, - char[streambuf_size_], - 0); + ACE_NEW_RETURN (this->eback_saved_, char[streambuf_size_], 0); this->gptr_saved_ = this->eback_saved_ + _gptr; this->egptr_saved_ = this->eback_saved_ + _egptr; @@ -608,9 +606,7 @@ ACE_Streambuf::reset_put_buffer (char *newBuffer, this->pbase_saved_ = newBuffer; } else - ACE_NEW_RETURN (this->pbase_saved_, - char[streambuf_size_], - 0); + ACE_NEW_RETURN (this->pbase_saved_, char[streambuf_size_], 0); this->pptr_saved_ = this->pbase_saved_ + _pptr; this->epptr_saved_ = this->pbase_saved_ + streambuf_size_; diff --git a/ace/IOStream.h b/ace/IOStream.h index 06b992c046e..00f253ba81f 100644 --- a/ace/IOStream.h +++ b/ace/IOStream.h @@ -30,7 +30,7 @@ #include "ace/streams.h" #if defined (ACE_HAS_STRING_CLASS) -#if defined (ACE_WIN32) && defined (_MSC_VER) +#if defined (ACE_WIN32) typedef CString ACE_IOStream_String; #else #if !defined (ACE_HAS_STDCPP_STL_INCLUDES) @@ -45,7 +45,7 @@ typedef std::string ACE_IOStream_String; typedef string ACE_IOStream_String; #endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ #endif /* ! ACE_HAS_STDCPP_STL_INCLUDES */ -#endif /* ACE_WIN32 && defined (_MSC_VER) */ +#endif /* ACE_WIN32 */ #if defined (__DECCXX_VER) # if __DECCXX_VER < 50700000 @@ -74,9 +74,9 @@ public: inline int operator < (const ACE_Quoted_String &s) const { return *(ACE_IOStream_String *) this < (ACE_IOStream_String) s; } -#if defined (ACE_WIN32) && defined (_MSC_VER) +#if defined (ACE_WIN32) inline int length (void) { return this->GetLength (); } -#endif /* ACE_WIN32 && defined (_MSC_VER) */ +#endif /* ACE_WIN32 */ }; #endif /* ACE_HAS_STRING_CLASS */ diff --git a/ace/IOStream_T.cpp b/ace/IOStream_T.cpp index be25100cc08..a0b868a5513 100644 --- a/ace/IOStream_T.cpp +++ b/ace/IOStream_T.cpp @@ -145,11 +145,11 @@ ACE_IOStream<STREAM>::operator<< (ACE_IOStream_String &v) { if (opfx ()) { -#if defined (ACE_WIN32) && defined (_MSC_VER) +#if defined (ACE_WIN32) for (int i = 0; i < v.GetLength (); ++i) #else for (u_int i = 0; i < (u_int) v.length (); ++i) -#endif /* ACE_WIN32 && defined (_MSC_VER) */ +#endif /* ACE_WIN32 */ this->put (v[i]); } diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp index 11655934d25..37789a779a7 100644 --- a/ace/Local_Name_Space_T.cpp +++ b/ace/Local_Name_Space_T.cpp @@ -311,9 +311,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::resolve_i (const ACE_WString &na // Makes a copy here. Caller needs to call delete to free up // memory. char *new_type; - ACE_NEW_RETURN (new_type, - char [len + 1], - -1); + ACE_NEW_RETURN (new_type, char [len + 1], -1); ACE_OS::strncpy (new_type, temp, len); new_type[len] = '\0'; // Null terminate the string @@ -439,19 +437,15 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) &options), -1); if (ACE_LOG_MSG->op_status ()) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("Allocator::Allocator\n")), - -1); + ACE_ERROR_RETURN ((LM_ERROR, "Allocator::Allocator\n"), -1); - ACE_NEW_RETURN (this->lock_, - ACE_LOCK (lock_name_for_local_name_space), - -1); + ACE_NEW_RETURN (this->lock_, ACE_LOCK (lock_name_for_local_name_space), -1); #if !defined (ACE_LACKS_ACCESS) // Now check if the backing store has been created successfully if (ACE_OS::access (this->context_file_, F_OK) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("create_manager\n")), + "create_manager\n"), -1); #endif /* ACE_LACKS_ACCESS */ @@ -493,8 +487,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) -1); if (this->allocator_->bind (ACE_NAME_SERVER_MAP, ns_map) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("create_manager\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, "create_manager\n"), -1); } if (ACE::debug ()) diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp index 041e1cf1045..a5c1260f0b8 100644 --- a/ace/Local_Tokens.cpp +++ b/ace/Local_Tokens.cpp @@ -40,6 +40,8 @@ ACE_Tokens::make_owner (ACE_TPQ_Entry *caller) this->waiters_.enqueue (caller, 0); } +// ************************************************************ + #if defined (ACE_LACKS_INLINE_FUNCTIONS) ACE_Null_Token::ACE_Null_Token (void) { @@ -50,6 +52,10 @@ ACE_Null_Token::~ACE_Null_Token (void) } #endif /* ACE_LACKS_INLINE_FUNCTIONS */ +// ************************************************************ +// ************************************************************ + + void ACE_TPQ_Entry::dump (void) const { @@ -152,6 +158,10 @@ ACE_TPQ_Entry::client_id (const ASYS_TCHAR *id) this->client_id_[ACE_MAXCLIENTIDLEN - 1] = '\0'; } +// ************************************************************ +// ************************************************************ +// ************************************************************ + void ACE_TSS_TPQ_Entry::dump (void) const { @@ -185,10 +195,7 @@ ACE_TSS_TPQ_Entry::make_TSS_TYPE (void) const ACE_TRACE ("ACE_TSS_TPQ_Entry::make_TSS_TYPE"); ACE_TPQ_Entry *temp; - ACE_NEW_RETURN (temp, - ACE_TPQ_Entry (this->proxy_, - this->client_id_), - 0); + ACE_NEW_RETURN (temp, ACE_TPQ_Entry (this->proxy_, this->client_id_), 0); return temp; } @@ -198,6 +205,10 @@ ACE_TSS_TPQ_Entry::operator ACE_TPQ_Entry * (void) return (ACE_TPQ_Entry *) (*((ACE_TSS<ACE_TPQ_Entry> *) this)); } +// ************************************************************ +// ************************************************************ +// ************************************************************ + ACE_TPQ_Iterator::ACE_TPQ_Iterator (ACE_Token_Proxy_Queue &q) : current_ (q.head_) { @@ -243,6 +254,10 @@ ACE_TPQ_Iterator::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +// ************************************************************ +// ************************************************************ +// ************************************************************ + void ACE_Token_Proxy_Queue::dump (void) const { @@ -399,6 +414,10 @@ ACE_Token_Proxy_Queue::remove (const ACE_TPQ_Entry *remove_me) return; } +// ************************************************************ +// ************************************************************ +// ************************************************************ + void ACE_Mutex_Token::dump (void) const { @@ -634,6 +653,10 @@ ACE_Mutex_Token::is_owner (const ASYS_TCHAR *id) return 0; } +// ************************************************************ +// ************************************************************ +// ************************************************************ + void ACE_RW_Token::dump (void) const { @@ -1012,6 +1035,11 @@ ACE_RW_Token::is_owner (const ASYS_TCHAR *id) return 0; } +// ************************************************************ +// ************************************************************ +// ************************************************************ +// 7.. + void ACE_Token_Proxy::dump (void) const { @@ -1363,6 +1391,8 @@ ACE_Token_Proxy::token_acquired (ACE_TPQ_Entry *e) return; } +// ************************************************************ + ACE_Token_Name::ACE_Token_Name (const ASYS_TCHAR *token_name) { ACE_TRACE ("ACE_Token_Name::ACE_Token_Name"); diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index 70cf92c3d42..7114ce06675 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -96,9 +96,7 @@ ACE_Log_Msg_Manager::get_lock (void) { ACE_NO_HEAP_CHECK; - ACE_NEW_RETURN_I (ACE_Log_Msg_Manager::lock_, - ACE_Recursive_Thread_Mutex, - 0); + ACE_NEW_RETURN_I (ACE_Log_Msg_Manager::lock_, ACE_Recursive_Thread_Mutex, 0); // Allocate the ACE_Log_Msg IPC instance. ACE_NEW_RETURN (ACE_Log_Msg_message_queue, ACE_LOG_MSG_IPC_STREAM, 0); @@ -214,9 +212,7 @@ ACE_Log_Msg::instance (void) { ACE_NO_HEAP_CHECK; - ACE_NEW_RETURN_I (tss_log_msg, - ACE_Log_Msg, - 0); + ACE_NEW_RETURN_I (tss_log_msg, ACE_Log_Msg, 0); // Store the dynamically allocated pointer in thread-specific // storage. It gets deleted via the ACE_TSS_cleanup function // when the thread terminates. @@ -236,9 +232,8 @@ ACE_Log_Msg::instance (void) // ACE_Log_Msg_Manager::get_lock() to initialize the message queue, // so instead we do it here. if (ACE_Log_Msg_message_queue == 0) - ACE_NEW_RETURN (ACE_Log_Msg_message_queue, - ACE_LOG_MSG_IPC_STREAM, - 0); + ACE_NEW_RETURN (ACE_Log_Msg_message_queue, ACE_LOG_MSG_IPC_STREAM, 0); + // Singleton implementation. static ACE_Cleanup_Adapter<ACE_Log_Msg> *log_msg = 0; if (log_msg == 0) @@ -773,10 +768,6 @@ ACE_Log_Msg::log (const ASYS_TCHAR *format_str, #if defined (ACE_WIN32) LPTSTR lpMsgBuf = 0; - // PharLap can't do FormatMessage, so try for socket - // error. -# if !defined (ACE_HAS_PHARLAP) - ::FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, errno, @@ -784,7 +775,6 @@ ACE_Log_Msg::log (const ASYS_TCHAR *format_str, (LPTSTR) &lpMsgBuf, 0, NULL); -# endif /* ACE_HAS_PHARLAP */ // If we don't get a valid response from // <FormatMessage>, we'll assume this is a diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp index fd611eadb37..d3729cbe707 100644 --- a/ace/Log_Record.cpp +++ b/ace/Log_Record.cpp @@ -98,8 +98,8 @@ ACE_Log_Record::round_up (void) { // ACE_TRACE ("ACE_Log_Record::round_up"); // Determine the length of the payload. - int len = (sizeof (*this) - sizeof (this->msg_data_)) - + (sizeof (ASYS_TCHAR) * ((ACE_OS::strlen (this->msg_data_) + 1))); + int len = (sizeof *this - MAXLOGMSGLEN) + + (ACE_OS::strlen (this->msg_data_) + 1); // Round up to the alignment. this->length_ = 1 + ((len + ACE_Log_Record::ALIGN_WORDB - 1) diff --git a/ace/Makefile b/ace/Makefile index 9cfb79633d5..ea03c965ae0 100644 --- a/ace/Makefile +++ b/ace/Makefile @@ -55,24 +55,19 @@ THREADS_FILES = \ Token DEMUX_FILES = \ Event_Handler \ - FlReactor \ Handle_Set \ - Msg_WFMO_Reactor \ POSIX_Proactor \ Priority_Reactor \ Proactor \ Reactor \ Select_Reactor \ Select_Reactor_Base \ - TP_Reactor \ - TkReactor \ - WFMO_Reactor \ - XtReactor + WFMO_Reactor CONNECTION_FILES = \ Asynch_IO \ Asynch_IO_Impl \ POSIX_Asynch_IO \ - Strategies + Strategies SOCKETS_FILES = \ IPC_SAP \ LSOCK \ @@ -148,7 +143,6 @@ STREAMS_FILES = \ Message_Queue \ Task MEMORY_FILES = \ - Based_Pointer_Repository \ Malloc \ Mem_Map \ Memory_Pool \ @@ -168,25 +162,29 @@ OTHER_FILES = \ CORBA_Handler \ CORBA_Ref \ Local_Name_Space \ + Msg_WFMO_Reactor \ Name_Proxy \ Name_Request_Reply \ Name_Space \ Naming_Context \ Registry_Name_Space \ - Remote_Name_Space + Remote_Name_Space \ + TP_Reactor \ + XtReactor \ + FlReactor \ + TkReactor TEMPLATE_FILES = \ Acceptor \ Active_Map_Manager_T \ Asynch_Acceptor \ Auto_Ptr \ - Based_Pointer_T \ Connector \ Containers_T \ - Cache_Map_Manager_T \ + Cache_Map_Manager_T \ Cached_Connect_Strategy_T \ Caching_Strategies_T \ - Caching_Utility_T \ + Caching_Strategy_Utility_T \ Cleanup_Strategies_T \ Dump_T \ Dynamic_Service \ @@ -195,8 +193,6 @@ TEMPLATE_FILES = \ Free_List \ Functor_T \ Future \ - Future_Node \ - Future_Set \ Hash_Map_Manager_T \ Hash_Cache_Map_Manager_T \ IOStream_T \ @@ -364,10 +360,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .PHONY: ACE_COMPONENTS ACE_COMPONENTS: - @sh $(ACE_ROOT)/bin/ace_components --ace --set ' $(ACE_COMPONENTS) ' + @$(ACE_ROOT)/bin/ace_components --ace --set " $(ACE_COMPONENTS) " realclean: - @sh $(ACE_ROOT)/bin/ace_components --ace --remove + @$(ACE_ROOT)/bin/ace_components --ace --remove #### Setting ACELIB to null allows it to be used for building shared libraries, #### including libACE.$(SOEXT,) on certain platforms. @@ -498,7 +494,8 @@ endif # GHS $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Template_Instantiations.cpp -.obj/OS.o .obj/OS.so .shobj/OS.o .shobj/OS.so: OS.cpp $(ACE_ROOT)/ace/OS.h \ +.obj/OS.o .obj/OS.so .shobj/OS.o .shobj/OS.so: OS.cpp \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -529,7 +526,8 @@ endif # GHS $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Sched_Params.i -.obj/ACE.o .obj/ACE.so .shobj/ACE.o .shobj/ACE.so: ACE.cpp $(ACE_ROOT)/ace/ACE.h \ +.obj/ACE.o .obj/ACE.so .shobj/ACE.o .shobj/ACE.so: ACE.cpp \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/streams.h \ @@ -1816,20 +1814,21 @@ endif # GHS $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/SPIPE_Connector.h \ - $(ACE_ROOT)/ace/SPIPE_Stream.h \ - $(ACE_ROOT)/ace/SPIPE.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SPIPE_Addr.h \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/SPIPE_Addr.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/SPIPE.i \ - $(ACE_ROOT)/ace/SPIPE_Stream.i \ - $(ACE_ROOT)/ace/SPIPE_Connector.i + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i .obj/Log_Record.o .obj/Log_Record.so .shobj/Log_Record.o .shobj/Log_Record.so: Log_Record.cpp \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -2186,10 +2185,7 @@ endif # GHS $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp + $(ACE_ROOT)/ace/Dynamic.i .obj/Token.o .obj/Token.so .shobj/Token.o .shobj/Token.so: Token.cpp \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -2289,83 +2285,6 @@ endif # GHS $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i -.obj/FlReactor.o .obj/FlReactor.so .shobj/FlReactor.o .shobj/FlReactor.so: FlReactor.cpp \ - $(ACE_ROOT)/ace/FlReactor.h \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Select_Reactor_T.h \ - $(ACE_ROOT)/ace/Select_Reactor_Base.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Select_Reactor_Base.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ - $(ACE_ROOT)/ace/Timer_Heap.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ - $(ACE_ROOT)/ace/Select_Reactor_T.i \ - $(ACE_ROOT)/ace/Select_Reactor.i .obj/Handle_Set.o .obj/Handle_Set.so .shobj/Handle_Set.o .shobj/Handle_Set.so: Handle_Set.cpp \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -2382,12 +2301,9 @@ endif # GHS $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Handle_Set.i -.obj/Msg_WFMO_Reactor.o .obj/Msg_WFMO_Reactor.so .shobj/Msg_WFMO_Reactor.o .shobj/Msg_WFMO_Reactor.so: Msg_WFMO_Reactor.cpp \ - $(ACE_ROOT)/ace/Msg_WFMO_Reactor.h \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ +.obj/POSIX_Proactor.o .obj/POSIX_Proactor.so .shobj/POSIX_Proactor.o .shobj/POSIX_Proactor.so: POSIX_Proactor.cpp \ + $(ACE_ROOT)/ace/POSIX_Proactor.h \ + $(ACE_ROOT)/ace/Proactor_Impl.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/streams.h \ @@ -2397,9 +2313,17 @@ endif # GHS $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ @@ -2413,6 +2337,13 @@ endif # GHS $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -2422,9 +2353,6 @@ endif # GHS $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ @@ -2437,11 +2365,16 @@ endif # GHS $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Pipe.h \ + $(ACE_ROOT)/ace/Pipe.i \ + $(ACE_ROOT)/ace/POSIX_Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.i \ + $(ACE_ROOT)/ace/POSIX_Asynch_IO.i \ + $(ACE_ROOT)/ace/POSIX_Proactor.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ @@ -2462,10 +2395,6 @@ endif # GHS $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ @@ -2487,26 +2416,20 @@ endif # GHS $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Msg_WFMO_Reactor.i -.obj/POSIX_Proactor.o .obj/POSIX_Proactor.so .shobj/POSIX_Proactor.o .shobj/POSIX_Proactor.so: POSIX_Proactor.cpp \ - $(ACE_ROOT)/ace/POSIX_Proactor.h \ - $(ACE_ROOT)/ace/Proactor_Impl.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp .obj/Priority_Reactor.o .obj/Priority_Reactor.so .shobj/Priority_Reactor.o .shobj/Priority_Reactor.so: Priority_Reactor.cpp \ $(ACE_ROOT)/ace/Priority_Reactor.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -2600,19 +2523,13 @@ endif # GHS $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Proactor_Impl.h \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.i \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -2623,10 +2540,17 @@ endif # GHS $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -2634,15 +2558,41 @@ endif # GHS $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_List.h \ + $(ACE_ROOT)/ace/Timer_List_T.h \ + $(ACE_ROOT)/ace/Timer_List_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Timer_Wheel.h \ + $(ACE_ROOT)/ace/Timer_Wheel_T.h \ + $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Proactor.i \ + $(ACE_ROOT)/ace/Proactor_Impl.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ @@ -2661,20 +2611,9 @@ endif # GHS $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -2704,7 +2643,13 @@ endif # GHS $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/POSIX_Proactor.h \ + $(ACE_ROOT)/ace/Pipe.h \ + $(ACE_ROOT)/ace/Pipe.i \ + $(ACE_ROOT)/ace/POSIX_Asynch_IO.h \ + $(ACE_ROOT)/ace/POSIX_Asynch_IO.i \ + $(ACE_ROOT)/ace/POSIX_Proactor.i .obj/Reactor.o .obj/Reactor.so .shobj/Reactor.o .shobj/Reactor.so: Reactor.cpp \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -2994,11 +2939,8 @@ endif # GHS $(ACE_ROOT)/ace/Timer_Heap.h \ $(ACE_ROOT)/ace/Timer_Heap_T.h \ $(ACE_ROOT)/ace/Timer_Heap_T.cpp -.obj/TP_Reactor.o .obj/TP_Reactor.so .shobj/TP_Reactor.o .shobj/TP_Reactor.so: TP_Reactor.cpp \ - $(ACE_ROOT)/ace/TP_Reactor.h \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Select_Reactor_T.h \ - $(ACE_ROOT)/ace/Select_Reactor_Base.h \ +.obj/WFMO_Reactor.o .obj/WFMO_Reactor.so .shobj/WFMO_Reactor.o .shobj/WFMO_Reactor.so: WFMO_Reactor.cpp \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -3055,27 +2997,60 @@ endif # GHS $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Select_Reactor_Base.i \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Timer_Heap.h \ $(ACE_ROOT)/ace/Timer_Heap_T.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ - $(ACE_ROOT)/ace/Select_Reactor_T.i \ - $(ACE_ROOT)/ace/Select_Reactor.i \ - $(ACE_ROOT)/ace/TP_Reactor.i -.obj/TkReactor.o .obj/TkReactor.so .shobj/TkReactor.o .shobj/TkReactor.so: TkReactor.cpp \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp +.obj/Asynch_IO.o .obj/Asynch_IO.so .shobj/Asynch_IO.o .shobj/Asynch_IO.so: Asynch_IO.cpp \ + $(ACE_ROOT)/ace/Asynch_IO.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/streams.h \ @@ -3085,43 +3060,29 @@ endif # GHS $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Asynch_IO.i \ + $(ACE_ROOT)/ace/Proactor.h \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/TkReactor.h \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Select_Reactor_T.h \ - $(ACE_ROOT)/ace/Select_Reactor_Base.h \ - $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -3137,40 +3098,62 @@ endif # GHS $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Select_Reactor_Base.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ + $(ACE_ROOT)/ace/Timer_List.h \ + $(ACE_ROOT)/ace/Timer_List_T.h \ + $(ACE_ROOT)/ace/Timer_List_T.cpp \ $(ACE_ROOT)/ace/Timer_Heap.h \ $(ACE_ROOT)/ace/Timer_Heap_T.h \ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ - $(ACE_ROOT)/ace/Select_Reactor_T.i \ - $(ACE_ROOT)/ace/Select_Reactor.i -.obj/WFMO_Reactor.o .obj/WFMO_Reactor.so .shobj/WFMO_Reactor.o .shobj/WFMO_Reactor.so: WFMO_Reactor.cpp \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Timer_Wheel.h \ + $(ACE_ROOT)/ace/Timer_Wheel_T.h \ + $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Proactor.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i +.obj/Asynch_IO_Impl.o .obj/Asynch_IO_Impl.so .shobj/Asynch_IO_Impl.o .shobj/Asynch_IO_Impl.so: Asynch_IO_Impl.cpp \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ + $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.i \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.i +.obj/POSIX_Asynch_IO.o .obj/POSIX_Asynch_IO.so .shobj/POSIX_Asynch_IO.o .shobj/POSIX_Asynch_IO.so: POSIX_Asynch_IO.cpp \ + $(ACE_ROOT)/ace/POSIX_Asynch_IO.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/streams.h \ @@ -3180,9 +3163,19 @@ endif # GHS $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ + $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.i \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ @@ -3196,6 +3189,13 @@ endif # GHS $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -3205,9 +3205,6 @@ endif # GHS $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ @@ -3220,23 +3217,29 @@ endif # GHS $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/POSIX_Asynch_IO.i \ + $(ACE_ROOT)/ace/Proactor.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Timer_List.h \ + $(ACE_ROOT)/ace/Timer_List_T.h \ + $(ACE_ROOT)/ace/Timer_List_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Timer_Wheel.h \ + $(ACE_ROOT)/ace/Timer_Wheel_T.h \ + $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Proactor.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -3245,15 +3248,21 @@ endif # GHS $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -3270,151 +3279,25 @@ endif # GHS $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Timer_Heap.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.cpp -.obj/XtReactor.o .obj/XtReactor.so .shobj/XtReactor.o .shobj/XtReactor.so: XtReactor.cpp \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/XtReactor.h \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Select_Reactor_T.h \ - $(ACE_ROOT)/ace/Select_Reactor_Base.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/POSIX_Proactor.h \ + $(ACE_ROOT)/ace/Proactor_Impl.h \ $(ACE_ROOT)/ace/Pipe.h \ $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Select_Reactor_Base.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ - $(ACE_ROOT)/ace/Timer_Heap.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ - $(ACE_ROOT)/ace/Select_Reactor_T.i \ - $(ACE_ROOT)/ace/Select_Reactor.i -.obj/Asynch_IO.o .obj/Asynch_IO.so .shobj/Asynch_IO.o .shobj/Asynch_IO.so: Asynch_IO.cpp \ - $(ACE_ROOT)/ace/Asynch_IO.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i -.obj/Asynch_IO_Impl.o .obj/Asynch_IO_Impl.so .shobj/Asynch_IO_Impl.o .shobj/Asynch_IO_Impl.so: Asynch_IO_Impl.cpp \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Asynch_IO_Impl.h -.obj/POSIX_Asynch_IO.o .obj/POSIX_Asynch_IO.so .shobj/POSIX_Asynch_IO.o .shobj/POSIX_Asynch_IO.so: POSIX_Asynch_IO.cpp \ - $(ACE_ROOT)/ace/POSIX_Asynch_IO.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i + $(ACE_ROOT)/ace/POSIX_Proactor.i .obj/Strategies.o .obj/Strategies.so .shobj/Strategies.o .shobj/Strategies.so: Strategies.cpp \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -4012,7 +3895,8 @@ endif # GHS $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ $(ACE_ROOT)/ace/ATM_Addr.i -.obj/DEV.o .obj/DEV.so .shobj/DEV.o .shobj/DEV.so: DEV.cpp $(ACE_ROOT)/ace/DEV.h \ +.obj/DEV.o .obj/DEV.so .shobj/DEV.o .shobj/DEV.so: DEV.cpp \ + $(ACE_ROOT)/ace/DEV.h \ $(ACE_ROOT)/ace/IO_SAP.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ @@ -4675,7 +4559,8 @@ endif # GHS $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/SV_Shared_Memory.i -.obj/TLI.o .obj/TLI.so .shobj/TLI.o .shobj/TLI.so: TLI.cpp $(ACE_ROOT)/ace/TLI.h \ +.obj/TLI.o .obj/TLI.so .shobj/TLI.o .shobj/TLI.so: TLI.cpp \ + $(ACE_ROOT)/ace/TLI.h \ $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ @@ -4692,8 +4577,7 @@ endif # GHS $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/TLI.i + $(ACE_ROOT)/ace/Addr.i .obj/TLI_Acceptor.o .obj/TLI_Acceptor.so .shobj/TLI_Acceptor.o .shobj/TLI_Acceptor.so: TLI_Acceptor.cpp \ $(ACE_ROOT)/ace/TLI_Acceptor.h \ $(ACE_ROOT)/ace/TLI.h \ @@ -4714,13 +4598,10 @@ endif # GHS $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/TLI_Stream.h \ $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/TLI_Stream.i \ - $(ACE_ROOT)/ace/TLI_Acceptor.i + $(ACE_ROOT)/ace/INET_Addr.i .obj/TLI_Connector.o .obj/TLI_Connector.so .shobj/TLI_Connector.o .shobj/TLI_Connector.so: TLI_Connector.cpp \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -4744,11 +4625,8 @@ endif # GHS $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/TLI_Stream.i \ - $(ACE_ROOT)/ace/TLI_Connector.i + $(ACE_ROOT)/ace/INET_Addr.i .obj/TLI_Stream.o .obj/TLI_Stream.so .shobj/TLI_Stream.o .shobj/TLI_Stream.so: TLI_Stream.cpp \ $(ACE_ROOT)/ace/TLI_Stream.h \ $(ACE_ROOT)/ace/TLI.h \ @@ -4769,10 +4647,8 @@ endif # GHS $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/TLI_Stream.i + $(ACE_ROOT)/ace/INET_Addr.i .obj/TTY_IO.o .obj/TTY_IO.so .shobj/TTY_IO.o .shobj/TTY_IO.so: TTY_IO.cpp \ $(ACE_ROOT)/ace/TTY_IO.h \ $(ACE_ROOT)/ace/OS.h \ @@ -5229,7 +5105,8 @@ endif # GHS $(ACE_ROOT)/ace/SPIPE.i \ $(ACE_ROOT)/ace/UPIPE_Addr.h \ $(ACE_ROOT)/ace/UPIPE_Stream.i -.obj/DLL.o .obj/DLL.so .shobj/DLL.o .shobj/DLL.so: DLL.cpp $(ACE_ROOT)/ace/DLL.h \ +.obj/DLL.o .obj/DLL.so .shobj/DLL.o .shobj/DLL.so: DLL.cpp \ + $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/streams.h \ @@ -5468,8 +5345,24 @@ endif # GHS $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/Proactor.h \ + $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.i \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Timer_List.h \ + $(ACE_ROOT)/ace/Timer_List_T.h \ + $(ACE_ROOT)/ace/Timer_List_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Timer_Wheel.h \ + $(ACE_ROOT)/ace/Timer_Wheel_T.h \ + $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Proactor.i .obj/Service_Manager.o .obj/Service_Manager.so .shobj/Service_Manager.o .shobj/Service_Manager.so: Service_Manager.cpp \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -6425,84 +6318,6 @@ endif # GHS $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp -.obj/Based_Pointer_Repository.o .obj/Based_Pointer_Repository.so .shobj/Based_Pointer_Repository.o .shobj/Based_Pointer_Repository.so: Based_Pointer_Repository.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h .obj/Malloc.o .obj/Malloc.so .shobj/Malloc.o .shobj/Malloc.so: Malloc.cpp \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -7508,6 +7323,115 @@ endif # GHS $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Local_Name_Space_T.cpp +.obj/Msg_WFMO_Reactor.o .obj/Msg_WFMO_Reactor.so .shobj/Msg_WFMO_Reactor.o .shobj/Msg_WFMO_Reactor.so: Msg_WFMO_Reactor.cpp \ + $(ACE_ROOT)/ace/Msg_WFMO_Reactor.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Msg_WFMO_Reactor.i .obj/Name_Proxy.o .obj/Name_Proxy.so .shobj/Name_Proxy.o .shobj/Name_Proxy.so: Name_Proxy.cpp \ $(ACE_ROOT)/ace/Name_Proxy.h \ $(ACE_ROOT)/ace/INET_Addr.h \ @@ -7924,5 +7848,349 @@ endif # GHS $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Name_Request_Reply.h \ $(ACE_ROOT)/ace/Name_Space.h +.obj/TP_Reactor.o .obj/TP_Reactor.so .shobj/TP_Reactor.o .shobj/TP_Reactor.so: TP_Reactor.cpp \ + $(ACE_ROOT)/ace/TP_Reactor.h \ + $(ACE_ROOT)/ace/Select_Reactor.h \ + $(ACE_ROOT)/ace/Select_Reactor_T.h \ + $(ACE_ROOT)/ace/Select_Reactor_Base.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Token.h \ + $(ACE_ROOT)/ace/Token.i \ + $(ACE_ROOT)/ace/Pipe.h \ + $(ACE_ROOT)/ace/Pipe.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Select_Reactor_Base.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Select_Reactor_T.i \ + $(ACE_ROOT)/ace/Select_Reactor.i \ + $(ACE_ROOT)/ace/TP_Reactor.i +.obj/XtReactor.o .obj/XtReactor.so .shobj/XtReactor.o .shobj/XtReactor.so: XtReactor.cpp \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/XtReactor.h \ + $(ACE_ROOT)/ace/Select_Reactor.h \ + $(ACE_ROOT)/ace/Select_Reactor_T.h \ + $(ACE_ROOT)/ace/Select_Reactor_Base.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Token.h \ + $(ACE_ROOT)/ace/Token.i \ + $(ACE_ROOT)/ace/Pipe.h \ + $(ACE_ROOT)/ace/Pipe.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Select_Reactor_Base.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Select_Reactor_T.i \ + $(ACE_ROOT)/ace/Select_Reactor.i +.obj/FlReactor.o .obj/FlReactor.so .shobj/FlReactor.o .shobj/FlReactor.so: FlReactor.cpp \ + $(ACE_ROOT)/ace/FlReactor.h \ + $(ACE_ROOT)/ace/Select_Reactor.h \ + $(ACE_ROOT)/ace/Select_Reactor_T.h \ + $(ACE_ROOT)/ace/Select_Reactor_Base.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Token.h \ + $(ACE_ROOT)/ace/Token.i \ + $(ACE_ROOT)/ace/Pipe.h \ + $(ACE_ROOT)/ace/Pipe.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Select_Reactor_Base.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Select_Reactor_T.i \ + $(ACE_ROOT)/ace/Select_Reactor.i \ + $(ACE_ROOT)/ace/FlReactor.i +.obj/TkReactor.o .obj/TkReactor.so .shobj/TkReactor.o .shobj/TkReactor.so: TkReactor.cpp \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/TkReactor.h \ + $(ACE_ROOT)/ace/Select_Reactor.h \ + $(ACE_ROOT)/ace/Select_Reactor_T.h \ + $(ACE_ROOT)/ace/Select_Reactor_Base.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Token.h \ + $(ACE_ROOT)/ace/Token.i \ + $(ACE_ROOT)/ace/Pipe.h \ + $(ACE_ROOT)/ace/Pipe.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Select_Reactor_Base.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Select_Reactor_T.i \ + $(ACE_ROOT)/ace/Select_Reactor.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ace/Makefile.am b/ace/Makefile.am index 98677f3160e..36e938da735 100644 --- a/ace/Makefile.am +++ b/ace/Makefile.am @@ -187,19 +187,14 @@ libACE_Threads_la_SOURCES = \ libACE_Demux_la_SOURCES = \ Event_Handler.cpp \ - FlReactor.cpp \ Handle_Set.cpp \ - Msg_WFMO_Reactor.cpp \ POSIX_Proactor.cpp \ Priority_Reactor.cpp \ Proactor.cpp \ Reactor.cpp \ Select_Reactor.cpp \ Select_Reactor_Base.cpp \ - TP_Reactor.cpp \ - TkReactor.cpp \ - WFMO_Reactor.cpp \ - XtReactor.cpp + WFMO_Reactor.cpp libACE_Connection_la_SOURCES = \ Asynch_IO.cpp \ @@ -280,7 +275,6 @@ libACE_Svcconf_la_SOURCES = \ libACE_Streams_la_SOURCES = \ CDR_Stream.cpp \ - Codeset_IBM1047.cpp \ Message_Block.cpp \ Message_Queue.cpp \ Task.cpp @@ -307,12 +301,15 @@ libACE_Other_la_SOURCES = \ CORBA_Handler.cpp \ CORBA_Ref.cpp \ Local_Name_Space.cpp \ + Msg_WFMO_Reactor.cpp \ Name_Proxy.cpp \ Name_Request_Reply.cpp \ Name_Space.cpp \ Naming_Context.cpp \ Registry_Name_Space.cpp \ - Remote_Name_Space.cpp + Remote_Name_Space.cpp \ + TP_Reactor.cpp \ + XtReactor.cpp libACE_la_SOURCES = \ $(libACE_OS_la_SOURCES) \ @@ -385,11 +382,6 @@ ACE_TEMPLATE_FILES = \ Auto_Ptr.cpp \ Connector.cpp \ Containers_T.cpp \ - Cache_Map_Manager_T.cpp \ - Cached_Connect_Strategy_T.cpp \ - Caching_Strategies_T.cpp \ - Caching_Utility_T.cpp \ - Cleanup_Strategies_T.cpp \ Dump_T.cpp \ Dynamic_Service.cpp \ Env_Value_T.cpp \ @@ -397,10 +389,7 @@ ACE_TEMPLATE_FILES = \ Free_List.cpp \ Functor_T.cpp \ Future.cpp \ - Future_Node.cpp \ - Future_Set.cpp \ Hash_Map_Manager_T.cpp \ - Hash_Cache_Map_Manager_T.cpp \ IOStream_T.cpp \ LOCK_SOCK_Acceptor.cpp \ Local_Name_Space_T.cpp \ @@ -446,8 +435,8 @@ pkginclude_HEADERS = \ ACE.i \ ARGV.h \ ARGV.i \ - ATM_Addr.h \ - ATM_Addr.i \ + ATM_Addr.h \ + ATM_Addr.i \ Acceptor.h \ Acceptor.i \ Activation_Queue.h \ @@ -478,17 +467,6 @@ pkginclude_HEADERS = \ CORBA_Ref.h \ CORBA_Ref.i \ CORBA_macros.h \ - Cache_Map_Manager_T.h \ - Cache_Map_Manager_T.i \ - Cached_Connect_Strategy_T.h \ - Cached_Connect_Strategy_T.i \ - Caching_Strategies_T.h \ - Caching_Strategies_T.i \ - Caching_Utility_T.h \ - Caching_Utility_T.i \ - Cleanup_Strategies_T.h \ - Cleanup_Strategies_T.i \ - Codeset_IBM1047.h \ Connector.h \ Connector.i \ Containers.h \ @@ -539,8 +517,6 @@ pkginclude_HEADERS = \ FILE_IO.h \ FILE_IO.i \ Filecache.h \ - FlReactor.h \ - FlReactor.i \ Free_List.h \ Free_List.i \ Functor.h \ @@ -548,14 +524,10 @@ pkginclude_HEADERS = \ Functor_T.h \ Functor_T.i \ Future.h \ - Future_Node.h \ - Future_Set.h \ Get_Opt.h \ Get_Opt.i \ Handle_Set.h \ Handle_Set.i \ - Hash_Cache_Map_Manager_T.h \ - Hash_Cache_Map_Manager_T.i \ Hash_Map_Manager.h \ Hash_Map_Manager.i \ Hash_Map_Manager_T.h \ @@ -804,7 +776,6 @@ pkginclude_HEADERS = \ Timer_Queue_T.i \ Timer_Wheel.h \ Timer_Wheel_T.h \ - TkReactor.h \ Token.h \ Token.i \ Token_Collection.h \ diff --git a/ace/Makefile.bor b/ace/Makefile.bor deleted file mode 100644 index 1f40409661a..00000000000 --- a/ace/Makefile.bor +++ /dev/null @@ -1,195 +0,0 @@ - -# -# Makefile for building the ACE library with Borland C++Builder 4.x -# - -NAME = ace - -OBJFILES = \ - $(OBJDIR)\ACE.obj \ - $(OBJDIR)\ARGV.obj \ - $(OBJDIR)\ATM_Addr.obj \ - $(OBJDIR)\Acceptor.obj \ - $(OBJDIR)\Activation_Queue.obj \ - $(OBJDIR)\Active_Map_Manager.obj \ - $(OBJDIR)\Addr.obj \ - $(OBJDIR)\Arg_Shifter.obj \ - $(OBJDIR)\Asynch_Acceptor.obj \ - $(OBJDIR)\Asynch_IO.obj \ - $(OBJDIR)\Asynch_IO_Impl.obj \ - $(OBJDIR)\Auto_Ptr.obj \ - $(OBJDIR)\Based_Pointer_Repository.obj \ - $(OBJDIR)\Basic_Types.obj \ - $(OBJDIR)\CDR_Stream.obj \ - $(OBJDIR)\CORBA_Handler.obj \ - $(OBJDIR)\CORBA_Ref.obj \ - $(OBJDIR)\Codeset_IBM1047.obj \ - $(OBJDIR)\Connector.obj \ - $(OBJDIR)\Containers.obj \ - $(OBJDIR)\DEV.obj \ - $(OBJDIR)\DEV_Addr.obj \ - $(OBJDIR)\DEV_Connector.obj \ - $(OBJDIR)\DEV_IO.obj \ - $(OBJDIR)\DLL.obj \ - $(OBJDIR)\Date_Time.obj \ - $(OBJDIR)\Dirent.obj \ - $(OBJDIR)\Dump.obj \ - $(OBJDIR)\Dynamic.obj \ - $(OBJDIR)\Dynamic_Service.obj \ - $(OBJDIR)\Event_Handler.obj \ - $(OBJDIR)\FIFO.obj \ - $(OBJDIR)\FIFO_Recv.obj \ - $(OBJDIR)\FIFO_Recv_Msg.obj \ - $(OBJDIR)\FIFO_Send.obj \ - $(OBJDIR)\FIFO_Send_Msg.obj \ - $(OBJDIR)\FILE.obj \ - $(OBJDIR)\FILE_Addr.obj \ - $(OBJDIR)\FILE_Connector.obj \ - $(OBJDIR)\FILE_IO.obj \ - $(OBJDIR)\Filecache.obj \ - $(OBJDIR)\FlReactor.obj \ - $(OBJDIR)\Free_List.obj \ - $(OBJDIR)\Functor.obj \ - $(OBJDIR)\Future.obj \ - $(OBJDIR)\Get_Opt.obj \ - $(OBJDIR)\Handle_Set.obj \ - $(OBJDIR)\Hash_Map_Manager.obj \ - $(OBJDIR)\High_Res_Timer.obj \ - $(OBJDIR)\INET_Addr.obj \ - $(OBJDIR)\IOStream.obj \ - $(OBJDIR)\IO_Cntl_Msg.obj \ - $(OBJDIR)\IO_SAP.obj \ - $(OBJDIR)\IPC_SAP.obj \ - $(OBJDIR)\LOCK_SOCK_Acceptor.obj \ - $(OBJDIR)\LSOCK.obj \ - $(OBJDIR)\LSOCK_Acceptor.obj \ - $(OBJDIR)\LSOCK_CODgram.obj \ - $(OBJDIR)\LSOCK_Connector.obj \ - $(OBJDIR)\LSOCK_Dgram.obj \ - $(OBJDIR)\LSOCK_Stream.obj \ - $(OBJDIR)\Local_Name_Space.obj \ - $(OBJDIR)\Local_Tokens.obj \ - $(OBJDIR)\Log_Msg.obj \ - $(OBJDIR)\Log_Record.obj \ - $(OBJDIR)\Malloc.obj \ - $(OBJDIR)\Managed_Object.obj \ - $(OBJDIR)\Map.obj \ - $(OBJDIR)\Map_Manager.obj \ - $(OBJDIR)\Mem_Map.obj \ - $(OBJDIR)\Memory_Pool.obj \ - $(OBJDIR)\Message_Block.obj \ - $(OBJDIR)\Message_Queue.obj \ - $(OBJDIR)\Method_Request.obj \ - $(OBJDIR)\Module.obj \ - $(OBJDIR)\Msg_WFMO_Reactor.obj \ - $(OBJDIR)\Multiplexor.obj \ - $(OBJDIR)\NT_Service.obj \ - $(OBJDIR)\Name_Proxy.obj \ - $(OBJDIR)\Name_Request_Reply.obj \ - $(OBJDIR)\Name_Space.obj \ - $(OBJDIR)\Naming_Context.obj \ - $(OBJDIR)\OS.obj \ - $(OBJDIR)\Object_Manager.obj \ - $(OBJDIR)\Obstack.obj \ - $(OBJDIR)\POSIX_Asynch_IO.obj \ - $(OBJDIR)\POSIX_Proactor.obj \ - $(OBJDIR)\Pair.obj \ - $(OBJDIR)\Parse_Node.obj \ - $(OBJDIR)\Pipe.obj \ - $(OBJDIR)\Priority_Reactor.obj \ - $(OBJDIR)\Proactor.obj \ - $(OBJDIR)\Process.obj \ - $(OBJDIR)\Process_Manager.obj \ - $(OBJDIR)\Profile_Timer.obj \ - $(OBJDIR)\RB_Tree.obj \ - $(OBJDIR)\Reactor.obj \ - $(OBJDIR)\Read_Buffer.obj \ - $(OBJDIR)\Registry.obj \ - $(OBJDIR)\Registry_Name_Space.obj \ - $(OBJDIR)\Remote_Name_Space.obj \ - $(OBJDIR)\Remote_Tokens.obj \ - $(OBJDIR)\SOCK.obj \ - $(OBJDIR)\SOCK_Acceptor.obj \ - $(OBJDIR)\SOCK_CODgram.obj \ - $(OBJDIR)\SOCK_Connector.obj \ - $(OBJDIR)\SOCK_Dgram.obj \ - $(OBJDIR)\SOCK_Dgram_Bcast.obj \ - $(OBJDIR)\SOCK_Dgram_Mcast.obj \ - $(OBJDIR)\SOCK_IO.obj \ - $(OBJDIR)\SOCK_Stream.obj \ - $(OBJDIR)\SPIPE.obj \ - $(OBJDIR)\SPIPE_Acceptor.obj \ - $(OBJDIR)\SPIPE_Addr.obj \ - $(OBJDIR)\SPIPE_Connector.obj \ - $(OBJDIR)\SPIPE_Stream.obj \ - $(OBJDIR)\SString.obj \ - $(OBJDIR)\SV_Message.obj \ - $(OBJDIR)\SV_Message_Queue.obj \ - $(OBJDIR)\SV_Semaphore_Complex.obj \ - $(OBJDIR)\SV_Semaphore_Simple.obj \ - $(OBJDIR)\SV_Shared_Memory.obj \ - $(OBJDIR)\Sched_Params.obj \ - $(OBJDIR)\Select_Reactor.obj \ - $(OBJDIR)\Select_Reactor_Base.obj \ - $(OBJDIR)\Service_Config.obj \ - $(OBJDIR)\Service_Manager.obj \ - $(OBJDIR)\Service_Object.obj \ - $(OBJDIR)\Service_Repository.obj \ - $(OBJDIR)\Service_Types.obj \ - $(OBJDIR)\Shared_Memory.obj \ - $(OBJDIR)\Shared_Memory_MM.obj \ - $(OBJDIR)\Shared_Memory_SV.obj \ - $(OBJDIR)\Shared_Object.obj \ - $(OBJDIR)\Signal.obj \ - $(OBJDIR)\Singleton.obj \ - $(OBJDIR)\Stats.obj \ - $(OBJDIR)\Strategies.obj \ - $(OBJDIR)\Stream.obj \ - $(OBJDIR)\Stream_Modules.obj \ - $(OBJDIR)\Svc_Conf_l.obj \ - $(OBJDIR)\Svc_Conf_y.obj \ - $(OBJDIR)\Svc_Handler.obj \ - $(OBJDIR)\Synch.obj \ - $(OBJDIR)\Synch_Options.obj \ - $(OBJDIR)\System_Time.obj \ - $(OBJDIR)\TLI.obj \ - $(OBJDIR)\TLI_Acceptor.obj \ - $(OBJDIR)\TLI_Connector.obj \ - $(OBJDIR)\TLI_Stream.obj \ - $(OBJDIR)\TP_Reactor.obj \ - $(OBJDIR)\TTY_IO.obj \ - $(OBJDIR)\Task.obj \ - $(OBJDIR)\Template_Instantiations.obj \ - $(OBJDIR)\Thread.obj \ - $(OBJDIR)\Thread_Manager.obj \ - $(OBJDIR)\Time_Request_Reply.obj \ - $(OBJDIR)\Timeprobe.obj \ - $(OBJDIR)\Timer_Hash.obj \ - $(OBJDIR)\Timer_Heap.obj \ - $(OBJDIR)\Timer_List.obj \ - $(OBJDIR)\Timer_Queue.obj \ - $(OBJDIR)\Timer_Queue_Adapters.obj \ - $(OBJDIR)\Timer_Wheel.obj \ - $(OBJDIR)\TkReactor.obj \ - $(OBJDIR)\Token.obj \ - $(OBJDIR)\Token_Collection.obj \ - $(OBJDIR)\Token_Invariants.obj \ - $(OBJDIR)\Token_Manager.obj \ - $(OBJDIR)\Token_Request_Reply.obj \ - $(OBJDIR)\Trace.obj \ - $(OBJDIR)\Typed_SV_Message.obj \ - $(OBJDIR)\Typed_SV_Message_Queue.obj \ - $(OBJDIR)\UNIX_Addr.obj \ - $(OBJDIR)\UPIPE_Acceptor.obj \ - $(OBJDIR)\UPIPE_Connector.obj \ - $(OBJDIR)\UPIPE_Stream.obj \ - $(OBJDIR)\WFMO_Reactor.obj \ - $(OBJDIR)\WIN32_Asynch_IO.obj \ - $(OBJDIR)\WIN32_Proactor.obj \ - $(OBJDIR)\XtReactor.obj - -CFLAGS = $(ACE_CFLAGS) - -CPPDIR = . - -!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor> diff --git a/ace/Malloc.h b/ace/Malloc.h index bcbc452aecf..57e240da004 100644 --- a/ace/Malloc.h +++ b/ace/Malloc.h @@ -34,10 +34,6 @@ #define ACE_PROCESS_MUTEX ACE_SV_Semaphore_Simple #endif /* ACE_HAS_THREADS */ -#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC) -#include "ace/Based_Pointer_T.h" -#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */ - typedef ACE_Atomic_Op<ACE_PROCESS_MUTEX, int> ACE_INT; struct ACE_Export ACE_Malloc_Stats @@ -61,7 +57,6 @@ struct ACE_Export ACE_Malloc_Stats #define AMS(X) #endif /* ACE_HAS_MALLOC_STATS */ -#if !defined (ACE_MALLOC_ALIGN) // ACE_MALLOC_ALIGN allows you to insure that allocated regions are at // least <ACE_MALLOC_ALIGN> bytes long. It is especially useful when // you want areas to be at least a page long, or 32K long, or @@ -76,28 +71,19 @@ struct ACE_Export ACE_Malloc_Stats // use a signed integer number of bytes you want. For example: // #define ACE_MALLOC_ALIGN ((int)4096) +#if !defined (ACE_MALLOC_ALIGN) #define ACE_MALLOC_ALIGN ((int)(sizeof (long))) #endif /* ACE_MALLOC_ALIGN */ union ACE_Export ACE_Malloc_Header { - // = TITLE - // We use a union to force alignment to the most restrictive type. + // TITLE + // This is a block header. - class ACE_Malloc_Control_Block + struct ACE_Malloc_Control_Block { - // = TITLE - // This is the control block header. It's used by <ACE_Malloc> - // to keep track of each chunk of data when it's in the free - // list or in use. - public: -#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC) - ACE_Based_Pointer<ACE_Malloc_Header> next_block_; - // Points to next block if on free list. -#else ACE_Malloc_Header *next_block_; // Points to next block if on free list. -#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */ size_t size_; // Size of this block. diff --git a/ace/Malloc.i b/ace/Malloc.i index 32b903bcf3e..a257f7bc28b 100644 --- a/ace/Malloc.i +++ b/ace/Malloc.i @@ -20,7 +20,7 @@ ACE_INLINE void * ACE_New_Allocator::calloc (size_t nbytes, char initial_value) { - char *ptr = 0; + char *ptr; ACE_NEW_RETURN (ptr, char[nbytes], 0); @@ -144,8 +144,11 @@ ACE_INLINE void ACE_Static_Allocator_Base::free (void *ptr) { // Check to see if ptr is within our pool?! +#if defined (ACE_NDEBUG) ACE_UNUSED_ARG (ptr); +#else ACE_ASSERT (ptr >= this->buffer_ && ptr < this->buffer_ + this->size_); +#endif /* ACE_NDEBUG */ } ACE_INLINE int @@ -229,3 +232,4 @@ ACE_Static_Allocator_Base::ACE_Static_Allocator_Base (char *buffer, offset_ (0) { } + diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp index 50818cf70a9..a975f02fdd2 100644 --- a/ace/Malloc_T.cpp +++ b/ace/Malloc_T.cpp @@ -141,10 +141,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::open (void) rounded_bytes, first_time); if (this->cb_ptr_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT (" (%P|%t) %p\n"), - ASYS_TEXT ("init_acquire failed")), - -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT (" (%P|%t) %p\n"), ASYS_TEXT ("init_acquire failed")), -1); else if (first_time) { // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%P|%t) first time in, control block = %u\n"), this->cb_ptr_)); @@ -183,7 +180,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::open (void) #else p->s_.size_ = (rounded_bytes - sizeof *this->cb_ptr_) / sizeof (ACE_Malloc_Header); -#endif /* (__hpux) && defined (__LP64__) */ +#endif AMS (++this->cb_ptr_->malloc_stats_.nchunks_); AMS (++this->cb_ptr_->malloc_stats_.nblocks_); @@ -204,10 +201,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc (LPCTSTR pool_name) ACE_DIRECTORY_SEPARATOR_CHAR)) { ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc"); - if (this->open () == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p"), - ASYS_TEXT ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc"))); + this->open (); } template <ACE_MEM_POOL_1, class ACE_LOCK> @@ -219,10 +213,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc (LPCTSTR pool_name, ACE_DIRECTORY_SEPARATOR_CHAR)) { ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc"); - if (this->open () == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p"), - ASYS_TEXT ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc"))); + this->open (); } #if !defined (ACE_HAS_TEMPLATE_TYPEDEFS) @@ -234,10 +225,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc (LPCTSTR pool_name, lock_ (lock_name) { ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc"); - if (this->open () == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p"), - ASYS_TEXT ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc"))); + this->open (); } #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ @@ -277,9 +265,6 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_malloc (size_t nbytes) { ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_malloc"); - if (this->cb_ptr_ == 0) - return 0; - // Round up request to a multiple of the ACE_Malloc_Header size. size_t nunits = (nbytes + sizeof (ACE_Malloc_Header) - 1) / sizeof (ACE_Malloc_Header) @@ -337,10 +322,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_malloc (size_t nbytes) currp = this->cb_ptr_->freep_; } else - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT (" (%P|%t) %p\n"), - ASYS_TEXT ("malloc")), - 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT (" (%P|%t) %p\n"), ASYS_TEXT ("malloc")), 0); } } } diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h index b41afe45986..4c49896d923 100644 --- a/ace/Malloc_T.h +++ b/ace/Malloc_T.h @@ -163,10 +163,10 @@ public: virtual int find (const char *name, void *&pointer); // Locate <name> and pass out parameter via pointer. If found, - // return 0, Returns -1 if <name> isn't found. + // return 0, Returns -1 if failure occurs. virtual int find (const char *name); - // Returns 0 if the name is in the mapping and -1 if not. + // returns 0 if the name is in the mapping. -1, otherwise. virtual int unbind (const char *name); // Unbind (remove) the name from the map. Don't return the pointer diff --git a/ace/Malloc_T.i b/ace/Malloc_T.i index 2e13d231cd0..8db19ce8fc6 100644 --- a/ace/Malloc_T.i +++ b/ace/Malloc_T.i @@ -152,42 +152,36 @@ ACE_Allocator_Adapter<MALLOC>::protect (void *addr, size_t len, int flags) return this->allocator_.protect (addr, len, flags); } -template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_INLINE ACE_MEM_POOL & +template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_MEM_POOL & ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::memory_pool (void) { ACE_TRACE ("ACE_Malloc<MEMORY_POOL, ACE_LOCK>::memory_pool"); return this->memory_pool_; } -template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_INLINE int -ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::sync (ssize_t len, - int flags) +template <ACE_MEM_POOL_1, class ACE_LOCK> int +ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::sync (ssize_t len, int flags) { ACE_TRACE ("ACE_Malloc<MEMORY_POOL, ACE_LOCK>::sync"); return this->memory_pool_.sync (len, flags); } -template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_INLINE int -ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::sync (void *addr, - size_t len, - int flags) +template <ACE_MEM_POOL_1, class ACE_LOCK> int +ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::sync (void *addr, size_t len, int flags) { ACE_TRACE ("ACE_Malloc<MEMORY_POOL, ACE_LOCK>::sync"); return this->memory_pool_.sync (addr, len, flags); } -template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_INLINE int -ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::protect (ssize_t len, - int flags) +template <ACE_MEM_POOL_1, class ACE_LOCK> int +ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::protect (ssize_t len, int flags) { ACE_TRACE ("ACE_Malloc<MEMORY_POOL, ACE_LOCK>::protect"); return this->memory_pool_.protect (len, flags); } -template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_INLINE int -ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::protect (void *addr, - size_t len, - int flags) +template <ACE_MEM_POOL_1, class ACE_LOCK> int +ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::protect (void *addr, size_t len, int flags) { ACE_TRACE ("ACE_Malloc<MEMORY_POOL, ACE_LOCK>::protect"); return this->memory_pool_.protect (addr, len, flags); diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp index 7bcec198a04..00b30a0a646 100644 --- a/ace/Map_Manager.cpp +++ b/ace/Map_Manager.cpp @@ -84,12 +84,16 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::bind_i (const EXT_ID &ext_id, slot); if (result == 0) - // We found the key. Nothing to change. - return 1; + { + // We found the key. Nothing to change. + return 1; + } else - // We didn't find the key. - return this->shared_bind (ext_id, - int_id); + { + // We didn't find the key. + return this->shared_bind (ext_id, + int_id); + } } template <class EXT_ID, class INT_ID, class ACE_LOCK> int @@ -100,7 +104,9 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::next_free (size_t &free_slot) // Make sure we haven't run out of free slots. if (free_slot != this->free_list_id ()) - return 0; + { + return 0; + } else { // Resize the map. @@ -108,8 +114,10 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::next_free (size_t &free_slot) // Check for errors. if (result == 0) - // New free slot. - free_slot = this->free_list_.next (); + { + // New free slot. + free_slot = this->free_list_.next (); + } return result; } @@ -125,25 +133,35 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::shared_move (size_t slot, // Grab the entry. ENTRY &entry = this->search_structure_[slot]; + // // Remove from current list. + // // Fix the entry before us. size_t current_list_prev = entry.prev (); - if (current_list_prev == current_list_id) - current_list.next (entry.next ()); + { + current_list.next (entry.next ()); + } else - this->search_structure_[current_list_prev].next (entry.next ()); + { + this->search_structure_[current_list_prev].next (entry.next ()); + } // Fix the entry after us. size_t current_list_next = entry.next (); - if (current_list_next == current_list_id) - current_list.prev (entry.prev ()); + { + current_list.prev (entry.prev ()); + } else - this->search_structure_[current_list_next].prev (entry.prev ()); + { + this->search_structure_[current_list_next].prev (entry.prev ()); + } + // // Add to new list. + // // Fix us. size_t new_list_next = new_list.next (); @@ -155,9 +173,13 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::shared_move (size_t slot, // Fix entry after us. if (new_list_next == new_list_id) - new_list.prev (slot); + { + new_list.prev (slot); + } else - this->search_structure_[new_list_next].prev (slot); + { + this->search_structure_[new_list_next].prev (slot); + } } template <class EXT_ID, class INT_ID, class ACE_LOCK> int @@ -197,6 +219,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id, size_t slot = 0; int result = this->find_and_return_index (ext_id, slot); + if (result == 0) { // We found it, so make copies of the old entries and rebind @@ -213,9 +236,11 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id, return 1; } else - // We didn't find it, so let's add it. - return this->shared_bind (ext_id, - int_id); + { + // We didn't find it, so let's add it. + return this->shared_bind (ext_id, + int_id); + } } template <class EXT_ID, class INT_ID, class ACE_LOCK> int @@ -227,6 +252,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id, size_t slot = 0; int result = this->find_and_return_index (ext_id, slot); + if (result == 0) { // We found it, so make copies of the old entries and rebind @@ -242,19 +268,23 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id, return 1; } else - // We didn't find it, so let's add it. - return this->shared_bind (ext_id, - int_id); + { + // We didn't find it, so let's add it. + return this->shared_bind (ext_id, + int_id); + } } template <class EXT_ID, class INT_ID, class ACE_LOCK> int ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id, const INT_ID &int_id) { + // First try to find the key. size_t slot = 0; int result = this->find_and_return_index (ext_id, slot); + if (result == 0) { // We found it, so rebind current entries. @@ -268,9 +298,11 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id, return 1; } else - // We didn't find it, so let's add it. - return this->shared_bind (ext_id, - int_id); + { + // We didn't find it, so let's add it. + return this->shared_bind (ext_id, + int_id); + } } template <class EXT_ID, class INT_ID, class ACE_LOCK> int @@ -281,6 +313,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::trybind_i (const EXT_ID &ext_id, size_t slot = 0; int result = this->find_and_return_index (ext_id, slot); + if (result == 0) { // Key was found. Make a copy of value, but *don't* update @@ -289,9 +322,11 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::trybind_i (const EXT_ID &ext_id, return 1; } else - // We didn't find it, so let's bind it! - return this->bind_i (ext_id, - int_id); + { + // We didn't find it, so let's bind it! + return this->bind_i (ext_id, + int_id); + } } template <class EXT_ID, class INT_ID, class ACE_LOCK> int @@ -324,9 +359,12 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::find_i (const EXT_ID &ext_id, size_t slot = 0; int result = this->find_and_return_index (ext_id, slot); + if (result == 0) - // Key was found. Make a copy of value. - int_id = this->search_structure_[slot].int_id_; + { + // Key was found. Make a copy of value. + int_id = this->search_structure_[slot].int_id_; + } return result; } @@ -359,9 +397,12 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind_i (const EXT_ID &ext_id, size_t slot = 0; int result = this->unbind_and_return_index (ext_id, slot); + if (result == 0) - // If found, copy the value. - int_id = this->search_structure_[slot].int_id_; + { + // If found, copy the value. + int_id = this->search_structure_[slot].int_id_; + } return result; } @@ -381,22 +422,26 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::resize_i (size_t new_size) for (i = this->occupied_list_.next (); i != this->occupied_list_id (); i = this->search_structure_[i].next ()) - // Call the copy constructor using operator placement new. - new (&(temp[i])) ENTRY (this->search_structure_[i]); + { + // Copy constructor. + new (&(temp[i])) ENTRY (this->search_structure_[i]); + } // Copy over the free entires. for (i = this->free_list_.next (); i != this->free_list_id (); i = this->search_structure_[i].next ()) - // Call the copy constructor using operator placement new. - new (&(temp[i])) ENTRY (this->search_structure_[i]); + { + // Copy constructor. + new (&(temp[i])) ENTRY (this->search_structure_[i]); + } // Construct the new elements. for (i = this->total_size_; i < new_size; i++) { - // Call the constructor for each element in the array using - // operator placement new. Note that this requires a default - // constructor for <EXT_ID> and <INT_ID>. + // Call the constructor for each element in the array. Note + // that this requires a default constructor for <EXT_ID> and + // <INT_ID>. new (&(temp[i])) ENTRY; temp[i].next (i + 1); temp[i].prev (i - 1); @@ -425,11 +470,15 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::new_size (void) size_t current_size = this->total_size_; if (current_size < MAX_EXPONENTIAL) - // Exponentially increase if we haven't reached MAX_EXPONENTIAL. - current_size *= 2; + { + // Exponentially increase if we haven't reached MAX_EXPONENTIAL. + current_size *= 2; + } else - // Linear increase if we have reached MAX_EXPONENTIAL. - current_size += LINEAR_INCREASE; + { + // Linear increase if we have reached MAX_EXPONENTIAL. + current_size += LINEAR_INCREASE; + } // This should be the new size. return current_size; @@ -489,8 +538,8 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_Map_Entry<EXT_ID, INT_ID>& ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::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 + // @@ 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<EXT_ID, INT_ID> *retv = 0; diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h index 0925d3c6dd7..3a1969b7707 100644 --- a/ace/Map_Manager.h +++ b/ace/Map_Manager.h @@ -34,26 +34,28 @@ class ACE_Map_Entry // = TITLE // An entry in the Map. public: -# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS) - ~ACE_Map_Entry (void); - // We need this destructor to keep some compilers from complaining. - // It's just a no-op, however. -# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */ - EXT_ID ext_id_; // Key used to look up an entry. INT_ID int_id_; // The contents of the entry itself. +# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS) + ~ACE_Map_Entry (void); + // We need this destructor to keep some compilers from complaining. + // It's just a no-op, however. +# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */ + void dump (void) const; // Dump the state of an object. ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. + // // = These are really private, but unfortunately template friends - // are not portable. + // don't work too well. + // size_t next (void) const; void next (size_t n); @@ -200,10 +202,10 @@ public: // in case the caller needs to deallocate memory. Returns 0 if // successful, else -1. - size_t current_size (void) const; + size_t current_size (void); // Return the current size of the map. - size_t total_size (void) const; + size_t total_size (void); // Return the total size of the map. ACE_LOCK &mutex (void); diff --git a/ace/Map_Manager.i b/ace/Map_Manager.i index 34d3fe254c8..d837cbd06b1 100644 --- a/ace/Map_Manager.i +++ b/ace/Map_Manager.i @@ -173,16 +173,18 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind (const EXT_ID &ext_id) } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE size_t -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::current_size (void) const +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::current_size (void) { - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, ACE_const_cast (ACE_LOCK &, this->lock_), ACE_static_cast (size_t, -1)); + ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, + ACE_static_cast(size_t, -1)); return this->cur_size_; } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE size_t -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::total_size (void) const +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::total_size (void) { - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, ACE_const_cast (ACE_LOCK &, this->lock_), ACE_static_cast (size_t, -1)); + ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, + ACE_static_cast (size_t, -1)); return this->total_size_; } diff --git a/ace/Map_T.h b/ace/Map_T.h index 2b9e2594a72..fe1c9926fdb 100644 --- a/ace/Map_T.h +++ b/ace/Map_T.h @@ -10,7 +10,7 @@ // Map_T.h // // = AUTHOR -// Irfan Pyarali <irfan@cs.wustl.edu> +// Irfan Pyarali // // ============================================================================ @@ -27,6 +27,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +//////////////////////////////////////////////////////////////////////////////// + template <class T> class ACE_Noop_Key_Generator { @@ -38,6 +40,8 @@ public: // Functor method: generates a new key. }; +//////////////////////////////////////////////////////////////////////////////// + template <class T> class ACE_Incremental_Key_Generator { @@ -71,6 +75,8 @@ protected: // Current value. }; +//////////////////////////////////////////////////////////////////////////////// + template <class T> class ACE_Iterator_Impl { @@ -100,6 +106,8 @@ public: // Reverse. }; +//////////////////////////////////////////////////////////////////////////////// + template <class T> class ACE_Reverse_Iterator_Impl { @@ -129,6 +137,8 @@ public: // Reverse. }; +//////////////////////////////////////////////////////////////////////////////// + template <class T> class ACE_Iterator { @@ -183,6 +193,8 @@ protected: // Implementation pointer. }; +//////////////////////////////////////////////////////////////////////////////// + template <class T> class ACE_Reverse_Iterator { @@ -237,6 +249,8 @@ protected: // Implementation pointer. }; +//////////////////////////////////////////////////////////////////////////////// + template <class KEY, class VALUE> class ACE_Map { @@ -248,20 +262,13 @@ class ACE_Map public: // = Traits. - typedef KEY - key_type; - typedef VALUE - mapped_type; - typedef ACE_Reference_Pair<const KEY, VALUE> - value_type; - typedef ACE_Iterator<value_type> - iterator; - typedef ACE_Reverse_Iterator<value_type> - reverse_iterator; - typedef ACE_Iterator_Impl<value_type> - iterator_implementation; - typedef ACE_Reverse_Iterator_Impl<value_type> - reverse_iterator_implementation; + typedef KEY key_type; + typedef VALUE mapped_type; + typedef ACE_Reference_Pair<const KEY, VALUE> value_type; + typedef ACE_Iterator<value_type> iterator; + typedef ACE_Reverse_Iterator<value_type> reverse_iterator; + typedef ACE_Iterator_Impl<value_type> iterator_implementation; + typedef ACE_Reverse_Iterator_Impl<value_type> reverse_iterator_implementation; virtual ~ACE_Map (void); // Close down and release dynamically allocated resources. @@ -362,10 +369,10 @@ public: // Remove <key> from the map, and return the <value> associated with // <key>. - virtual size_t current_size (void) const = 0; + virtual size_t current_size (void) = 0; // Return the current size of the map. - virtual size_t total_size (void) const = 0; + virtual size_t total_size (void) = 0; // Return the total size of the map. virtual void dump (void) const = 0; @@ -401,6 +408,8 @@ private: ACE_UNIMPLEMENTED_FUNC (ACE_Map (const ACE_Map<KEY, VALUE> &)) }; +//////////////////////////////////////////////////////////////////////////////// + template <class T, class IMPLEMENTATION, class ENTRY> class ACE_Map_Impl_Iterator_Adapter : public ACE_Iterator_Impl<T> { @@ -412,8 +421,7 @@ class ACE_Map_Impl_Iterator_Adapter : public ACE_Iterator_Impl<T> public: // = Traits. - typedef IMPLEMENTATION - implementation; + typedef IMPLEMENTATION implementation; ACE_Map_Impl_Iterator_Adapter (const IMPLEMENTATION &impl); // Constructor. @@ -445,6 +453,8 @@ protected: // All implementation details are forwarded to this class. }; +//////////////////////////////////////////////////////////////////////////////// + template <class T, class IMPLEMENTATION, class ENTRY> class ACE_Map_Impl_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl<T> { @@ -489,6 +499,8 @@ protected: // All implementation details are forwarded to this class. }; +//////////////////////////////////////////////////////////////////////////////// + template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> class ACE_Map_Impl : public ACE_Map<KEY, VALUE> { @@ -500,13 +512,9 @@ class ACE_Map_Impl : public ACE_Map<KEY, VALUE> public: // = Traits. - typedef ACE_Map_Impl_Iterator_Adapter<ACE_TYPENAME ACE_Map<KEY, VALUE>::value_type, ITERATOR, ENTRY> - iterator_impl; - typedef ACE_Map_Impl_Reverse_Iterator_Adapter<ACE_TYPENAME ACE_Map<KEY, VALUE>::value_type, REVERSE_ITERATOR, ENTRY> - reverse_iterator_impl; - - typedef IMPLEMENTATION - implementation; + typedef ACE_Map_Impl_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, ITERATOR, ENTRY> iterator_impl; + typedef ACE_Map_Impl_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, REVERSE_ITERATOR, ENTRY> reverse_iterator_impl; + typedef IMPLEMENTATION implementation; // = Initialization and termination methods. ACE_Map_Impl (ACE_Allocator *alloc = 0); @@ -616,10 +624,10 @@ public: // Remove <key> from the map, and return the <value> associated with // <key>. - virtual size_t current_size (void) const; + virtual size_t current_size (void); // Return the current size of the map. - virtual size_t total_size (void) const; + virtual size_t total_size (void); // Return the total size of the map. virtual void dump (void) const; @@ -650,6 +658,8 @@ private: ACE_UNIMPLEMENTED_FUNC (ACE_Map_Impl (const ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY> &)) }; +//////////////////////////////////////////////////////////////////////////////// + template <class T, class VALUE> class ACE_Active_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl<T> { @@ -661,8 +671,7 @@ class ACE_Active_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl<T> public: // = Traits. - typedef ACE_TYPENAME ACE_Active_Map_Manager<VALUE>::iterator - implementation; + typedef ACE_TYPENAME ACE_Active_Map_Manager<VALUE>::iterator implementation; ACE_Active_Map_Manager_Iterator_Adapter (const ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl); // Constructor. @@ -694,6 +703,8 @@ protected: // All implementation details are forwarded to this class. }; +//////////////////////////////////////////////////////////////////////////////// + template <class T, class VALUE> class ACE_Active_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl<T> { @@ -705,8 +716,7 @@ class ACE_Active_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Itera public: // = Traits. - typedef ACE_TYPENAME ACE_Active_Map_Manager<VALUE>::reverse_iterator - implementation; + typedef ACE_TYPENAME ACE_Active_Map_Manager<VALUE>::reverse_iterator implementation; ACE_Active_Map_Manager_Reverse_Iterator_Adapter (const ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl); // Constructor. @@ -738,6 +748,8 @@ protected: // All implementation details are forwarded to this class. }; +//////////////////////////////////////////////////////////////////////////////// + template <class KEY, class VALUE, class KEY_ADAPTER> class ACE_Active_Map_Manager_Adapter : public ACE_Map<KEY, VALUE> { @@ -749,14 +761,10 @@ class ACE_Active_Map_Manager_Adapter : public ACE_Map<KEY, VALUE> public: // = Traits. - typedef ACE_Pair<KEY, VALUE> - expanded_value; - typedef ACE_Active_Map_Manager_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, expanded_value> - iterator_impl; - typedef ACE_Active_Map_Manager_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, expanded_value> - reverse_iterator_impl; - typedef ACE_Active_Map_Manager<expanded_value> - implementation; + typedef ACE_Pair<KEY, VALUE> expanded_value; + typedef ACE_Active_Map_Manager_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, expanded_value> iterator_impl; + typedef ACE_Active_Map_Manager_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, expanded_value> reverse_iterator_impl; + typedef ACE_Active_Map_Manager<expanded_value> implementation; // = Initialization and termination methods. ACE_Active_Map_Manager_Adapter (ACE_Allocator *alloc = 0); @@ -866,10 +874,10 @@ public: // Remove <key> from the map, and return the <value> associated with // <key>. - virtual size_t current_size (void) const; + virtual size_t current_size (void); // Return the current size of the map. - virtual size_t total_size (void) const; + virtual size_t total_size (void); // Return the total size of the map. virtual void dump (void) const; @@ -914,6 +922,8 @@ private: ACE_UNIMPLEMENTED_FUNC (ACE_Active_Map_Manager_Adapter (const ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER> &)) }; +//////////////////////////////////////////////////////////////////////////////// + template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> class ACE_Hash_Map_Manager_Ex_Iterator_Adapter : public ACE_Iterator_Impl<T> { @@ -925,8 +935,7 @@ class ACE_Hash_Map_Manager_Ex_Iterator_Adapter : public ACE_Iterator_Impl<T> public: // = Traits. - typedef ACE_TYPENAME ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::iterator - implementation; + typedef ACE_TYPENAME ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::iterator implementation; ACE_Hash_Map_Manager_Ex_Iterator_Adapter (const ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl); // Constructor. @@ -958,6 +967,8 @@ protected: // All implementation details are forwarded to this class. }; +//////////////////////////////////////////////////////////////////////////////// + template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl<T> { @@ -969,8 +980,7 @@ class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter : public ACE_Reverse_Iter public: // = Traits. - typedef ACE_TYPENAME ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::reverse_iterator - implementation; + typedef ACE_TYPENAME ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::reverse_iterator implementation; ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter (const ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl); // Constructor. @@ -1002,6 +1012,8 @@ protected: // All implementation details are forwarded to this class. }; +//////////////////////////////////////////////////////////////////////////////// + template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> class ACE_Hash_Map_Manager_Ex_Adapter : public ACE_Map<KEY, VALUE> { @@ -1013,12 +1025,9 @@ class ACE_Hash_Map_Manager_Ex_Adapter : public ACE_Map<KEY, VALUE> public: // = Traits. - typedef ACE_Hash_Map_Manager_Ex_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE, HASH_KEY, COMPARE_KEYS> - iterator_impl; - typedef ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE, HASH_KEY, COMPARE_KEYS> - reverse_iterator_impl; - typedef ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> - implementation; + typedef ACE_Hash_Map_Manager_Ex_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE, HASH_KEY, COMPARE_KEYS> iterator_impl; + typedef ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE, HASH_KEY, COMPARE_KEYS> reverse_iterator_impl; + typedef ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> implementation; // = Initialization and termination methods. ACE_Hash_Map_Manager_Ex_Adapter (ACE_Allocator *alloc = 0); @@ -1128,10 +1137,10 @@ public: // Remove <key> from the map, and return the <value> associated with // <key>. - virtual size_t current_size (void) const; + virtual size_t current_size (void); // Return the current size of the map. - virtual size_t total_size (void) const; + virtual size_t total_size (void); // Return the total size of the map. virtual void dump (void) const; @@ -1168,6 +1177,8 @@ private: ACE_UNIMPLEMENTED_FUNC (ACE_Hash_Map_Manager_Ex_Adapter (const ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR> &)) }; +//////////////////////////////////////////////////////////////////////////////// + template <class T, class KEY, class VALUE> class ACE_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl<T> { @@ -1179,8 +1190,7 @@ class ACE_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl<T> public: // = Traits. - typedef ACE_TYPENAME ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::iterator - implementation; + typedef ACE_TYPENAME ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::iterator implementation; ACE_Map_Manager_Iterator_Adapter (const ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl); // Constructor. @@ -1212,6 +1222,8 @@ protected: // All implementation details are forwarded to this class. }; +//////////////////////////////////////////////////////////////////////////////// + template <class T, class KEY, class VALUE> class ACE_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl<T> { @@ -1223,8 +1235,7 @@ class ACE_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Imp public: // = Traits. - typedef ACE_TYPENAME ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::reverse_iterator - implementation; + typedef ACE_TYPENAME ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::reverse_iterator implementation; ACE_Map_Manager_Reverse_Iterator_Adapter (const ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl); // Constructor. @@ -1256,6 +1267,8 @@ protected: // All implementation details are forwarded to this class. }; +//////////////////////////////////////////////////////////////////////////////// + template <class KEY, class VALUE, class KEY_GENERATOR> class ACE_Map_Manager_Adapter : public ACE_Map<KEY, VALUE> { @@ -1267,12 +1280,9 @@ class ACE_Map_Manager_Adapter : public ACE_Map<KEY, VALUE> public: // = Traits. - typedef ACE_Map_Manager_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE> - iterator_impl; - typedef ACE_Map_Manager_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE> - reverse_iterator_impl; - typedef ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex> - implementation; + typedef ACE_Map_Manager_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE> iterator_impl; + typedef ACE_Map_Manager_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE> reverse_iterator_impl; + typedef ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex> implementation; // = Initialization and termination methods. ACE_Map_Manager_Adapter (ACE_Allocator *alloc = 0); @@ -1382,10 +1392,10 @@ public: // Remove <key> from the map, and return the <value> associated with // <key>. - virtual size_t current_size (void) const; + virtual size_t current_size (void); // Return the current size of the map. - virtual size_t total_size (void) const; + virtual size_t total_size (void); // Return the total size of the map. virtual void dump (void) const; @@ -1422,6 +1432,8 @@ private: ACE_UNIMPLEMENTED_FUNC (ACE_Map_Manager_Adapter (const ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR> &)) }; +//////////////////////////////////////////////////////////////////////////////// + #if defined (__ACE_INLINE__) #include "ace/Map_T.i" #endif /* __ACE_INLINE__ */ diff --git a/ace/Map_T.i b/ace/Map_T.i index 08899ad7a63..ed64cf6d6a7 100644 --- a/ace/Map_T.i +++ b/ace/Map_T.i @@ -1,11 +1,15 @@ // $Id$ +//////////////////////////////////////////////////////////////////////////////// + template <class T> ACE_INLINE int ACE_Noop_Key_Generator<T>::operator() (T &) { return -1; } +//////////////////////////////////////////////////////////////////////////////// + template <class T> ACE_INLINE ACE_Incremental_Key_Generator<T>::ACE_Incremental_Key_Generator (void) : t_ (0) @@ -25,16 +29,22 @@ ACE_Incremental_Key_Generator<T>::current_value (void) return this->t_; } +//////////////////////////////////////////////////////////////////////////////// + template <class T> ACE_INLINE ACE_Iterator_Impl<T>::~ACE_Iterator_Impl (void) { } +//////////////////////////////////////////////////////////////////////////////// + template <class T> ACE_INLINE ACE_Reverse_Iterator_Impl<T>::~ACE_Reverse_Iterator_Impl (void) { } +//////////////////////////////////////////////////////////////////////////////// + template <class T> ACE_INLINE ACE_Iterator<T>::ACE_Iterator (ACE_Iterator_Impl<T> *impl) : implementation_ (impl) @@ -115,6 +125,8 @@ ACE_Iterator<T>::impl (void) return *this->implementation_; } +//////////////////////////////////////////////////////////////////////////////// + template <class T> ACE_INLINE ACE_Reverse_Iterator<T>::ACE_Reverse_Iterator (ACE_Reverse_Iterator_Impl<T> *impl) : implementation_ (impl) @@ -195,6 +207,8 @@ ACE_Reverse_Iterator<T>::impl (void) return *this->implementation_; } +//////////////////////////////////////////////////////////////////////////////// + template <class KEY, class VALUE> ACE_INLINE ACE_Map<KEY, VALUE>::ACE_Map (void) { @@ -229,6 +243,8 @@ ACE_Map<KEY, VALUE>::rend (void) return reverse_iterator (this->rend_impl ()); } +//////////////////////////////////////////////////////////////////////////////// + template <class T, class IMPLEMENTATION, class ENTRY> ACE_INLINE ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::ACE_Map_Impl_Iterator_Adapter (const IMPLEMENTATION &impl) : implementation_ (impl) @@ -282,6 +298,8 @@ ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::impl (void) return this->implementation_; } +//////////////////////////////////////////////////////////////////////////////// + template <class T, class IMPLEMENTATION, class ENTRY> ACE_INLINE ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::ACE_Map_Impl_Reverse_Iterator_Adapter (const IMPLEMENTATION &impl) : implementation_ (impl) @@ -335,6 +353,8 @@ ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::impl (void) return this->implementation_; } +//////////////////////////////////////////////////////////////////////////////// + template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::ACE_Map_Impl (ACE_Allocator *alloc) : implementation_ (alloc) @@ -473,13 +493,13 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::unb } template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE size_t -ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::current_size (void) const +ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::current_size (void) { return this->implementation_.current_size (); } template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE size_t -ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::total_size (void) const +ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::total_size (void) { return this->implementation_.total_size (); } @@ -520,6 +540,8 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::imp return this->implementation_; } +//////////////////////////////////////////////////////////////////////////////// + template <class T, class VALUE> ACE_INLINE ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::ACE_Active_Map_Manager_Iterator_Adapter (const ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl) : implementation_ (impl) @@ -574,6 +596,8 @@ ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::impl (void) return this->implementation_; } +//////////////////////////////////////////////////////////////////////////////// + template <class T, class VALUE> ACE_INLINE ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::ACE_Active_Map_Manager_Reverse_Iterator_Adapter (const ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl) : implementation_ (impl) @@ -628,6 +652,8 @@ ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::impl (void) return this->implementation_; } +//////////////////////////////////////////////////////////////////////////////// + template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::ACE_Active_Map_Manager_Adapter (ACE_Allocator *alloc) : implementation_ (alloc) @@ -927,13 +953,13 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::unbind (const KEY &key, } template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE size_t -ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::current_size (void) const +ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::current_size (void) { return this->implementation_.current_size (); } template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE size_t -ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::total_size (void) const +ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::total_size (void) { return this->implementation_.total_size (); } @@ -980,6 +1006,8 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::key_adapter (void) return this->key_adapter_; } +//////////////////////////////////////////////////////////////////////////////// + template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::ACE_Hash_Map_Manager_Ex_Iterator_Adapter (const ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl) : implementation_ (impl) @@ -1034,6 +1062,8 @@ ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>: return this->implementation_; } +//////////////////////////////////////////////////////////////////////////////// + template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter (const ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl) : implementation_ (impl) @@ -1088,6 +1118,8 @@ ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPAR return this->implementation_; } +//////////////////////////////////////////////////////////////////////////////// + template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::ACE_Hash_Map_Manager_Ex_Adapter (ACE_Allocator *alloc) : implementation_ (alloc) @@ -1237,13 +1269,13 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO } template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE size_t -ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::current_size (void) const +ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::current_size (void) { return this->implementation_.current_size (); } template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE size_t -ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::total_size (void) const +ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::total_size (void) { return this->implementation_.total_size (); } @@ -1290,6 +1322,8 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO return this->key_generator_; } +//////////////////////////////////////////////////////////////////////////////// + template <class T, class KEY, class VALUE> ACE_INLINE ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::ACE_Map_Manager_Iterator_Adapter (const ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl) : implementation_ (impl) @@ -1344,6 +1378,8 @@ ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::impl (void) return this->implementation_; } +//////////////////////////////////////////////////////////////////////////////// + template <class T, class KEY, class VALUE> ACE_INLINE ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::ACE_Map_Manager_Reverse_Iterator_Adapter (const ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl) : implementation_ (impl) @@ -1398,6 +1434,8 @@ ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::impl (void) return this->implementation_; } +//////////////////////////////////////////////////////////////////////////////// + template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::ACE_Map_Manager_Adapter (ACE_Allocator *alloc) : implementation_ (alloc) @@ -1547,13 +1585,13 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::unbind (const KEY &key, } template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE size_t -ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::current_size (void) const +ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::current_size (void) { return this->implementation_.current_size (); } template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE size_t -ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::total_size (void) const +ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::total_size (void) { return this->implementation_.total_size (); } @@ -1599,3 +1637,5 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::key_generator (void) { return this->key_generator_; } + +//////////////////////////////////////////////////////////////////////////////// diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp index 1d07027de11..b8a3567fa6d 100644 --- a/ace/Memory_Pool.cpp +++ b/ace/Memory_Pool.cpp @@ -10,10 +10,6 @@ #include "ace/Auto_Ptr.h" -#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC) -#include "ace/Based_Pointer_T.h" -#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */ - ACE_RCSID(ace, Memory_Pool, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_Local_Memory_Pool) @@ -37,17 +33,16 @@ ACE_Local_Memory_Pool::acquire (size_t nbytes, ACE_TRACE ("ACE_Local_Memory_Pool::acquire"); rounded_bytes = this->round_up (nbytes); - char *temp = 0; - ACE_NEW_RETURN (temp, - char[rounded_bytes], - 0); - - ACE_Auto_Basic_Array_Ptr<char> cp (temp); + ACE_Auto_Basic_Array_Ptr<char> cp (new char[rounded_bytes]); - if (this->allocated_chunks_.insert (cp.get ()) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) insertion into set failed\n")), - 0); + if (cp.get () == 0) + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) new failed \n")), 0); + else + { + int result = this->allocated_chunks_.insert (cp.get ()); + if (result != 0) + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) insertion into set failed\n")), 0); + } return cp.release (); } @@ -61,7 +56,9 @@ ACE_Local_Memory_Pool::release (void) for (ACE_Unbounded_Set<char *>::iterator i = this->allocated_chunks_.begin (); i != this->allocated_chunks_.end (); ++i) - delete [] *i; + { + delete[] *i; + } return 0; } @@ -78,12 +75,6 @@ int ACE_MMAP_Memory_Pool::release (void) { ACE_TRACE ("ACE_MMAP_Memory_Pool::release"); - -#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC) - ACE_POSITION_INDEPENDENT_REPOSITORY::instance ()->unbind (this->mmap_.addr (), - this->mmap_.size ()); -#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */ - this->mmap_.remove (); return 0; } @@ -184,21 +175,20 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool (LPCTSTR backing_store_name, #if !defined (ACE_WIN32) && !defined (CHORUS) if (this->signal_handler_.register_handler (SIGSEGV, this) == -1) - ACE_ERROR ((LM_ERROR, - "%p\n", this->backing_store_name_)); + ACE_ERROR ((LM_ERROR, "%p\n", this->backing_store_name_)); #endif /* ACE_WIN32 */ } -// Compute the new map_size of the backing store and commit the +// Compute the new file_offset of the backing store and commit the // memory. int ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, - off_t &map_size) + off_t &file_offset) { ACE_TRACE ("ACE_MMAP_Memory_Pool::commit_backing_store_name"); #if defined (CHORUS) - map_size = rounded_bytes; + file_offset = rounded_bytes; #else size_t seek_len; @@ -218,9 +208,9 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, cur_block < rounded_bytes; cur_block += seek_len) { - map_size = ACE_OS::lseek (this->mmap_.handle () , seek_len - 1, SEEK_END); + file_offset = ACE_OS::lseek (this->mmap_.handle () , seek_len - 1, SEEK_END); - if (map_size == -1 || ACE_OS::write (this->mmap_.handle (), "", 1) == -1) + if (file_offset == -1 || ACE_OS::write (this->mmap_.handle (), "", 1) == -1) ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), this->backing_store_name_), @@ -228,15 +218,15 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, } // Increment by one to put us at the beginning of the next chunk... - map_size++; + file_offset++; #endif /* CHORUS */ return 0; } -// Memory map the file up to <map_size> bytes. +// Memory map the file up to <file_offset> bytes. int -ACE_MMAP_Memory_Pool::map_file (off_t map_size) +ACE_MMAP_Memory_Pool::map_file (off_t file_offset) { ACE_TRACE ("ACE_MMAP_Memory_Pool::map_file"); @@ -244,32 +234,16 @@ ACE_MMAP_Memory_Pool::map_file (off_t map_size) this->mmap_.unmap (); // Remap the file. - if (this->mmap_.map (map_size, - PROT_RDWR, - this->flags_, - this->base_addr_, - 0, - this->sa_) == -1 + if (this->mmap_.map (file_offset, PROT_RDWR, + this->flags_, this->base_addr_, 0, this->sa_) == -1 || this->base_addr_ != 0 && this->mmap_.addr () != this->base_addr_) - { -#if 0 - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("(%P|%t) addr = %u, base_addr = %u, map_size = %u, %p\n"), - this->mmap_.addr (), - this->base_addr_, - map_size, - this->backing_store_name_)); -#endif /* 0 */ - return -1; - } - else - { -#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC) - ACE_POSITION_INDEPENDENT_REPOSITORY::instance ()->bind (this->base_addr_, - map_size); -#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */ - return 0; - } + return -1; + // ACE_ERROR_RETURN ((LM_ERROR, + // ASYS_TEXT ("(%P|%t) addr = %u, base_addr = %u, file_offset = %u, %p\n"), + // this->mmap_.addr (), this->base_addr_, + // file_offset, this->backing_store_name_), -1); + + return 0; } // Ask operating system for more shared memory, increasing the mapping @@ -286,17 +260,18 @@ ACE_MMAP_Memory_Pool::acquire (size_t nbytes, // ACE_DEBUG ((LM_DEBUG, "(%P|%t) acquiring more chunks, nbytes = // %d, rounded_bytes = %d\n", nbytes, rounded_bytes)); - off_t map_size; + off_t file_offset; if (this->commit_backing_store_name (rounded_bytes, - map_size) == -1) + file_offset) == -1) return 0; - else if (this->map_file (map_size) == -1) + + if (this->map_file (file_offset) == -1) return 0; // ACE_DEBUG ((LM_DEBUG, "(%P|%t) acquired more chunks, nbytes = %d, - // rounded_bytes = %d, map_size = %d\n", nbytes, rounded_bytes, - // map_size)); + // rounded_bytes = %d, file_offset = %d\n", nbytes, rounded_bytes, + // file_offset)); return (void *) ((char *) this->mmap_.addr () + (this->mmap_.size () - rounded_bytes)); } @@ -340,18 +315,12 @@ ACE_MMAP_Memory_Pool::init_acquire (size_t nbytes, this->base_addr_, 0, this->sa_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("open")), - 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("open")), 0); return this->mmap_.addr (); } else - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("open")), - 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("open")), 0); } int @@ -359,15 +328,15 @@ ACE_MMAP_Memory_Pool::remap (void *addr) { ACE_TRACE ("ACE_MMAP_Memory_Pool::remap"); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Remapping with fault address at: %X\n"), addr)); - off_t current_map_size = ACE_OS::filesize (this->mmap_.handle ()); + off_t current_file_offset = ACE_OS::filesize (this->mmap_.handle ()); // ACE_OS::lseek (this->mmap_.handle (), 0, SEEK_END); - if (!(addr < (void *) ((char *) this->mmap_.addr () + current_map_size) + if (!(addr < (void *) ((char *) this->mmap_.addr () + current_file_offset) && addr >= this->mmap_.addr ())) return -1; // Extend the mapping to cover the size of the backing store. - return this->map_file (current_map_size); + return this->map_file (current_file_offset); } ACE_MMAP_Memory_Pool_Options::ACE_MMAP_Memory_Pool_Options (void *base_addr, @@ -388,9 +357,9 @@ ACE_MMAP_Memory_Pool_Options::ACE_MMAP_Memory_Pool_Options (void *base_addr, ACE_TRACE ("ACE_MMAP_Memory_Pool_Options::ACE_MMAP_Memory_Pool_Options"); // HP-UX 11, 64-bit bug workaround. #if defined (__hpux) && defined (__LP64__) - long temp = ACE_DEFAULT_BASE_ADDRL; - base_addr_ = (void *) temp; -#endif /* defined (__hpux) && defined (__LP64__) */ +long temp = ACE_DEFAULT_BASE_ADDRL; +base_addr_ = (void *)temp; +#endif } // Handle SIGSEGV and SIGBUS signals to remap memory properly. When a @@ -411,7 +380,7 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t else ; // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) received %S\n"), signum)); - // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) new mapping address = %u\n"), (char *) this->base_addr_ + current_map_size)); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) new mapping address = %u\n"), (char *) this->base_addr_ + current_file_offset)); #if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR) // Make sure that the pointer causing the problem is within the @@ -438,16 +407,16 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t if (guess_on_fault_) { // check if the current mapping is up to date. - off_t current_map_size = ACE_OS::filesize (this->mmap_.handle ()); + off_t current_file_offset = ACE_OS::filesize (this->mmap_.handle ()); - if (ACE_static_cast(size_t, current_map_size) == this->mmap_.size()) + if (ACE_static_cast(size_t, current_file_offset) == this->mmap_.size()) { // It is up to date so this is a bad address. return -1; } // Extend the mapping to cover the size of the backing store. - return this->map_file (current_map_size); + return this->map_file (current_file_offset); } else return -1; @@ -491,10 +460,7 @@ ACE_Sbrk_Memory_Pool::acquire (size_t nbytes, void *cp = ACE_OS::sbrk (rounded_bytes); if (cp == MAP_FAILED) - ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) cp = %u\n", - cp), - 0); + ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) cp = %u\n", cp), 0); else // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d, new break = %u\n"), nbytes, rounded_bytes, cp)); return cp; @@ -519,20 +485,18 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Shared_Memory_Pool) ACE_Shared_Memory_Pool_Options::ACE_Shared_Memory_Pool_Options (char *base_addr, size_t max_segments, size_t file_perms, - off_t minimum_bytes, - size_t segment_size) + off_t minimum_bytes) : base_addr_ (base_addr), max_segments_ (max_segments), minimum_bytes_ (minimum_bytes), - file_perms_ (file_perms), - segment_size_ (segment_size) + file_perms_ (file_perms) { ACE_TRACE ("ACE_Shared_Memory_Pool_Options::ACE_Shared_Memory_Pool_Options"); - // HP-UX 11, 64-bit bug workaround -#if defined (__hpux) && defined (__LP64__) - long temp = ACE_DEFAULT_BASE_ADDRL; - base_addr_ = (char *) temp; -#endif /* defined (__hpux) && defined (__LP64__) */ +// HP-UX 11, 64-bit bug workaround +#if defined (__hpux) && defined(__LP64__) +long temp = ACE_DEFAULT_BASE_ADDRL; +base_addr_ = (char *)temp; +#endif } void @@ -546,8 +510,7 @@ ACE_Shared_Memory_Pool::in_use (off_t &offset, size_t &counter) { offset = 0; - SHM_TABLE *st = ACE_reinterpret_cast (SHM_TABLE *, - this->base_addr_); + SHM_TABLE *st = (SHM_TABLE *) this->base_addr_; shmid_ds buf; for (counter = 0; @@ -555,10 +518,7 @@ ACE_Shared_Memory_Pool::in_use (off_t &offset, counter++) { if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("shmctl")), - -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("shmctl")), -1); offset += buf.shm_segsz; // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); } @@ -572,8 +532,7 @@ ACE_Shared_Memory_Pool::find_seg (const void* const searchPtr, size_t &counter) { offset = 0; - SHM_TABLE *st = ACE_reinterpret_cast (SHM_TABLE *, - this->base_addr_); + SHM_TABLE *st = (SHM_TABLE *) this->base_addr_; shmid_ds buf; for (counter = 0; @@ -582,10 +541,7 @@ ACE_Shared_Memory_Pool::find_seg (const void* const searchPtr, counter++) { if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("shmctl")), - -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("shmctl")), -1); offset += buf.shm_segsz; // If segment 'counter' starts at a location greater than the @@ -610,8 +566,7 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, ACE_TRACE ("ACE_Shared_Memory_Pool::update"); size_t counter; - SHM_TABLE *st = ACE_reinterpret_cast (SHM_TABLE *, - this->base_addr_); + SHM_TABLE *st = (SHM_TABLE *) this->base_addr_; if (this->in_use (offset, counter) == -1) return -1; @@ -619,35 +574,24 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, if (counter == this->max_segments_) ACE_ERROR_RETURN ((LM_ERROR, "exceeded max number of segments = %d, base = %u, offset = %u\n", - counter, - this->base_addr_, - offset), - -1); + counter, this->base_addr_, offset), -1); else { int shmid = ACE_OS::shmget (st[counter].key_, rounded_bytes, this->file_perms_ | IPC_CREAT | IPC_EXCL); if (shmid == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("shmget")), - 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("shmget")), 0); + st[counter].shmid_ = shmid; st[counter].used_ = 1; void *address = (void *) (((char *) this->base_addr_) + offset); - void *shmem = ACE_OS::shmat (st[counter].shmid_, - (char *) address, - 0); + void *shmem = ACE_OS::shmat (st[counter].shmid_, (char *) address, 0); if (shmem != address) - ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) %p, shmem = %u, address = %u\n", - "shmat", - shmem, - address), - 0); + ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p, shmem = %u, address = %u\n", + "shmat", shmem, address), 0); } return 0; } @@ -670,25 +614,19 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); size_t counter; if (this->in_use (offset, counter) == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("in_use"))); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_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_))) - ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) address %u out of range\n", - siginfo->si_addr), - -1); + ACE_ERROR_RETURN ((LM_ERROR, "(%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); + ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) address %u out of range\n", + siginfo->si_addr), -1); #endif /* ! _UNICOS */ } @@ -704,24 +642,16 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) #else /* ! _UNICOS */ if (this->find_seg ((const void *)siginfo->si_addr, offset, counter) == -1) #endif /* ! _UNICOS */ - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("in_use")), - -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("in_use")), -1); void *address = (void *) (((char *) this->base_addr_) + offset); - SHM_TABLE *st = ACE_reinterpret_cast (SHM_TABLE *, - this->base_addr_); + SHM_TABLE *st = (SHM_TABLE *) this->base_addr_; void *shmem = ACE_OS::shmat (st[counter].shmid_, (char *) address, 0); if (shmem != address) - ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) %p, shmem = %u, address = %u\n", - "shmat", - shmem, - address), - 0); + ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p, shmem = %u, address = %u\n", + "shmat", shmem, address), 0); // NOTE: this won't work if we dont have SIGINFO_T or SI_ADDR #else @@ -736,8 +666,7 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (LPCTSTR backing_store_name, : base_addr_ (0), file_perms_ (ACE_DEFAULT_FILE_PERMS), max_segments_ (ACE_DEFAULT_MAX_SEGMENTS), - minimum_bytes_ (0), - segment_size_ (ACE_DEFAULT_SEGMENT_SIZE) + minimum_bytes_ (0) { ACE_TRACE ("ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool"); @@ -748,7 +677,6 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (LPCTSTR backing_store_name, this->max_segments_ = options->max_segments_; this->file_perms_ = options->file_perms_; this->minimum_bytes_ = options->minimum_bytes_; - this->segment_size_ = options->segment_size_; } if (backing_store_name) @@ -777,9 +705,7 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (LPCTSTR backing_store_name, this->base_shm_key_ = ACE_DEFAULT_SHM_KEY; if (this->signal_handler_.register_handler (SIGSEGV, this) == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_Sig_Handler::register_handler"))); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Sig_Handler::register_handler"))); } // Ask system for more shared memory. @@ -826,51 +752,35 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes, if (shmid == -1) { if (errno != EEXIST) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("shmget")), - 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("shmget")), 0); + first_time = 0; shmid = ACE_OS::shmget (this->base_shm_key_, 0, 0); if (shmid == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("shmget")), - 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("shmget")), 0); - // This implementation doesn't care if we don't get the key we - // want... - this->base_addr_ = - ACE_OS::shmat (shmid, - (char *) this->base_addr_, 0); + // This implementation doesn't care if we don't get the key we want... + this->base_addr_ = ACE_OS::shmat (shmid, (char *) this->base_addr_, 0); if (this->base_addr_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) %p, base_addr = %u\n", - "shmat", - this->base_addr_), - 0); + ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p, base_addr = %u\n", + "shmat", this->base_addr_), 0); } else { first_time = 1; - // This implementation doesn't care if we don't get the key we - // want... - this->base_addr_ = - ACE_OS::shmat (shmid, - (char *) this->base_addr_, 0); + // This implementation doesn't care if we don't get the key we want... + this->base_addr_ = ACE_OS::shmat (shmid, (char *) this->base_addr_, 0); if (this->base_addr_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) %p, base_addr = %u\n", - "shmat", - this->base_addr_), 0); + ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p, base_addr = %u\n", + "shmat", this->base_addr_), 0); + + SHM_TABLE *st = (SHM_TABLE *) this->base_addr_; - SHM_TABLE *st = ACE_reinterpret_cast (SHM_TABLE *, - this->base_addr_); st[0].key_ = this->base_shm_key_; st[0].shmid_ = shmid; @@ -897,8 +807,7 @@ ACE_Shared_Memory_Pool::release (void) ACE_TRACE ("ACE_Shared_Memory_Pool::release"); int result = 0; - SHM_TABLE *st = ACE_reinterpret_cast (SHM_TABLE *, - this->base_addr_); + SHM_TABLE *st = (SHM_TABLE *) this->base_addr_; for (size_t counter = 0; counter < this->max_segments_ && st[counter].used_ == 1; diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h index 78fdd72a966..5be4903deb5 100644 --- a/ace/Memory_Pool.h +++ b/ace/Memory_Pool.h @@ -34,7 +34,7 @@ class ACE_Export ACE_Sbrk_Memory_Pool_Options { // = TITLE - // Helper class for Sbrk Memory Pool constructor options. + // Helper class for constructor options. // // = DESCRIPTION // This should be a nested class, but that breaks too many @@ -104,7 +104,7 @@ protected: class ACE_Export ACE_Shared_Memory_Pool_Options { // = TITLE - // Helper class for Shared Memory Pool constructor options. + // Helper class for constructor options. // // = DESCRIPTION // This should be a nested class, but that breaks too many @@ -114,8 +114,7 @@ public: ACE_Shared_Memory_Pool_Options (char *base_addr = ACE_DEFAULT_BASE_ADDR, size_t max_segments = ACE_DEFAULT_MAX_SEGMENTS, size_t file_perms = ACE_DEFAULT_FILE_PERMS, - off_t minimum_bytes = 0, - size_t segment_size = ACE_DEFAULT_SEGMENT_SIZE); + off_t minimum_bytes = 0); char *base_addr_; // Base address of the memory-mapped backing store. @@ -128,9 +127,6 @@ public: size_t file_perms_; // File permissions to use when creating/opening a segment. - - size_t segment_size_; - // Shared memory segment size. }; class ACE_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler @@ -224,9 +220,6 @@ protected: off_t minimum_bytes_; // What the minimim bytes of the initial segment should be. - size_t segment_size_; - // Shared memory segment size. - key_t base_shm_key_; // Base shared memory key for the segment. @@ -251,7 +244,7 @@ protected: class ACE_Export ACE_Local_Memory_Pool_Options { // = TITLE - // Helper class for Local Memory Pool constructor options. + // Helper class for constructor options. // // = DESCRIPTION // This should be a nested class, but that breaks too many @@ -323,7 +316,7 @@ protected: class ACE_Export ACE_MMAP_Memory_Pool_Options { // = TITLE - // Helper class for MMAP Memory Pool constructor options. + // Helper class for constructor options. // // = DESCRIPTION // This should be a nested class, but that breaks too many @@ -433,13 +426,12 @@ protected: virtual size_t round_up (size_t nbytes); - virtual int commit_backing_store_name (size_t rounded_bytes, - off_t &map_size); - // Compute the new <map_size> of the backing store and commit the + virtual int commit_backing_store_name (size_t rounded_bytes, off_t &file_offset); + // Compute the new file_offset of the backing store and commit the // memory. - virtual int map_file (off_t map_size); - // Memory map the file up to <map_size> bytes. + virtual int map_file (off_t file_offset); + // Memory map the file up to <file_offset> bytes. virtual int handle_signal (int signum, siginfo_t *, ucontext_t *); // Handle SIGSEGV and SIGBUS signals to remap shared memory diff --git a/ace/Memory_Pool.i b/ace/Memory_Pool.i index d18ccb7afdd..a3a8667c6a4 100644 --- a/ace/Memory_Pool.i +++ b/ace/Memory_Pool.i @@ -89,8 +89,8 @@ ACE_INLINE size_t ACE_Shared_Memory_Pool::round_up (size_t nbytes) { ACE_TRACE ("ACE_Shared_Memory_Pool::round_up"); - if (nbytes < this->segment_size_) - nbytes = this->segment_size_; + if (nbytes < ACE_DEFAULT_SEGMENT_SIZE) + nbytes = ACE_DEFAULT_SEGMENT_SIZE; return ACE::round_to_pagesize (nbytes); } diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp index e77eef128ba..67e76992def 100644 --- a/ace/Message_Queue_T.cpp +++ b/ace/Message_Queue_T.cpp @@ -756,7 +756,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_messages (ACE_Message_Block *&l if (result < 0) return result; - if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::PENDING) + if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::PENDING) && this->pending_head_ && this->pending_tail_) { @@ -783,7 +783,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_messages (ACE_Message_Block *&l this->pending_tail_ = 0; } - if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::LATE) + if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::LATE) && this->late_head_ && this->late_tail_) { @@ -813,7 +813,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_messages (ACE_Message_Block *&l this->late_tail_ = 0; } - if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::BEYOND_LATE) + if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::BEYOND_LATE) && this->beyond_late_head_ && this->beyond_late_tail_) { @@ -1470,8 +1470,8 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::refresh_late_queue (const ACE_Time_Val case ACE_Dynamic_Message_Strategy::PENDING: // if we got here, something is *seriously* wrong with the queue ACE_ERROR_RETURN((LM_ERROR, - ASYS_TEXT ("Unexpected message priority status ") - ASYS_TEXT ("[%d] (expected LATE or BEYOND_LATE)"), + ASYS_TEXT ("Unexpected message priority status " + "[%d] (expected LATE or BEYOND_LATE)"), (int) current_status), -1); default: diff --git a/ace/Module.cpp b/ace/Module.cpp index da64cac7f4f..9562a09a22c 100644 --- a/ace/Module.cpp +++ b/ace/Module.cpp @@ -84,10 +84,10 @@ ACE_Module<ACE_SYNCH_USE>::link (ACE_Module<ACE_SYNCH_USE> *m) template <ACE_SYNCH_DECL> int ACE_Module<ACE_SYNCH_USE>::open (const ASYS_TCHAR *mod_name, - ACE_Task<ACE_SYNCH_USE> *writer_q, - ACE_Task<ACE_SYNCH_USE> *reader_q, - void *arg, - int flags /* = M_DELETE */) + ACE_Task<ACE_SYNCH_USE> *writer_q, + ACE_Task<ACE_SYNCH_USE> *reader_q, + void *arg, + int flags /* = M_DELETE */) { ACE_TRACE ("ACE_Module<ACE_SYNCH_USE>::open"); this->name (mod_name); @@ -102,17 +102,13 @@ ACE_Module<ACE_SYNCH_USE>::open (const ASYS_TCHAR *mod_name, if (writer_q == 0) { - ACE_NEW_RETURN (writer_q, - ACE_Thru_Task<ACE_SYNCH_USE>, - -1); + writer_q = new ACE_Thru_Task<ACE_SYNCH_USE>; ACE_SET_BITS (flags, M_DELETE_WRITER); } if (reader_q == 0) { - ACE_NEW_RETURN (reader_q, - ACE_Thru_Task<ACE_SYNCH_USE>, - -1); + reader_q = new ACE_Thru_Task<ACE_SYNCH_USE>; ACE_SET_BITS (flags, M_DELETE_READER); } @@ -191,9 +187,7 @@ ACE_Module<ACE_SYNCH_USE>::ACE_Module (const ASYS_TCHAR *mod_name, this->q_pair_[1] = 0; if (this->open (mod_name, writer_q, reader_q, args, flags) == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_Module"))); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Module"))); } template <ACE_SYNCH_DECL> int diff --git a/ace/Name_Proxy.cpp b/ace/Name_Proxy.cpp index efcaee781c4..d52d3bc31cd 100644 --- a/ace/Name_Proxy.cpp +++ b/ace/Name_Proxy.cpp @@ -148,8 +148,8 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) ASYS_TEXT ("****************** recv_reply returned -1\n"))); default: ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p got %d bytes, expected %d bytes\n"), - ASYS_TEXT ("recv failed"), + "%p got %d bytes, expected %d bytes\n", + "recv failed", n, sizeof (ACE_UINT32))); // FALLTHROUGH @@ -171,9 +171,8 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) // Subtract off the size of the part we skipped over... if (n != ssize_t (length - sizeof (ACE_UINT32))) { - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p expected %d, got %d\n"), - ASYS_TEXT ("invalid length"), + ACE_ERROR ((LM_ERROR, "%p expected %d, got %d\n", + "invalid length", length, n)); return -1; diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp index 0d133a37ba4..b165a601ac9 100644 --- a/ace/Naming_Context.cpp +++ b/ace/Naming_Context.cpp @@ -12,9 +12,9 @@ ACE_RCSID(ace, Naming_Context, "$Id$") // Make life easier later on... -typedef ACE_Local_Name_Space <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> +typedef ACE_Local_Name_Space <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> LOCAL_NAME_SPACE; -typedef ACE_Local_Name_Space <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> +typedef ACE_Local_Name_Space <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> LITE_LOCAL_NAME_SPACE; // The following Factory is used by the ACE_Service_Config and @@ -48,10 +48,8 @@ int ACE_Naming_Context::local (void) { ACE_TRACE ("ACE_Naming_Context::local"); - return ACE_OS::strcmp (this->netnameserver_host_, - ASYS_TEXT ("localhost")) == 0 - || ACE_OS::strcmp (this->netnameserver_host_, - this->hostname_) == 0; + return ACE_OS::strcmp (this->netnameserver_host_, "localhost") == 0 + || ACE_OS::strcmp (this->netnameserver_host_, this->hostname_) == 0; } int @@ -59,7 +57,7 @@ ACE_Naming_Context::open (Context_Scope_Type scope_in, int lite) { ACE_TRACE ("ACE_Naming_Context::open"); ACE_OS::hostname (this->hostname_, - (sizeof this->hostname_ / sizeof (ASYS_TCHAR))); + (sizeof this->hostname_ / sizeof (char))); this->netnameserver_host_ = this->name_options_->nameserver_host (); @@ -103,7 +101,7 @@ ACE_Naming_Context::open (Context_Scope_Type scope_in, int lite) if (ACE_LOG_MSG->op_status () != 0 || this->name_space_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("NAME_SPACE::NAME_SPACE\n")), + "NAME_SPACE::NAME_SPACE\n"), -1); return 0; } @@ -347,7 +345,7 @@ ACE_Naming_Context::list_value_entries (ACE_BINDING_SET &set_out, const char *pattern_in) { ACE_TRACE ("ACE_Naming_Context::list_value_entries"); - return this->list_value_entries (set_out, + return this->list_value_entries (set_out, ACE_WString (pattern_in)); } @@ -365,7 +363,7 @@ ACE_Naming_Context::list_type_entries (ACE_BINDING_SET &set_out, const char *pattern_in) { ACE_TRACE ("ACE_Naming_Context::list_type_entries"); - return this->list_type_entries (set_out, + return this->list_type_entries (set_out, ACE_WString (pattern_in)); } @@ -384,7 +382,7 @@ ACE_Naming_Context::dump () } int -ACE_Naming_Context::init (int argc, ASYS_TCHAR *argv[]) +ACE_Naming_Context::init (int argc, char *argv[]) { if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, @@ -459,14 +457,14 @@ ACE_Name_Options::process_name (LPCTSTR pname) } void -ACE_Name_Options::nameserver_host (const ASYS_TCHAR *host) +ACE_Name_Options::nameserver_host (const char *host) { ACE_TRACE ("ACE_Name_Options::nameserver_host"); ACE_OS::free ((void *) this->nameserver_host_); this->nameserver_host_ = ACE_OS::strdup (host); } -const ASYS_TCHAR * +const char * ACE_Name_Options::nameserver_host (void) { ACE_TRACE ("ACE_Name_Options::nameserver_host"); @@ -566,11 +564,11 @@ ACE_Name_Options::verbose (void) } void -ACE_Name_Options::parse_args (int argc, ASYS_TCHAR *argv[]) +ACE_Name_Options::parse_args (int argc, char *argv[]) { ACE_TRACE ("ACE_Name_Options::parse_args"); ACE_LOG_MSG->open (argv[0]); - this->process_name (ASYS_ONLY_WIDE_STRING (argv[0])); + this->process_name (ACE_WIDE_STRING (argv[0])); // Default is to use the PROC_LOCAL context... this->context (ACE_Naming_Context::PROC_LOCAL); @@ -580,18 +578,18 @@ ACE_Name_Options::parse_args (int argc, ASYS_TCHAR *argv[]) // clean it up in the destructor). this->database (this->process_name ()); - ACE_Get_Opt get_opt (argc, argv, ASYS_TEXT ("b:c:dh:l:P:p:s:T:vr")); + ACE_Get_Opt get_opt (argc, argv, "b:c:dh:l:P:p:s:T:vr"); for (int c; (c = get_opt ()) != -1; ) switch (c) { case 'c': { - if (ACE_OS::strcmp (get_opt.optarg, ASYS_TEXT ("PROC_LOCAL")) == 0) + if (ACE_OS::strcmp (get_opt.optarg, "PROC_LOCAL") == 0) this->context (ACE_Naming_Context::PROC_LOCAL); - else if (ACE_OS::strcmp (get_opt.optarg, ASYS_TEXT ("NODE_LOCAL")) == 0) + else if (ACE_OS::strcmp (get_opt.optarg, "NODE_LOCAL") == 0) this->context (ACE_Naming_Context::NODE_LOCAL); - else if (ACE_OS::strcmp (get_opt.optarg, ASYS_TEXT ("NET_LOCAL")) == 0) + else if (ACE_OS::strcmp (get_opt.optarg, "NET_LOCAL") == 0) this->context (ACE_Naming_Context::NET_LOCAL); } break; @@ -605,24 +603,24 @@ ACE_Name_Options::parse_args (int argc, ASYS_TCHAR *argv[]) this->nameserver_host (get_opt.optarg); break; case 'l': - this->namespace_dir (ASYS_ONLY_WIDE_STRING (get_opt.optarg)); + this->namespace_dir (ACE_WIDE_STRING (get_opt.optarg)); break; case 'P': - this->process_name (ASYS_ONLY_WIDE_STRING (get_opt.optarg)); + this->process_name (ACE_WIDE_STRING (get_opt.optarg)); break; case 'p': this->nameserver_port (ACE_OS::atoi (get_opt.optarg)); break; case 's': - this->database (ASYS_ONLY_WIDE_STRING (get_opt.optarg)); + this->database (ACE_WIDE_STRING (get_opt.optarg)); break; case 'b': this->base_address ((char *) ACE_OS::atoi (get_opt.optarg)); break; case 'T': - if (ACE_OS::strcasecmp (get_opt.optarg, ASYS_TEXT ("ON")) == 0) + if (ACE_OS::strcasecmp (get_opt.optarg, "ON") == 0) ACE_Trace::start_tracing (); - else if (ACE_OS::strcasecmp (get_opt.optarg, ASYS_TEXT ("OFF")) == 0) + else if (ACE_OS::strcasecmp (get_opt.optarg, "OFF") == 0) ACE_Trace::stop_tracing (); break; case 'v': diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h index 1067635cb82..078d35356cb 100644 --- a/ace/Naming_Context.h +++ b/ace/Naming_Context.h @@ -91,7 +91,7 @@ public: // file // = Dynamic initialization hooks. - virtual int init (int argc, ASYS_TCHAR *argv[]); + virtual int init (int argc, char *argv[]); // Initialize name options and naming context when dynamically // linked. @@ -231,10 +231,10 @@ private: ACE_Name_Space *name_space_; // Name space (can be either local or remote) dynamically bound. - ASYS_TCHAR hostname_[MAXHOSTNAMELEN + 1]; + char hostname_[MAXHOSTNAMELEN + 1]; // Holds the local hostname. - const ASYS_TCHAR *netnameserver_host_; + const char *netnameserver_host_; // Holds name of net name server. int netnameserver_port_; @@ -255,7 +255,7 @@ public: ~ACE_Name_Options (void); void parse_args (int argc, - ASYS_TCHAR *argv[]); + char *argv[]); // Parse arguments. // = Set/Get port number @@ -267,8 +267,8 @@ public: void context (ACE_Naming_Context::Context_Scope_Type); // = Set/Get host name - void nameserver_host (const ASYS_TCHAR *host); - const ASYS_TCHAR *nameserver_host (void); + void nameserver_host (const char *host); + const char *nameserver_host (void); // = Set/Get name space directory void namespace_dir (LPCTSTR dir); @@ -309,7 +309,7 @@ private: int nameserver_port_; // Port to connect to nameserver process. - const ASYS_TCHAR *nameserver_host_; + const char *nameserver_host_; // Hostname of nameserver. LPCTSTR namespace_dir_; diff --git a/ace/OS.cpp b/ace/OS.cpp index d0a6c362715..b5fef535e14 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -153,8 +153,7 @@ ACE_OS_Recursive_Thread_Mutex_Guard::release (void) inline ACE_OS_Recursive_Thread_Mutex_Guard::ACE_OS_Recursive_Thread_Mutex_Guard ( ACE_recursive_thread_mutex_t &m) - : lock_ (m), - owner_ (-1) + : lock_ (m) { acquire (); } @@ -230,7 +229,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Time_Value) // // In the beginning (Jan. 1, 1601), there was no time and no computer. // And Bill said: "Let there be time," and there was time.... -const DWORDLONG ACE_Time_Value::FILETIME_to_timval_skew = ACE_INT64_LITERAL (0x19db1ded53e8000); +const DWORDLONG ACE_Time_Value::FILETIME_to_timval_skew = 0x19db1ded53e8000i64; ACE_Time_Value::ACE_Time_Value (const FILETIME &file_time) { @@ -248,7 +247,7 @@ void ACE_Time_Value::set (const FILETIME &file_time) // Convert 100ns units to seconds; this->tv_.tv_sec = long (_100ns.QuadPart / (10000 * 1000)); // Convert remainder to microseconds; - this->tv_.tv_usec = long ((long (_100ns.QuadPart) % long (10000 * 1000)) / 10); + this->tv_.tv_usec = long ((_100ns.QuadPart % (10000 * 1000)) / 10); } // Returns the value of the object as a Win32 FILETIME. @@ -457,23 +456,9 @@ ACE_OS::uname (struct utsname *name) ::GetVersionEx (&vinfo); SYSTEM_INFO sinfo; -# if defined (ACE_HAS_PHARLAP) - // PharLap doesn't do GetSystemInfo. What's really wanted is the CPU - // architecture, so we can get that with EtsGetSystemInfo. Fill in what's - // wanted in the SYSTEM_INFO structure, and carry on. Note that the - // CPU type values in EK_KERNELINFO have the same values are the ones - // defined for SYSTEM_INFO. - EK_KERNELINFO ets_kern; - EK_SYSTEMINFO ets_sys; - EtsGetSystemInfo (&ets_kern, &ets_sys); - sinfo.wProcessorLevel = ACE_static_cast (WORD, ets_kern.CpuType); - sinfo.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; - sinfo.dwProcessorType = ets_kern.CpuType * 100 + 86; -# else ::GetSystemInfo(&sinfo); ACE_OS::strcpy (name->sysname, ACE_TEXT ("Win32")); -# endif /* ACE_HAS_PHARLAP */ if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT) { @@ -846,11 +831,7 @@ ACE_OS::fopen (const char *filename, const char *mode) int fd = _open_osfhandle ((long) handle, hmode); if (fd != -1) { -# if defined(__BORLANDC__) - FILE *fp = _fdopen (fd, ACE_const_cast (char *, mode)); -# else /* defined(__BORLANDC__) */ FILE *fp = _fdopen (fd, mode); -# endif /* defined(__BORLANDC__) */ if (fp != NULL) return fp; _close (fd); @@ -881,11 +862,7 @@ ACE_OS::fopen (const wchar_t *filename, const wchar_t *mode) int fd = _open_osfhandle ((long) handle, hmode); if (fd != -1) { -# if defined(__BORLANDC__) - FILE *fp = _wfdopen (fd, ACE_const_cast (wchar_t *, mode)); -# else /* defined(__BORLANDC__) */ FILE *fp = _wfdopen (fd, mode); -# endif /* defined(__BORLANDC__) */ if (fp != NULL) return fp; _close (fd); @@ -1357,17 +1334,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, } # elif defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) - - // PharLap ETS can act on the current thread - it can set the quantum also, - // unlike Win32. All this only works on the RT version. -# if defined (ACE_HAS_PHARLAP_RT) - if (id != ACE_SELF) - ACE_NOTSUP_RETURN (-1); - - if (sched_params.quantum() != ACE_Time_Value::zero) - EtsSetTimeSlice (sched_params.quantum().msec()); - -# else ACE_UNUSED_ARG (id); if (sched_params.scope () != ACE_SCOPE_PROCESS || @@ -1389,7 +1355,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, { return -1; } -# endif /* ACE_HAS_PHARLAP_RT */ // Set the thread priority on the current thread. return ACE_OS::thr_setprio (sched_params.priority ()); @@ -1849,9 +1814,9 @@ ACE_TSS_Cleanup::instance (void) // Now, use the Double-Checked Locking pattern to make sure we // only create the ACE_TSS_Cleanup instance once. if (ACE_TSS_Cleanup::instance_ == 0) - ACE_NEW_RETURN (ACE_TSS_Cleanup::instance_, - ACE_TSS_Cleanup, - 0); + { + ACE_NEW_RETURN (ACE_TSS_Cleanup::instance_, ACE_TSS_Cleanup, 0); + } } return ACE_TSS_Cleanup::instance_; @@ -2005,14 +1970,11 @@ ACE_TSS_Cleanup::tss_keys () if (ts_keys == 0) { - ACE_NEW_RETURN (ts_keys, - ACE_TSS_Keys, - 0); + ACE_NEW_RETURN (ts_keys, ACE_TSS_Keys, 0); // Store the dynamically allocated pointer in thread-specific // storage. if (ACE_OS::thr_setspecific (in_use_, - ACE_reinterpret_cast (void *, - ts_keys)) == -1) + ACE_reinterpret_cast (void *, ts_keys)) == -1) { delete ts_keys; return 0; // Major problems, this should *never* happen! @@ -2091,19 +2053,15 @@ ACE_TSS_Emulation::tss_base (void* ts_storage[]) { ACE_NO_HEAP_CHECK; - ACE_NEW_RETURN (ts_storage, - void*[ACE_TSS_THREAD_KEYS_MAX], - 0); + ACE_NEW_RETURN (ts_storage, void*[ACE_TSS_THREAD_KEYS_MAX], 0); // Zero the entire TSS array. Do it manually instead of using - // memset, for optimum speed. Though, memset may be faster - // :-) + // memset, for optimum speed. Though, memset may be faster :-) void **tss_base_p = ts_storage; - - for (u_int i = 0; - i < ACE_TSS_THREAD_KEYS_MAX; - ++i) - *tss_base_p++ = 0; + for (u_int i = 0; i < ACE_TSS_THREAD_KEYS_MAX; ++i, ++tss_base_p) + { + *tss_base_p = 0; + } } // Store the pointer in thread-specific storage. It gets deleted @@ -2261,16 +2219,6 @@ ACE_Thread_Adapter::inherit_log_msg (void) #endif /* ! ACE_THREADS_DONT_INHERIT_LOG_MSG && ! ACE_HAS_MINIMAL_ACE_OS */ } -#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) -#define ACE_ENDTHREADEX(STATUS) ::_endthreadex () -#define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \ - ::_beginthreadex (STACK, (void *) STACKSIZE, (unsigned int) ENTRYPOINT, (unsigned int *) THR_ID) -#else -#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) -#define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \ - ::_beginthreadex (STACK, STACKSIZE, (unsigned (__stdcall *) (void *)) ENTRY_POINT, ARGS, FLAGS, (unsigned int *) THR_ID) -#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */ - void * ACE_Thread_Adapter::invoke (void) { @@ -2403,7 +2351,7 @@ ACE_Thread_Adapter::invoke (void) if (using_afx) ::AfxEndThread ((DWORD)status); else - ACE_ENDTHREADEX (status); + ::_endthreadex ((DWORD) status); } else { @@ -2414,13 +2362,12 @@ ACE_Thread_Adapter::invoke (void) CWinThread *pThread = ::AfxGetThread (); if (!pThread || pThread->m_nThreadID != ACE_OS::thr_self ()) - ACE_ENDTHREADEX (status); + ::_endthreadex ((DWORD) status); else ::AfxEndThread ((DWORD)status); } # else - - ACE_ENDTHREADEX (status); + ::_endthreadex ((DWORD) status); # endif /* ACE_HAS_MFC && ACE_HAS_MFS != 0*/ # endif /* ACE_WIN32 */ #endif /* ACE_WIN32 || ACE_HAS_TSS_EMULATION */ @@ -3159,12 +3106,13 @@ ACE_OS::thr_create (ACE_THR_FUNC func, // thread in a suspended mode. ACE_SET_BITS (flags, THR_SUSPENDED); - *thr_handle = (void *) ACE_BEGINTHREADEX (0, - stacksize, - thread_args->entry_point (), - thread_args, - flags, - thr_id); + *thr_handle = (void *) ::_beginthreadex + (0, + stacksize, + (unsigned (__stdcall *) (void *)) thread_args->entry_point (), + thread_args, + flags, + (unsigned int *) thr_id); if (priority != ACE_DEFAULT_THREAD_PRIORITY && *thr_handle != 0) { @@ -3406,7 +3354,7 @@ ACE_TRACE ("ACE_OS::thr_exit"); if (using_afx) ::AfxEndThread ((DWORD)status); else - ACE_ENDTHREADEX (status); + ::_endthreadex ((DWORD) status); } else { @@ -3416,12 +3364,12 @@ ACE_TRACE ("ACE_OS::thr_exit"); // know to cause some problem. CWinThread *pThread = ::AfxGetThread (); if (!pThread || pThread->m_nThreadID != ACE_OS::thr_self ()) - ACE_ENDTHREADEX (status); + ::_endthreadex ((DWORD) status); else ::AfxEndThread ((DWORD)status); } # else - ACE_ENDTHREADEX (status); + ::_endthreadex ((DWORD) status); # endif /* ACE_HAS_MFC && ACE_HAS_MFS != 0*/ # elif defined (VXWORKS) @@ -4022,7 +3970,7 @@ ACE_OS::fork_exec (ASYS_TCHAR *argv[]) startup_info.cb = sizeof startup_info; if (::CreateProcess (0, - (LPTSTR) ASYS_ONLY_WIDE_STRING (buf), + (LPTSTR) ACE_WIDE_STRING (buf), 0, // No process attributes. 0, // No thread attributes. TRUE, // Allow handle inheritance. @@ -4033,7 +3981,7 @@ ACE_OS::fork_exec (ASYS_TCHAR *argv[]) &process_info)) # else if (::CreateProcess (0, - (LPTSTR) ASYS_ONLY_WIDE_STRING (buf), + (LPTSTR) buf, 0, // No process attributes. 0, // No thread attributes. FALSE, // Can's inherit handles on CE @@ -4201,9 +4149,7 @@ writev (ACE_HANDLE handle, ACE_WRITEV_TYPE iov[], int n) # if defined (ACE_HAS_ALLOCA) buf = (char *) alloca (length); # else - ACE_NEW_RETURN (buf, - char[length], - -1); + ACE_NEW_RETURN (buf, char[length], -1); # endif /* !defined (ACE_HAS_ALLOCA) */ char *ptr = buf; @@ -4247,9 +4193,7 @@ ACE_TRACE ("readv"); # if defined (ACE_HAS_ALLOCA) buf = (char *) alloca (length); # else - ACE_NEW_RETURN (buf, - char[length], - -1); + ACE_NEW_RETURN (buf, char[length], -1); # endif /* !defined (ACE_HAS_ALLOCA) */ length = ACE_OS::read_n (handle, buf, length); @@ -5186,28 +5130,19 @@ ACE_OS::difftime (time_t t1, time_t t0) } # endif /* ACE_LACKS_DIFFTIME */ -# if defined (ACE_HAS_MOSTLY_UNICODE_APIS) -# if defined (ACE_HAS_WINCE) +# if defined (ACE_HAS_WINCE) wchar_t * ACE_OS::ctime (const time_t *t) { wchar_t buf[26]; // 26 is a "magic number" ;) return ACE_OS::ctime_r (t, buf, 26); } -# endif /* ACE_HAS_WINCE */ wchar_t * ACE_OS::ctime_r (const time_t *clock, wchar_t *buf, int buflen) { -#if !defined (ACE_HAS_WINCE) - wchar_t *result; - ACE_OSCALL (::_wctime (clock), wchar_t *, 0, result); - if (result != 0) - ::wcsncpy (buf, result, buflen); - return buf; -#else // buflen must be at least 26 wchar_t long. if (buflen < 26) // Again, 26 is a magic number. return 0; @@ -5239,9 +5174,8 @@ ACE_OS::ctime_r (const time_t *clock, systime.wSecond, systime.wYear); return buf; -#endif /* ACE_HAS_WINCE */ } -# endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ +# endif /* ACE_HAS_WINCE */ # if !defined (ACE_HAS_WINCE) time_t @@ -6299,9 +6233,7 @@ ACE_OS_Object_Manager::instance (void) { ACE_OS_Object_Manager *instance_pointer; - ACE_NEW_RETURN (instance_pointer, - ACE_OS_Object_Manager, - 0); + ACE_NEW_RETURN (instance_pointer, ACE_OS_Object_Manager, 0); ACE_ASSERT (instance_pointer == instance_); instance_pointer->dynamically_allocated_ = 1; @@ -6366,7 +6298,7 @@ ACE_OS_Object_Manager::init (void) return 0; } else { // Had already initialized. - return 1; + return -1; } } @@ -6380,7 +6312,7 @@ ACE_OS_Object_Manager::fini (void) if (instance_ == 0 || shutting_down_i ()) // Too late. Or, maybe too early. Either fini () has already // been called, or init () was never called. - return object_manager_state_ == OBJ_MAN_SHUT_DOWN ? 1 : -1; + return -1; // No mutex here. Only the main thread should destroy the singleton // ACE_OS_Object_Manager instance. @@ -18,6 +18,7 @@ #ifndef ACE_OS_H # define ACE_OS_H + // This file should be a link to the platform/compiler-specific // configuration file (e.g., config-sunos5-sunc++-4.x.h). # include "ace/inc_user_config.h" @@ -303,16 +304,16 @@ # endif /* ACE_HAS_UNICODE && UNICODE */ # endif /* ACE_DEFAULT_LOGGER_KEY */ +# if !defined (ACE_DEFAULT_SERVER_HOST) +# define ACE_DEFAULT_SERVER_HOST "localhost" +# endif /* ACE_DEFAULT_SERVER_HOST */ + // The way to specify the local host for loopback IP. This is usually // "localhost" but it may need changing on some platforms. # if !defined (ACE_LOCALHOST) # define ACE_LOCALHOST ASYS_TEXT("localhost") # endif -# if !defined (ACE_DEFAULT_SERVER_HOST) -# define ACE_DEFAULT_SERVER_HOST ACE_LOCALHOST -# endif /* ACE_DEFAULT_SERVER_HOST */ - // Default shared memory key # if !defined (ACE_DEFAULT_SHM_KEY) # define ACE_DEFAULT_SHM_KEY 1234 @@ -412,7 +413,7 @@ # if defined (ACE_HAS_MOSTLY_UNICODE_APIS) # define ASYS_TCHAR wchar_t -# define ASYS_TEXT(STRING) __TEXT (STRING) +# define ASYS_TEXT(STRING) _TEXT(STRING) # else # define ASYS_TCHAR char # define ASYS_TEXT(STRING) STRING @@ -950,8 +951,8 @@ typedef ACE_HANDLE ACE_SOCKET; # define ACE_INVALID_HANDLE -1 typedef ACE_HANDLE ACE_SHLIB_HANDLE; -# define ACE_SHLIB_INVALID_HANDLE ACE_INVALID_HANDLE -# define ACE_DEFAULT_SHLIB_MODE 0 +const ACE_SHLIB_HANDLE ACE_SHLIB_INVALID_HANDLE = ACE_INVALID_HANDLE; +const int ACE_DEFAULT_SHLIB_MODE = 0; # define ACE_INVALID_SEM_KEY -1 @@ -1033,8 +1034,9 @@ typedef struct timespec class ACE_Export ACE_PSOS_Time_t { public: - ACE_PSOS_Time_t (void); - // default ctor: date, time, and ticks all zeroed. + + ACE_PSOS_Time_t (); + // default ctor: date, time, and ticks all zeroed ACE_PSOS_Time_t (const timespec_t& t); // ctor from a timespec_t @@ -1049,14 +1051,18 @@ public: // static member function to set current system time # if defined (ACE_PSOSIM) - static u_long init_simulator_time (void); + + static u_long init_simulator_time (); // static member function to initialize system time, using UNIX calls + # endif /* ACE_PSOSIM */ static const u_long max_ticks; // max number of ticks supported in a single system call + private: - // = Constants for prying info out of the pSOS time encoding. + + // constants for prying info out of the pSOS time encoding static const u_long year_mask; static const u_long month_mask; static const u_long day_mask; @@ -1120,9 +1126,7 @@ private: // This needs to go here *first* to avoid problems with AIX. # if defined (ACE_HAS_PTHREADS) extern "C" { -# define ACE_DONT_INCLUDE_ACE_SIGNAL_H -# include /**/ <signal.h> -# undef ACE_DONT_INCLUDE_ACE_SIGNAL_H +# include /**/ <signal.h> # include /**/ <pthread.h> # if defined (DIGITAL_UNIX) # define pthread_self __pthread_self @@ -1222,12 +1226,11 @@ public: // Constant "0". static const ACE_Time_Value max_time; - // Constant for maximum time representable. Note that this time is - // not intended for use with <select> or other calls that may have - // *their own* implementation-specific maximum time representations. + // Constant for maximum time representable. Note that this time + // is not intended for use with select () or other calls that may + // have *their own* implementation-specific maximum time representations. // Its primary use is in time computations such as those used by the - // dynamic subpriority strategies in the <ACE_Dynamic_Message_Queue> - // class. + // dynamic subpriority strategies in the ACE_Dynamic_Message_Queue class. // = Initialization methods. @@ -1417,11 +1420,6 @@ private: ACE_Time_Value *max_wait_time_; # define ACE_TEMPLATE_SPECIALIZATION # endif /* ACE_HAS_STD_TEMPLATE_SPECIALIZATION */ -# if defined (ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION) -# define ACE_TEMPLATE_METHOD_SPECIALIZATION template<> -# else -# define ACE_TEMPLATE_METHOD_SPECIALIZATION -# endif /* ACE_HAS_STD_TEMPLATE_SPECIALIZATION */ // The following is necessary since many C++ compilers don't support // typedef'd types inside of classes used as formal template @@ -1658,12 +1656,10 @@ if (gobbler != 0) *gobbler = (ACE_Service_Object_Exterminator) _gobble_##X; retu // the following macros are for POSIX conformance. -# if !defined (ACE_HAS_USER_MODE_MASKS) -# define S_IRWXU 00700 /* read, write, execute: owner. */ -# define S_IRUSR 00400 /* read permission: owner. */ -# define S_IWUSR 00200 /* write permission: owner. */ -# define S_IXUSR 00100 /* execute permission: owner. */ -# endif /* ACE_HAS_USER_MODE_MASKS */ +# define S_IRWXU 00700 /* read, write, execute: owner. */ +# define S_IRUSR 00400 /* read permission: owner. */ +# define S_IWUSR 00200 /* write permission: owner. */ +# define S_IXUSR 00100 /* execute permission: owner. */ # define S_IRWXG 00070 /* read, write, execute: group. */ # define S_IRGRP 00040 /* read permission: group. */ # define S_IWGRP 00020 /* write permission: group. */ @@ -2114,7 +2110,7 @@ protected: typedef rwlock_t ACE_rwlock_t; # endif /* !ACE_LACKS_RWLOCK_T */ # include /**/ <thread.h> -# endif /* (ACE_LACKS_PTHREAD_YIELD) && defined (ACE_HAS_THR_YIELD) */ +# endif /* defined (ACE_LACKS_PTHREAD_YIELD) && defined (ACE_HAS_THR_YIELD) */ # else # if !defined (ACE_HAS_POSIX_SEM) @@ -2429,8 +2425,6 @@ protected: ACE_cond_t waiting_important_writer_; // condition for the upgrading reader }; -# elif defined (ACE_HAS_PTHREADS_UNIX98_EXT) -typedef pthread_rwlock_t ACE_rwlock_t; # elif defined (ACE_HAS_STHREADS) # include /**/ <synch.h> typedef rwlock_t ACE_rwlock_t; @@ -2587,11 +2581,9 @@ typedef unsigned int size_t; # include /**/ <new.h> -# if !defined (ACE_PSOS_DIAB_MIPS) && !defined (VXWORKS) -# define ACE_DONT_INCLUDE_ACE_SIGNAL_H -# include /**/ <signal.h> -# undef ACE_DONT_INCLUDE_ACE_SIGNAL_H -# endif /* ! ACE_PSOS_DIAB_MIPS && ! VXWORKS */ +# if !defined (ACE_PSOS_DIAB_MIPS) +# include /**/ <signal.h> +# endif /* ACE_PSOS_DIAB_MIPS */ # include /**/ <errno.h> @@ -2616,27 +2608,29 @@ typedef unsigned int size_t; # endif /* IOV_MAX */ # if defined (ACE_PSOS_SNARFS_HEADER_INFO) - // Header information snarfed from compiler provided header files + + // header information snarfed from compiler provided header files // that are not included because there is already an identically - // named file provided with pSOS, which does not have this info from - // compiler supplied stdio.h. - extern FILE *fdopen (int, const char *); - extern int getopt (int, char *const *, const char *); - extern char *tempnam (const char *, const char *); - extern "C" int fileno (FILE *); + // named file provided with pSOS, which does not have this info + + // from compiler supplied stdio.h + extern FILE *fdopen(int, const char *); + extern int getopt(int, char *const *, const char *); + extern char *tempnam(const char *, const char *); + extern "C" int fileno(FILE *); -// #define fileno(stream) ((stream)->_file) +// #define fileno(stream) ((stream)->_file) // from compiler supplied string.h - extern char *strdup (const char *); + extern char *strdup(const char *); // from compiler supplied stat.h - extern mode_t umask (mode_t); - extern int mkfifo (const char *, mode_t); - extern int mkdir (const char *, mode_t); + extern mode_t umask(mode_t); + extern int mkfifo(const char *, mode_t); + extern int mkdir(const char *, mode_t); // from compiler supplied stdlib.h - extern int putenv (char *); + extern int putenv(char *); int isatty (ACE_HANDLE h); @@ -2651,6 +2645,7 @@ typedef unsigned int size_t; # define isdigit iswdigit # endif /* ACE_HAS_WINCE */ + // If the user wants minimum IOStream inclusion, we will just include // the forward declarations # if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) @@ -3075,14 +3070,7 @@ PAGE_NOCACHE */ # define _O_CREAT O_CREAT # define _O_EXCL O_EXCL # define _O_TRUNC O_TRUNC - // 0x0800 is used for O_APPEND. 0x08 looks free. -# define _O_TEMPORARY 0x08 // see fcntl.h -# define _O_RDWR O_RDWR -# define _O_WRONLY O_WRONLY -# define _O_RDONLY O_RDONLY -# define _O_APPEND O_APPEND -# define _O_BINARY O_BINARY -# define _O_TEXT O_TEXT +# define _O_TEMPORARY 0x0800 // see fcntl.h # endif /* __BORLANDC__ */ typedef OVERLAPPED ACE_OVERLAPPED; @@ -3151,10 +3139,7 @@ struct iovec size_t iov_len; // byte count to read/write char *iov_base; // data to be read/written - // WSABUF is a Winsock2-only type. -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) operator WSABUF &(void) { return *((WSABUF *) this); } -#endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */ }; struct msghdr @@ -3177,6 +3162,7 @@ struct msghdr int msg_accrightslen; }; + typedef int ACE_idtype_t; typedef DWORD ACE_id_t; # define ACE_SELF (0) @@ -3187,8 +3173,8 @@ typedef int ACE_pri_t; # define RTLD_LAZY 1 # endif /* !RTLD_LAZY */ typedef HINSTANCE ACE_SHLIB_HANDLE; -# define ACE_SHLIB_INVALID_HANDLE 0 -# define ACE_DEFAULT_SHLIB_MODE 0 +const ACE_SHLIB_HANDLE ACE_SHLIB_INVALID_HANDLE = 0; +const int ACE_DEFAULT_SHLIB_MODE = 0; # elif defined (ACE_PSOS) @@ -3666,11 +3652,11 @@ extern "C" { } # endif /* ACE_HAS_DLFCN_H_BROKEN_EXTERN_C */ typedef void *ACE_SHLIB_HANDLE; -# define ACE_SHLIB_INVALID_HANDLE 0 + const ACE_SHLIB_HANDLE ACE_SHLIB_INVALID_HANDLE = 0; # if !defined (RTLD_LAZY) # define RTLD_LAZY 1 # endif /* !RTLD_LAZY */ -# define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY + const int ACE_DEFAULT_SHLIB_MODE = RTLD_LAZY; # elif defined (__hpux) # if defined(__GNUC__) || __cplusplus >= 199707L # include /**/ <dl.h> @@ -3678,15 +3664,15 @@ extern "C" { # include /**/ <cxxdl.h> # endif /* (g++ || HP aC++) vs. HP C++ */ typedef shl_t ACE_SHLIB_HANDLE; -# define ACE_SHLIB_INVALID_HANDLE 0 -# define ACE_DEFAULT_SHLIB_MODE BIND_DEFERRED + const ACE_SHLIB_HANDLE ACE_SHLIB_INVALID_HANDLE = 0; + const int ACE_DEFAULT_SHLIB_MODE = BIND_DEFERRED; # else # if !defined(RTLD_LAZY) # define RTLD_LAZY 1 # endif /* !RTLD_LAZY */ typedef void *ACE_SHLIB_HANDLE; -# define ACE_SHLIB_INVALID_HANDLE 0 -# define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY + const ACE_SHLIB_HANDLE ACE_SHLIB_INVALID_HANDLE = 0; + const int ACE_DEFAULT_SHLIB_MODE = RTLD_LAZY; # endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */ # if defined (ACE_HAS_SOCKIO_H) @@ -4006,18 +3992,6 @@ struct sigaction # define ACE_LACKS_IP_ADD_MEMBERSHIP # endif /* IP_ADD_MEMBERSHIP */ -# if !defined (IP_DEFAULT_MULTICAST_TTL) -# define IP_DEFAULT_MULTICAST_TTL 0 -# endif /* IP_DEFAULT_MULTICAST_TTL */ - -# if !defined (IP_DEFAULT_MULTICAST_LOOP) -# define IP_DEFAULT_MULTICAST_LOOP 0 -# endif /* IP_DEFAULT_MULTICAST_LOOP */ - -# if !defined (IP_MAX_MEMBERSHIPS) -# define IP_MAX_MEMBERSHIPS 0 -# endif /* IP_MAX_MEMBERSHIP */ - # if !defined (SIOCGIFBRDADDR) # define SIOCGIFBRDADDR 0 # endif /* SIOCGIFBRDADDR */ @@ -4243,19 +4217,11 @@ typedef void *(*ACE_THR_C_FUNC)(void *); # define MAP_FAILED ((void *) -1L) # endif /* !MAP_FAILED || ACE_HAS_BROKEN_MAP_FAILED */ -# if defined (ACE_HAS_MOSTLY_UNICODE_APIS) -# if defined (ACE_HAS_CHARPTR_DL) -typedef ASYS_TCHAR * ACE_DL_TYPE; -# else -typedef const ASYS_TCHAR * ACE_DL_TYPE; -# endif /* ACE_HAS_CHARPTR_DL */ -# else -# if defined (ACE_HAS_CHARPTR_DL) +# if defined (ACE_HAS_CHARPTR_DL) typedef char * ACE_DL_TYPE; -# else +# else typedef const char * ACE_DL_TYPE; -# endif /* ACE_HAS_CHARPTR_DL */ -#endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ +# endif /* ACE_HAS_CHARPTR_DL */ # if !defined (ACE_HAS_SIGINFO_T) struct ACE_Export siginfo_t @@ -4802,7 +4768,8 @@ private: int error_; }; -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) + +#if defined (ACE_HAS_WINSOCK2) #if defined (ACE_HAS_WINSOCK2_GQOS) typedef SERVICETYPE ACE_SERVICE_TYPE; #else @@ -4810,38 +4777,21 @@ typedef u_long ACE_SERVICE_TYPE; #endif /* ACE_HAS_WINSOCK2_GQOS */ typedef GROUP ACE_SOCK_GROUP; typedef WSAPROTOCOL_INFO ACE_Protocol_Info; -#define ACE_OVERLAPPED_SOCKET_FLAG WSA_FLAG_OVERLAPPED #else typedef u_long ACE_SERVICE_TYPE; typedef u_long ACE_SOCK_GROUP; typedef u_long ACE_Protocol_Info; -#define ACE_OVERLAPPED_SOCKET_FLAG 0 -#endif /* ACE_HAS_WINSOCK2 && ACE_HAS_WINSOCK2 != 0 */ +#endif /* SERVICETYPE */ class ACE_Export ACE_Flow_Spec -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) : public FLOWSPEC #endif /* ACE_HAS_WINSOCK2 */ { // = TITLE // Wrapper class that defines the flow spec QoS information, which - // is used by IntServ (RSVP) and DiffServ. + // is used by RSVP. public: - // = Initialization methods. - ACE_Flow_Spec (void); - // Default constructor. - - ACE_Flow_Spec (u_long token_rate, - u_long token_bucket_size, - u_long peak_bandwidth, - u_long latency, - u_long delay_variation, - ACE_SERVICE_TYPE service_type, - u_long max_sdu_size, - u_long minimum_policed_size, - int ttl); - // Constructor that initializes all the fields. - // = Get/set the token rate in bytes/sec. u_long token_rate (void); void token_rate (u_long tr); @@ -4873,20 +4823,16 @@ public: // = Get/set the minimum policed size in bytes. u_long minimum_policed_size (void); void minimum_policed_size (u_long mps); - - // = Get/set the time-to-live. - int ttl (void); - void ttl (int t); }; class ACE_Export ACE_QoS -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) : public QOS #endif /* ACE_HAS_WINSOCK2 */ { // = TITLE // Wrapper class that holds the sender and receiver flow spec - // information, which is used by IntServ (RSVP) and DiffServ. + // information, which is used by RSVP. public: // = Get/set the flow spec for data sending. ACE_Flow_Spec sending_flowspec (void); @@ -4901,13 +4847,13 @@ public: void provider_specific (const iovec &ps); }; -class ACE_Export ACE_QoS_Params +class ACE_Export ACE_Connect_QoS_Params { // = TITLE // Wrapper class that simplifies the information passed to the QoS // enabled <ACE_OS::connect> and <ACE_OS::join_leaf> methods. public: - ACE_QoS_Params (iovec *caller_data = 0, + ACE_Connect_QoS_Params (iovec *caller_data = 0, iovec *callee_data = 0, ACE_QoS *socket_qos = 0, ACE_QoS *group_socket_qos = 0, @@ -4976,15 +4922,10 @@ typedef int (*ACE_QOS_CONDITION_FUNC) (iovec *caller_id, // Callback function that's used by the QoS-enabled <ACE_OS::ioctl> // method. -#if defined(ACE_HAS_WINSOCK2) && ACE_HAS_WINSOCK2 != 0 -typedef LPWSAOVERLAPPED_COMPLETION_ROUTINE ACE_OVERLAPPED_COMPLETION_FUNC; -#else typedef void (*ACE_OVERLAPPED_COMPLETION_FUNC) (u_long error, u_long bytes_transferred, ACE_OVERLAPPED *overlapped, u_long flags); -#endif /* ACE_HAS_WINSOCK2 != 0 */ - class ACE_Export ACE_Accept_QoS_Params { // = TITLE @@ -5144,12 +5085,14 @@ public: // = A set of wrappers for explicit dynamic linking. static int dlclose (ACE_SHLIB_HANDLE handle); - - static ASYS_TCHAR *dlerror (void); - static ACE_SHLIB_HANDLE dlopen (const ASYS_TCHAR *filename, + // WinCE only supports UNICODE, so we don't need these functions. +# if !defined (ACE_HAS_WINCE) + static char *dlerror (void); + static ACE_SHLIB_HANDLE dlopen (const char *filename, int mode = ACE_DEFAULT_SHLIB_MODE); static void *dlsym (ACE_SHLIB_HANDLE handle, const char *symbol); +# endif /* ! ACE_HAS_WINCE */ // = A set of wrappers for the directory iterator. static DIR *opendir (const char *filename); @@ -5166,8 +5109,6 @@ public: // = A set of wrappers for stdio file operations. static int last_error (void); static void last_error (int); - static int set_errno_to_last_error (void); - static int set_errno_to_wsa_last_error (void); static int fclose (FILE *fp); static int fcntl (ACE_HANDLE handle, int cmd, @@ -5380,17 +5321,17 @@ public: static char *asctime (const struct tm *tm); static char *asctime_r (const struct tm *tm, char *buf, int buflen); - static ASYS_TCHAR *ctime (const time_t *t); # if !defined (ACE_HAS_WINCE) + static char *ctime (const time_t *t); static char *ctime_r (const time_t *clock, char *buf, int buflen); -# endif /* !ACE_HAS_WINCE */ -# if defined (ACE_HAS_MOSTLY_UNICODE_APIS) +# else + static wchar_t *ctime (const time_t *t); static wchar_t *ctime_r (const time_t *clock, wchar_t *buf, int buflen); -# endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ +# endif /* !ACE_HAS_WINCE */ static size_t strftime (char *s, size_t maxsize, const char *format, @@ -5793,7 +5734,7 @@ public: static int connect (ACE_HANDLE handle, const sockaddr *addr, int addrlen, - const ACE_QoS_Params &qos_params); + const ACE_Connect_QoS_Params &qos_params); // QoS-enabled <connect>, which passes <qos_params> to <connect>. // If the OS platform doesn't support QoS-enabled <connect> then the // <qos_params> are ignored and the BSD-style <connect> is called. @@ -5853,7 +5794,7 @@ public: static ACE_HANDLE join_leaf (ACE_HANDLE socket, const sockaddr *name, int namelen, - const ACE_QoS_Params &qos_params); + const ACE_Connect_QoS_Params &qos_params); // Joins a leaf node into a QoS-enabled multi-point session. static int listen (ACE_HANDLE handle, int backlog); @@ -5867,15 +5808,6 @@ public: int flags, struct sockaddr *addr, int *addrlen); - static int recvfrom (ACE_HANDLE handle, - iovec *buffers, - int buffer_count, - size_t &number_of_bytes_recvd, - int &flags, - struct sockaddr *addr, - int *addrlen, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func); static int send (ACE_HANDLE handle, const char *buf, int len, int @@ -5889,15 +5821,6 @@ public: int flags, const struct sockaddr *addr, int addrlen); - static int sendto (ACE_HANDLE handle, - const iovec *buffers, - int buffer_count, - size_t &number_of_bytes_sent, - int flags, - const struct sockaddr *addr, - int addrlen, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func); static int setsockopt (ACE_HANDLE handle, int level, int optname, @@ -5906,11 +5829,11 @@ public: // QoS-enabled <ioctl> wrapper. static int shutdown (ACE_HANDLE handle, int how); - static ACE_HANDLE socket (int protocol_family, + static ACE_HANDLE socket (int domain, int type, int proto); // Create a BSD-style socket (no QoS). - static ACE_HANDLE socket (int protocol_family, + static ACE_HANDLE socket (int domain, int type, int proto, ACE_Protocol_Info *protocolinfo, @@ -6029,9 +5952,6 @@ public: const wchar_t *t); static int strcmp (const wchar_t *s, const wchar_t *t); - static size_t strspn (const wchar_t *string, - const wchar_t *charset); - static wchar_t *strenvdup (const wchar_t *str); # endif /* ! ACE_HAS_WCHAR_TYPEDEFS_CHAR */ #if !defined (ACE_HAS_WCHAR_TYPEDEFS_USHORT) @@ -6093,11 +6013,6 @@ public: static long strtol (const wchar_t *s, wchar_t **ptr, int base); - static u_long strtoul (const wchar_t *s, - wchar_t **ptr, - int base); - static double strtod (const wchar_t *s, - wchar_t **endptr); static int ace_isspace (wchar_t c); # if defined (ACE_WIN32) @@ -6122,9 +6037,9 @@ public: # endif /* 0 */ // the following three are newly added for CE. // but they can also be use on Win32. - static wchar_t *fgets (wchar_t *buf, - int size, - FILE *fp); + // static char *fgets (wchar_t *buf, + // int size, + // FILE *fp); static int fprintf (FILE *fp, const wchar_t *format, ...); @@ -6144,7 +6059,6 @@ public: struct stat *); static int truncate (const wchar_t *filename, off_t length); - static int putenv (const wchar_t *str); static wchar_t *getenv (const wchar_t *symbol); static int system (const wchar_t *s); static int hostname (wchar_t *name, @@ -6162,8 +6076,6 @@ public: static int chdir (const wchar_t *path); static wchar_t *getcwd (wchar_t *, size_t); - static int mkfifo (const wchar_t *file, - mode_t mode = ACE_DEFAULT_FILE_PERMS); # endif /* ACE_WIN32 */ # endif /* ACE_HAS_UNICODE */ @@ -6472,14 +6384,14 @@ protected: public: virtual int init (void) = 0; - // Explicitly initialize. Returns 0 on success, -1 on failure due - // to dynamic allocation failure (in which case errno is set to - // ENOMEM), or 1 if it had already been called. + // Explicitly initialize. Returns 0 on success, -1 on failure + // due to either already having been initialized, or dynamic + // allocation failure (in which case errno is set to ENOMEM). virtual int fini (void) = 0; - // Explicitly destroy. Returns 0 on success, -1 on failure because - // the number of fini () calls hasn't reached the number of init () - // calls, or 1 if it had already been called. + // Explicitly destroy. Returns 0 on success, -1 on failure due to + // already having been destroyed, or 1 because the number of fini () + // calls hasn't reached the number of init () calls. enum Object_Manager_State { @@ -7080,6 +6992,7 @@ private: } \ } \ while (0) + # define ACE_DES_ARRAY_NOFREE_TEMPLATE (POINTER,SIZE,T_CLASS,T_PARAMETER) \ do { \ if (POINTER) \ @@ -7093,17 +7006,7 @@ private: } \ } \ while (0) -#if defined(__IBMCPP__) && (__IBMCPP__ >= 400) -# define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) \ - do { \ - if (POINTER) \ - { \ - POINTER->~T_CLASS T_PARAMETER (); \ - DEALLOCATOR (POINTER); \ - } \ - } \ - while (0) -#else + # define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) \ do { \ if (POINTER) \ @@ -7113,7 +7016,7 @@ private: } \ } \ while (0) -#endif /* defined(__IBMCPP__) && (__IBMCPP__ >= 400) */ + # define ACE_DES_ARRAY_FREE_TEMPLATE(POINTER,SIZE,DEALLOCATOR,T_CLASS,T_PARAMETER) \ do { \ if (POINTER) \ @@ -7128,17 +7031,7 @@ private: } \ } \ while (0) -#if defined(__IBMCPP__) && (__IBMCPP__ >= 400) -# define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \ - do { \ - if (POINTER) \ - { \ - POINTER->~T_CLASS <T_PARAM1, T_PARAM2> (); \ - DEALLOCATOR (POINTER); \ - } \ - } \ - while (0) -#else + # define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \ do { \ if (POINTER) \ @@ -7148,25 +7041,7 @@ private: } \ } \ while (0) -#endif /* defined(__IBMCPP__) && (__IBMCPP__ >= 400) */ -# define ACE_DES_FREE_TEMPLATE3(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2,T_PARAM3) \ - do { \ - if (POINTER) \ - { \ - POINTER->~T_CLASS (); \ - DEALLOCATOR (POINTER); \ - } \ - } \ - while (0) -# define ACE_DES_FREE_TEMPLATE4(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2,T_PARAM3, T_PARAM4) \ - do { \ - if (POINTER) \ - { \ - POINTER->~T_CLASS (); \ - DEALLOCATOR (POINTER); \ - } \ - } \ - while (0) + # define ACE_DES_ARRAY_FREE_TEMPLATE2(POINTER,SIZE,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \ do { \ if (POINTER) \ @@ -7181,6 +7056,7 @@ private: } \ } \ while (0) + # else /* ! ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR */ # define ACE_DES_NOFREE_TEMPLATE (POINTER,T_CLASS,T_PARAMETER) \ do { \ @@ -7190,6 +7066,7 @@ private: } \ } \ while (0) + # define ACE_DES_ARRAY_NOFREE_TEMPLATE (POINTER,SIZE,T_CLASS,T_PARAMETER) \ do { \ if (POINTER) \ @@ -7203,13 +7080,12 @@ private: } \ } \ while (0) + # if defined (__Lynx__) && __LYNXOS_SDK_VERSION == 199701L // LynxOS 3.0.0's g++ has trouble with the real versions of these. # define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) # define ACE_DES_ARRAY_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) # define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) -# define ACE_DES_FREE_TEMPLATE3(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) -# define ACE_DES_FREE_TEMPLATE4(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) # define ACE_DES_ARRAY_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) # else # define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) \ @@ -7221,6 +7097,7 @@ private: } \ } \ while (0) + # define ACE_DES_ARRAY_FREE_TEMPLATE(POINTER,SIZE,DEALLOCATOR,T_CLASS,T_PARAMETER) \ do { \ if (POINTER) \ @@ -7235,6 +7112,7 @@ private: } \ } \ while (0) + # define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \ do { \ if (POINTER) \ @@ -7244,24 +7122,7 @@ private: } \ } \ while (0) -# define ACE_DES_FREE_TEMPLATE3(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2,T_PARAM3) \ - do { \ - if (POINTER) \ - { \ - POINTER->T_CLASS <T_PARAM1, T_PARAM2, T_PARAM3>::~T_CLASS (); \ - DEALLOCATOR (POINTER); \ - } \ - } \ - while (0) -# define ACE_DES_FREE_TEMPLATE4(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2,T_PARAM3, T_PARAM4) \ - do { \ - if (POINTER) \ - { \ - POINTER->T_CLASS <T_PARAM1, T_PARAM2, T_PARAM3, T_PARAM4>::~T_CLASS (); \ - DEALLOCATOR (POINTER); \ - } \ - } \ - while (0) + # define ACE_DES_ARRAY_FREE_TEMPLATE2(POINTER,SIZE,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \ do { \ if (POINTER) \ @@ -7276,6 +7137,7 @@ private: } \ } \ while (0) + # endif /* defined (__Lynx__) && __LYNXOS_SDK_VERSION == 199701L */ # endif /* defined ! ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR */ @@ -7303,31 +7165,18 @@ private: do \ RESULT = (TYPE) X; \ while (0) -# if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540) # define ACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \ do { \ - TYPE ace_result_; \ - TYPE ace_local_result_ = (TYPE) X; \ - ace_result_ = ace_local_result_; \ + TYPE ace_result_ = (TYPE) X; \ if (ace_result_ == FAILVALUE) \ - ACE_OS::set_errno_to_last_error (); \ + errno = ::GetLastError (); \ return ace_result_; \ } while (0) -# else -# define ACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \ - do { \ - TYPE ace_result_; \ - ace_result_ = (TYPE) X; \ - if (ace_result_ == FAILVALUE) \ - ACE_OS::set_errno_to_last_error (); \ - return ace_result_; \ - } while (0) -# endif /* defined (__BORLANDC__) && (__BORLANDC__ <= 0x540) */ # define ACE_WIN32CALL(X,TYPE,FAILVALUE,RESULT) \ do { \ RESULT = (TYPE) X; \ if (RESULT == FAILVALUE) \ - ACE_OS::set_errno_to_last_error (); \ + errno = ::GetLastError (); \ } while (0) # else # define ACE_OSCALL_RETURN(OP,TYPE,FAILVALUE) do { TYPE ace_result_ = FAILVALUE; ace_result_ = ace_result_; return OP; } while (0) @@ -7651,6 +7500,19 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS; # include "ace/Trace.h" # endif /* ! ACE_HAS_MINIMAL_ACE_OS */ +# if defined (ACE_HAS_INLINED_OSCALLS) +# if defined (ACE_INLINE) +# undef ACE_INLINE +# endif /* ACE_INLINE */ +# define ACE_INLINE inline +# include "ace/OS.i" +# endif /* ACE_HAS_INLINED_OSCALLS */ + +# if !defined (ACE_HAS_MINIMAL_ACE_OS) + // This needs to come here to avoid problems with circular dependencies. +# include "ace/Log_Msg.h" +# endif /* ! ACE_HAS_MINIMAL_ACE_OS */ + // The following are some insane macros that are useful in cases when // one has to have a string in a certain format. Both of these macros // allow the user to create a temporary copy. If the user needs to @@ -7697,19 +7559,6 @@ ACE_OS_CString (ASCII_STRING).wchar_rep () # define ASYS_WIDE_STRING(ASCII_STRING) ASCII_STRING # endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ -# if defined (ACE_HAS_INLINED_OSCALLS) -# if defined (ACE_INLINE) -# undef ACE_INLINE -# endif /* ACE_INLINE */ -# define ACE_INLINE inline -# include "ace/OS.i" -# endif /* ACE_HAS_INLINED_OSCALLS */ - -# if !defined (ACE_HAS_MINIMAL_ACE_OS) - // This needs to come here to avoid problems with circular dependencies. -# include "ace/Log_Msg.h" -# endif /* ! ACE_HAS_MINIMAL_ACE_OS */ - // Byte swapping macros to deal with differences between little endian // and big endian machines. Note that "long" here refers to 32 bit // quantities. @@ -7759,23 +7608,24 @@ ACE_OS_CString (ASCII_STRING).wchar_rep () // lack them. // Evaluates to a non-zero value if status was returned for a child - // process that terminated normally. 0 means status wasn't - // returned. + // process that terminated normally. + // 0 means status wasn't returned. #if !defined (WIFEXITED) # define WIFEXITED(stat) 0 #endif /* WIFEXITED */ - // If the value of WIFEXITED(stat) is non-zero, this macro evaluates - // to the exit code that the child process exit(3C), or the value - // that the child process returned from main. Peaceful exit code is - // 0. + // If the value of WIFEXITED(stat) is non-zero, this macro + // evaluates to the exit code that the child process exit(3C), + // or the value that the child process returned from main. + // Peaceful exit code is 0. #if !defined (WEXITSTATUS) # define WEXITSTATUS(stat) 0 #endif /* WEXITSTATUS */ - // Evaluates to a non-zero value if status was returned for a child - // process that terminated due to the receipt of a signal. 0 means - // status wasnt returned. + // Evaluates to a non-zero value if status was returned for + // a child process that terminated due to the receipt of a + // signal. + // 0 means status wasnt returned. #if !defined (WIFSIGNALED) # define WIFSIGNALED(stat) 0 #endif /* WIFSIGNALED */ @@ -520,10 +520,9 @@ extern "C" char *mktemp (char *); # include /**/ <ctype.h> # endif /* UNIXWARE */ -// Adapt the weird threading and synchronization routines (which -// return errno rather than -1) so that they return -1 and set errno. -// This is more consistent with the rest of ACE_OS and enables use to -// use the ACE_OSCALL* macros. +// Adapt the weird threading and synchronization routines (which don't +// return -1 normally) so that they return -1 and work correctly with +// the ACE_OSCALL macros. # if defined (VXWORKS) # define ACE_ADAPT_RETVAL(OP,RESULT) ((RESULT = (OP)) != OK ? (errno = RESULT, -1) : 0) # else @@ -536,7 +535,8 @@ ACE_OS::chdir (const char *path) { ACE_TRACE ("ACE_OS::chdir"); # if defined (VXWORKS) - ACE_OSCALL_RETURN (::chdir (ACE_const_cast (char *, path)), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::chdir ((char *) path), ace_result_), + int, -1); #elif defined (ACE_PSOS_LACKS_PHILE) ACE_UNUSED_ARG (path); @@ -752,7 +752,7 @@ ACE_OS::umask (mode_t cmask) // Perform a mapping of Win32 error numbers into POSIX errnos. # define ACE_FAIL_RETURN(RESULT) do { \ - switch (ACE_OS::set_errno_to_last_error ()) { \ + switch (errno = ::GetLastError ()) { \ case ERROR_NOT_ENOUGH_MEMORY: errno = ENOMEM; break; \ case ERROR_FILE_EXISTS: errno = EEXIST; break; \ case ERROR_SHARING_VIOLATION: errno = EACCES; break; \ @@ -787,11 +787,7 @@ ACE_INLINE int ACE_OS::chdir (const char *path) { ACE_TRACE ("ACE_OS::chdir"); -#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) ACE_OSCALL_RETURN (::_chdir (path), int, -1); -#else - ACE_OSCALL_RETURN (::_chdir ((char *) path), int, -1); -#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */ } # if !defined (ACE_LACKS_MKTEMP) @@ -847,11 +843,9 @@ ACE_OS::mkfifo (const char *file, mode_t mode) ACE_INLINE int ACE_OS::pipe (ACE_HANDLE fds[]) { -# if !defined (ACE_HAS_WINCE) && !defined (__IBMCPP__) //VisualAge C++ 4.0 does not support this +# if !defined (ACE_HAS_WINCE) ACE_TRACE ("ACE_OS::pipe"); - ACE_OSCALL_RETURN (::_pipe ((int *) fds, PIPE_BUF, 0), - int, - -1); // Use default mode + ACE_OSCALL_RETURN (::_pipe ((int *) fds, PIPE_BUF, 0), int, -1); // Use default mode # else ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_WINCE */ @@ -893,7 +887,7 @@ ACE_OS::fstat (ACE_HANDLE handle, struct stat *stp) if (::GetFileInformationByHandle (handle, &fdata) == FALSE) { - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; } else if (fdata.nFileSizeHigh != 0) @@ -1070,7 +1064,9 @@ ACE_OS::unlink (const char *path) { ACE_TRACE ("ACE_OS::unlink"); # if defined (VXWORKS) - ACE_OSCALL_RETURN (::unlink (ACE_const_cast (char *, path)), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::unlink ((char *) path), + ace_result_), + int, -1); # elif defined (ACE_PSOS) && ! defined (ACE_PSOS_LACKS_PHILE) ACE_OSCALL_RETURN (::remove_f ((char *) path), int , -1); # elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_C_LIBRARY) @@ -1111,11 +1107,11 @@ ACE_OS::tempnam (const char *dir, const char *pfx) ACE_OSCALL_RETURN (::tmpnam ((char *) dir), char *, 0); #else #if defined (ACE_WIN32) -#if defined (__BORLANDC__) || (__IBMCPP__) +#if defined (__BORLANDC__) ACE_OSCALL_RETURN (::_tempnam ((char *) dir, (char *) pfx), char *, 0); # else ACE_OSCALL_RETURN (::_tempnam (dir, pfx), char *, 0); -# endif /* __BORLANDC__ || __IBMCPP__ */ +# endif /* __BORLANDC__ */ # else ACE_OSCALL_RETURN (::tempnam (dir, pfx), char *, 0); # endif /* WIN32 */ @@ -1561,28 +1557,23 @@ ACE_OS::strcasecmp (const char *s, const char *t) #if !defined (ACE_WIN32) || defined (ACE_HAS_WINCE) ACE_TRACE ("ACE_OS::strcasecmp"); # if defined (ACE_LACKS_STRCASECMP) - const char *scan1 = s; - const char *scan2 = t; + // Handles most of what the BSD version does, but does not indicate + // lexicographic ordering if the strings are unequal. Just + // indicates equal (ignoring case) by return value == 0, else not + // equal. + int result = 0; - while (*scan1 != 0 - && ACE_OS::to_lower (*scan1) == ACE_OS::to_lower (*scan2)) + do { - ++scan1; - ++scan2; - } - - // The following case analysis is necessary so that characters which - // look negative collate low against normal characters but high - // against the end-of-string NUL. + int a = ACE_OS::to_lower (*s); + int b = ACE_OS::to_lower (*t); + result = ((a < b) ? -1 : (a > b)); + if (result != 0) + break; + } while (*s++ != '\0' && *t++ != '\0'); + // paranoid termination condition - if (*scan1 == '\0' && *scan2 == '\0') - return 0; - else if (*scan1 == '\0') - return -1; - else if (*scan2 == '\0') - return 1; - else - return ACE_OS::to_lower (*scan1) - ACE_OS::to_lower (*scan2); + return result; // == 0 for match, else 1 # else return ::strcasecmp (s, t); # endif /* ACE_LACKS_STRCASECMP */ @@ -1592,40 +1583,29 @@ ACE_OS::strcasecmp (const char *s, const char *t) } ACE_INLINE int -ACE_OS::strncasecmp (const char *s, - const char *t, - size_t len) +ACE_OS::strncasecmp (const char *s, const char *t, size_t len) { #if !defined (ACE_WIN32) || defined (ACE_HAS_WINCE) - ACE_TRACE ("ACE_OS::strncasecmp"); + ACE_TRACE ("ACE_OS::strcasecmp"); # if defined (ACE_LACKS_STRCASECMP) - const char *scan1 = s; - const char *scan2 = t; - ssize_t count = ssize_t (len); + // Handles most of what the BSD version does, but does not indicate + // lexicographic ordering if the strings are unequal. Just + // indicates equal (ignoring case) by return value == 0, else not + // equal. + int result = 0; - while (--count >= 0 - && *scan1 != 0 - && ACE_OS::to_lower (*scan1) == ACE_OS::to_lower (*scan2)) + while (*s != '\0' && *t != '\0' && len != 0) { - ++scan1; - ++scan2; - } - - if (count < 0) - return 0; + if (ACE_OS::to_lower (*s) != ACE_OS::to_lower (*t)) + { + result = ((ACE_OS::to_lower (*s) < ACE_OS::to_lower (*t)) ? -1 : 1); + break; + } - // The following case analysis is necessary so that characters which - // look negative collate low against normal characters but high - // against the end-of-string NUL. + ++s; ++t; --len; + } - if (*scan1 == '\0' && *scan2 == '\0') - return 0; - else if (*scan1 == '\0') - return -1; - else if (*scan2 == '\0') - return 1; - else - return ACE_OS::to_lower (*scan1) - ACE_OS::to_lower (*scan2); + return result; // == 0 for match, else 1 # else return ::strncasecmp (s, t, len); # endif /* ACE_LACKS_STRCASECMP */ @@ -1931,7 +1911,7 @@ ACE_OS::mutex_lock (ACE_mutex_t *m) return 0; default: // This is a hack, we need to find an appropriate mapping... - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; } case USYNC_THREAD: @@ -1973,7 +1953,7 @@ ACE_OS::mutex_lock (ACE_mutex_t *m, return 0; // something goofed, but we hold the lock ... default: // This is a hack, we need to find an appropriate mapping... - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; } case USYNC_THREAD: @@ -2030,7 +2010,7 @@ ACE_OS::mutex_trylock (ACE_mutex_t *m) errno = EBUSY; return -1; default: - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; } } @@ -2095,7 +2075,7 @@ ACE_OS::mutex_trylock (ACE_mutex_t *m, int &abandoned) errno = EBUSY; return -1; default: - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; } } @@ -2821,7 +2801,7 @@ ACE_OS::sema_destroy (ACE_sema_t *s) return result; # elif defined (VXWORKS) int result; - ACE_OSCALL (::semDelete (s->sema_), int, -1, result); + ACE_OSCALL (ACE_ADAPT_RETVAL (::semDelete (s->sema_), result), int, -1, result); s->sema_ = 0; return result; # endif /* ACE_HAS_STHREADS */ @@ -3077,7 +3057,7 @@ ACE_OS::sema_post (ACE_sema_t *s) ACE_OSCALL (ACE_ADAPT_RETVAL (::sm_v (s->sema_), result), int, -1, result); return result; # elif defined (VXWORKS) - ACE_OSCALL_RETURN (::semGive (s->sema_), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::semGive (s->sema_), ace_result_), int, -1); # endif /* ACE_HAS_STHREADS */ # else ACE_UNUSED_ARG (s); @@ -3146,10 +3126,7 @@ ACE_OS::sema_trywait (ACE_sema_t *s) return 0; else { - if (result == WAIT_TIMEOUT) - errno = EBUSY; - else - ACE_OS::set_errno_to_last_error (); + errno = result == WAIT_TIMEOUT ? EBUSY : ::GetLastError (); // This is a hack, we need to find an appropriate mapping... return -1; } @@ -3181,10 +3158,7 @@ ACE_OS::sema_trywait (ACE_sema_t *s) } // Translate error message to errno used by ACE. - if (result == WAIT_TIMEOUT) - errno = EBUSY; - else - ACE_OS::set_errno_to_last_error (); + errno = result == WAIT_TIMEOUT ? EBUSY : ::GetLastError (); // This is taken from the hack above. ;) return -1; # endif /* ACE_USES_WINCE_SEMA_SIMULATION */ @@ -3270,7 +3244,7 @@ ACE_OS::sema_wait (ACE_sema_t *s) return 0; default: // This is a hack, we need to find an appropriate mapping... - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; } /* NOTREACHED */ @@ -3308,7 +3282,7 @@ ACE_OS::sema_wait (ACE_sema_t *s) default: // Since we wait indefinitely, anything other than // WAIT_OBJECT_O indicates an error. - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); // This is taken from the hack above. ;) return -1; } @@ -3320,7 +3294,7 @@ ACE_OS::sema_wait (ACE_sema_t *s) int, -1, result); return result; # elif defined (VXWORKS) - ACE_OSCALL_RETURN (::semTake (s->sema_, WAIT_FOREVER), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::semTake (s->sema_, WAIT_FOREVER), ace_result_), int, -1); # endif /* ACE_HAS_STHREADS */ # else ACE_UNUSED_ARG (s); @@ -3413,7 +3387,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) return -1; default: // This is a hack, we need to find an appropriate mapping... - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; } /* NOTREACHED */ @@ -3466,7 +3440,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) // What? default: - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); // This is taken from the hack above. ;) return -1; }; @@ -3527,13 +3501,7 @@ ACE_OS::rw_tryrdlock (ACE_rwlock_t *rw) ACE_TRACE ("ACE_OS::rw_tryrdlock"); #if defined (ACE_HAS_THREADS) # if !defined (ACE_LACKS_RWLOCK_T) -# if defined (ACE_HAS_PTHREADS_UNIX98_EXT) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_tryrdlock (rw), - ace_result_), - int, -1); -# else /* Solaris */ ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_tryrdlock (rw), ace_result_), int, -1); -# endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ int result = -1; @@ -3569,13 +3537,7 @@ ACE_OS::rw_trywrlock (ACE_rwlock_t *rw) ACE_TRACE ("ACE_OS::rw_trywrlock"); #if defined (ACE_HAS_THREADS) # if !defined (ACE_LACKS_RWLOCK_T) -# if defined (ACE_HAS_PTHREADS_UNIX98_EXT) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_trywrlock (rw), - ace_result_), - int, -1); -# else /* Solaris */ ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_trywrlock (rw), ace_result_), int, -1); -# endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ int result = -1; @@ -3611,13 +3573,7 @@ ACE_OS::rw_rdlock (ACE_rwlock_t *rw) ACE_TRACE ("ACE_OS::rw_rdlock"); #if defined (ACE_HAS_THREADS) # if !defined (ACE_LACKS_RWLOCK_T) -# if defined (ACE_HAS_PTHREADS_UNIX98_EXT) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_rdlock (rw), - ace_result_), - int, -1); -# else /* Solaris */ ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_rdlock (rw), ace_result_), int, -1); -# endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ # if defined (ACE_HAS_PTHREADS) ACE_PTHREAD_CLEANUP_PUSH (&rw->lock_); @@ -3660,13 +3616,7 @@ ACE_OS::rw_wrlock (ACE_rwlock_t *rw) ACE_TRACE ("ACE_OS::rw_wrlock"); #if defined (ACE_HAS_THREADS) # if !defined (ACE_LACKS_RWLOCK_T) -# if defined (ACE_HAS_PTHREADS_UNIX98_EXT) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_wrlock (rw), - ace_result_), - int, -1); -# else /* Solaris */ ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_wrlock (rw), ace_result_), int, -1); -# endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ # if defined (ACE_HAS_PTHREADS) ACE_PTHREAD_CLEANUP_PUSH (&rw->lock_); @@ -3711,13 +3661,7 @@ ACE_OS::rw_unlock (ACE_rwlock_t *rw) ACE_TRACE ("ACE_OS::rw_unlock"); #if defined (ACE_HAS_THREADS) # if !defined (ACE_LACKS_RWLOCK_T) -# if defined (ACE_HAS_PTHREADS_UNIX98_EXT) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_unlock (rw), - ace_result_), - int, -1); -# else /* Solaris */ ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_unlock (rw), ace_result_), int, -1); -# endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ if (ACE_OS::mutex_lock (&rw->lock_) == -1) return -1; @@ -3773,7 +3717,7 @@ ACE_OS::rw_trywrlock_upgrade (ACE_rwlock_t *rw) ACE_TRACE ("ACE_OS::rw_wrlock"); #if defined (ACE_HAS_THREADS) # if !defined (ACE_LACKS_RWLOCK_T) - // Some native rwlocks, such as those on Solaris and HP-UX 11, don't + // Some native rwlocks, such as those on Solaris, don't // support the upgrade feature . . . ACE_UNUSED_ARG (rw); ACE_NOTSUP_RETURN (-1); @@ -3842,26 +3786,9 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw, void *arg) { // ACE_TRACE ("ACE_OS::rwlock_init"); -# if defined (ACE_HAS_PTHREADS_UNIX98_EXT) - ACE_UNUSED_ARG (name); - ACE_UNUSED_ARG (arg); - - int status; - pthread_rwlockattr_t attr; - pthread_rwlockattr_init (&attr); - pthread_rwlockattr_setpshared (&attr, (type == USYNC_THREAD ? - PTHREAD_PROCESS_PRIVATE : - PTHREAD_PROCESS_SHARED)); - status = ACE_ADAPT_RETVAL (pthread_rwlock_init (rw, &attr), status); - pthread_rwlockattr_destroy (&attr); - - return status; - -# else type = type; name = name; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rwlock_init (rw, type, arg), ace_result_), int, -1); -# endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ } #endif /* ACE_HAS THREADS && !defined (ACE_LACKS_RWLOCK_T) */ @@ -3871,13 +3798,7 @@ ACE_OS::rwlock_destroy (ACE_rwlock_t *rw) ACE_TRACE ("ACE_OS::rwlock_destroy"); #if defined (ACE_HAS_THREADS) # if !defined (ACE_LACKS_RWLOCK_T) -# if defined (ACE_HAS_PTHREADS_UNIX98_EXT) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_destroy (rw), - ace_result_), - int, -1); -# else /* Solaris */ ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rwlock_destroy (rw), ace_result_), int, -1); -# endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ ACE_OS::mutex_destroy (&rw->lock_); ACE_OS::cond_destroy (&rw->waiting_readers_); @@ -3962,7 +3883,7 @@ ACE_OS::event_wait (ACE_event_t *event) case WAIT_OBJECT_0: return 0; default: - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; } #elif defined (ACE_HAS_THREADS) @@ -4050,7 +3971,7 @@ ACE_OS::event_timedwait (ACE_event_t *event, return -1; default: // This is a hack, we need to find an appropriate mapping... - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; } #elif defined (ACE_HAS_THREADS) @@ -4267,68 +4188,10 @@ ACE_OS::event_reset (ACE_event_t *event) # endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ #endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -ACE_INLINE -ACE_Flow_Spec::ACE_Flow_Spec (u_long token_rate, - u_long token_bucket_size, - u_long peak_bandwidth, - u_long latency, - u_long delay_variation, - ACE_SERVICE_TYPE service_type, - u_long max_sdu_size, - u_long minimum_policed_size, - int ttl) -{ -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - this->TokenRate = token_rate; - this->TokenBucketSize = token_bucket_size; - this->PeakBandwidth = peak_bandwidth; - this->Latency = latency; - this->DelayVariation = delay_variation; -#if defined(ACE_HAS_WINSOCK2_GQOS) - this->ServiceType = service_type; - this->MaxSduSize = max_sdu_size; - this->MinimumPolicedSize = minimum_policed_size; -#else - ACE_UNUSED_ARG (service_type); - ACE_UNUSED_ARG (max_sdu_size); - ACE_UNUSED_ARG (minimum_policed_size); -#endif /* ACE_HAS_WINSOCK2_GQOS */ - ACE_UNUSED_ARG (ttl); -#else - ACE_UNUSED_ARG (token_rate); - ACE_UNUSED_ARG (token_bucket_size); - ACE_UNUSED_ARG (peak_bandwidth); - ACE_UNUSED_ARG (latency); - ACE_UNUSED_ARG (delay_variation); - ACE_UNUSED_ARG (service_type); - ACE_UNUSED_ARG (max_sdu_size); - ACE_UNUSED_ARG (minimum_policed_size); - ACE_UNUSED_ARG (ttl); -#endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */ -} - -ACE_INLINE -ACE_Flow_Spec::ACE_Flow_Spec (void) -{ -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - this->TokenRate = 0; - this->TokenBucketSize = 0; - this->PeakBandwidth = 0; - this->Latency = 0; - this->DelayVariation = 0; -#if defined(ACE_HAS_WINSOCK2_GQOS) - this->ServiceType = 0; - this->MaxSduSize = 0; - this->MinimumPolicedSize = 0; -#endif /* ACE_HAS_WINSOCK2_GQOS */ -#else -#endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */ -} - ACE_INLINE u_long ACE_Flow_Spec::token_rate (void) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) return this->TokenRate; #else ACE_NOTSUP_RETURN (0); @@ -4338,7 +4201,7 @@ ACE_Flow_Spec::token_rate (void) ACE_INLINE void ACE_Flow_Spec::token_rate (u_long tr) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) this->TokenRate = tr; #else ACE_UNUSED_ARG (tr); @@ -4348,7 +4211,7 @@ ACE_Flow_Spec::token_rate (u_long tr) ACE_INLINE u_long ACE_Flow_Spec::token_bucket_size (void) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) return this->TokenBucketSize; #else ACE_NOTSUP_RETURN (0); @@ -4358,7 +4221,7 @@ ACE_Flow_Spec::token_bucket_size (void) ACE_INLINE void ACE_Flow_Spec::token_bucket_size (u_long tbs) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) this->TokenBucketSize = tbs; #else ACE_UNUSED_ARG (tbs); @@ -4368,7 +4231,7 @@ ACE_Flow_Spec::token_bucket_size (u_long tbs) ACE_INLINE u_long ACE_Flow_Spec::peak_bandwidth (void) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) return this->PeakBandwidth; #else ACE_NOTSUP_RETURN (0); @@ -4378,7 +4241,7 @@ ACE_Flow_Spec::peak_bandwidth (void) ACE_INLINE void ACE_Flow_Spec::peak_bandwidth (u_long pb) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) this->PeakBandwidth = pb; #else ACE_UNUSED_ARG (pb); @@ -4388,7 +4251,7 @@ ACE_Flow_Spec::peak_bandwidth (u_long pb) ACE_INLINE u_long ACE_Flow_Spec::latency (void) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) return this->Latency; #else ACE_NOTSUP_RETURN (0); @@ -4398,7 +4261,7 @@ ACE_Flow_Spec::latency (void) ACE_INLINE void ACE_Flow_Spec::latency (u_long l) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) this->Latency = l; #else ACE_UNUSED_ARG (l); @@ -4408,7 +4271,7 @@ ACE_Flow_Spec::latency (u_long l) ACE_INLINE u_long ACE_Flow_Spec::delay_variation (void) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) return this->DelayVariation; #else ACE_NOTSUP_RETURN (0); @@ -4417,7 +4280,7 @@ ACE_Flow_Spec::delay_variation (void) ACE_INLINE void ACE_Flow_Spec::delay_variation (u_long dv) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) this->DelayVariation = dv; #else ACE_UNUSED_ARG (dv); @@ -4427,8 +4290,7 @@ ACE_Flow_Spec::delay_variation (u_long dv) ACE_INLINE ACE_SERVICE_TYPE ACE_Flow_Spec::service_type (void) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \ - defined (ACE_HAS_WINSOCK2_GQOS) +#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINSOCK2_GQOS) return this->ServiceType; #else ACE_NOTSUP_RETURN (0); @@ -4438,8 +4300,7 @@ ACE_Flow_Spec::service_type (void) ACE_INLINE void ACE_Flow_Spec::service_type (ACE_SERVICE_TYPE st) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \ - defined (ACE_HAS_WINSOCK2_GQOS) +#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINSOCK2_GQOS) this->ServiceType = st; #else ACE_UNUSED_ARG (st); @@ -4449,8 +4310,7 @@ ACE_Flow_Spec::service_type (ACE_SERVICE_TYPE st) ACE_INLINE u_long ACE_Flow_Spec::max_sdu_size (void) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \ - defined (ACE_HAS_WINSOCK2_GQOS) +#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINSOCK2_GQOS) return this->MaxSduSize; #else ACE_NOTSUP_RETURN (0); @@ -4460,8 +4320,7 @@ ACE_Flow_Spec::max_sdu_size (void) ACE_INLINE void ACE_Flow_Spec::max_sdu_size (u_long mss) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \ - defined (ACE_HAS_WINSOCK2_GQOS) +#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINSOCK2_GQOS) this->MaxSduSize = mss; #else ACE_UNUSED_ARG (mss); @@ -4471,8 +4330,7 @@ ACE_Flow_Spec::max_sdu_size (u_long mss) ACE_INLINE u_long ACE_Flow_Spec::minimum_policed_size (void) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \ - defined (ACE_HAS_WINSOCK2_GQOS) +#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINSOCK2_GQOS) return this->MinimumPolicedSize; #else ACE_NOTSUP_RETURN (0); @@ -4482,41 +4340,17 @@ ACE_Flow_Spec::minimum_policed_size (void) ACE_INLINE void ACE_Flow_Spec::minimum_policed_size (u_long mps) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \ - defined (ACE_HAS_WINSOCK2_GQOS) +#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINSOCK2_GQOS) this->MinimumPolicedSize = mps; #else ACE_UNUSED_ARG (mps); #endif /* ACE_HAS_WINSOCK2 */ } -ACE_INLINE int -ACE_Flow_Spec::ttl (void) -{ -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \ - defined (ACE_HAS_WINSOCK2_GQOS) - ACE_NOTSUP_RETURN (-1); -#else - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_WINSOCK2 */ -} - -ACE_INLINE void -ACE_Flow_Spec::ttl (int t) -{ -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \ - defined (ACE_HAS_WINSOCK2_GQOS) - ACE_UNUSED_ARG (t); - // TBD... -#else - ACE_UNUSED_ARG (t); -#endif /* ACE_HAS_WINSOCK2 */ -} - ACE_INLINE ACE_Flow_Spec ACE_QoS::sending_flowspec (void) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) return (ACE_Flow_Spec &) this->SendingFlowspec; #else ACE_NOTSUP_RETURN (ACE_Flow_Spec ()); @@ -4526,7 +4360,7 @@ ACE_QoS::sending_flowspec (void) ACE_INLINE void ACE_QoS::sending_flowspec (const ACE_Flow_Spec &fs) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) this->SendingFlowspec = (FLOWSPEC) fs; #else ACE_UNUSED_ARG (fs); @@ -4536,7 +4370,7 @@ ACE_QoS::sending_flowspec (const ACE_Flow_Spec &fs) ACE_INLINE ACE_Flow_Spec ACE_QoS::receiving_flowspec (void) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) return (ACE_Flow_Spec &) this->ReceivingFlowspec; #else ACE_NOTSUP_RETURN (ACE_Flow_Spec ()); @@ -4546,7 +4380,7 @@ ACE_QoS::receiving_flowspec (void) ACE_INLINE void ACE_QoS::receiving_flowspec (const ACE_Flow_Spec &fs) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) this->ReceivingFlowspec = (FLOWSPEC) fs; #else ACE_UNUSED_ARG (fs); @@ -4556,7 +4390,7 @@ ACE_QoS::receiving_flowspec (const ACE_Flow_Spec &fs) ACE_INLINE iovec ACE_QoS::provider_specific (void) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) return (iovec &) this->ProviderSpecific; #else ACE_NOTSUP_RETURN (iovec ()); @@ -4566,7 +4400,7 @@ ACE_QoS::provider_specific (void) ACE_INLINE void ACE_QoS::provider_specific (const iovec &ps) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) this->ProviderSpecific = (WSABUF) ((iovec &) ps); #else ACE_UNUSED_ARG (ps); @@ -4574,7 +4408,7 @@ ACE_QoS::provider_specific (const iovec &ps) } ACE_INLINE -ACE_QoS_Params::ACE_QoS_Params (iovec *caller_data, +ACE_Connect_QoS_Params::ACE_Connect_QoS_Params (iovec *caller_data, iovec *callee_data, ACE_QoS *socket_qos, ACE_QoS *group_socket_qos, @@ -4588,61 +4422,61 @@ ACE_QoS_Params::ACE_QoS_Params (iovec *caller_data, } ACE_INLINE iovec * -ACE_QoS_Params::caller_data (void) const +ACE_Connect_QoS_Params::caller_data (void) const { return this->caller_data_; } ACE_INLINE void -ACE_QoS_Params::caller_data (iovec *cd) +ACE_Connect_QoS_Params::caller_data (iovec *cd) { this->caller_data_ = cd; } ACE_INLINE iovec * -ACE_QoS_Params::callee_data (void) const +ACE_Connect_QoS_Params::callee_data (void) const { return this->callee_data_; } ACE_INLINE void -ACE_QoS_Params::callee_data (iovec *cd) +ACE_Connect_QoS_Params::callee_data (iovec *cd) { this->callee_data_ = cd; } ACE_INLINE ACE_QoS * -ACE_QoS_Params::socket_qos (void) const +ACE_Connect_QoS_Params::socket_qos (void) const { return this->socket_qos_; } ACE_INLINE void -ACE_QoS_Params::socket_qos (ACE_QoS *sq) +ACE_Connect_QoS_Params::socket_qos (ACE_QoS *sq) { this->socket_qos_ = sq; } ACE_INLINE ACE_QoS * -ACE_QoS_Params::group_socket_qos (void) const +ACE_Connect_QoS_Params::group_socket_qos (void) const { return this->group_socket_qos_; } ACE_INLINE void -ACE_QoS_Params::group_socket_qos (ACE_QoS *gsq) +ACE_Connect_QoS_Params::group_socket_qos (ACE_QoS *gsq) { this->group_socket_qos_ = gsq; } ACE_INLINE u_long -ACE_QoS_Params::flags (void) const +ACE_Connect_QoS_Params::flags (void) const { return this->flags_; } ACE_INLINE void -ACE_QoS_Params::flags (u_long f) +ACE_Connect_QoS_Params::flags (u_long f) { this->flags_ = f; } @@ -4717,22 +4551,6 @@ ACE_SOCKCALL_RETURN (::accept ((ACE_SOCKET) handle, ACE_HANDLE, ACE_INVALID_HANDLE); # else -# if defined (ACE_HAS_BROKEN_ACCEPT_ADDR) - // Apparently some platforms like VxWorks can't correctly deal with - // a NULL addr. - - sockaddr_in fake_addr; - int fake_addrlen; - - if (addrlen == 0) - addrlen = &fake_addrlen; - - if (addr == 0) - { - addr = (sockaddr *) &fake_addr; - *addrlen = sizeof fake_addr; - } -# endif /* VXWORKS */ ACE_HANDLE ace_result = ::accept ((ACE_SOCKET) handle, addr, (ACE_SOCKET_LEN *) addrlen) ; @@ -4750,7 +4568,7 @@ ACE_OS::accept (ACE_HANDLE handle, int *addrlen, const ACE_Accept_QoS_Params &qos_params) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) ACE_SOCKCALL_RETURN (::WSAAccept ((ACE_SOCKET) handle, addr, (ACE_SOCKET_LEN *) addrlen, @@ -4770,9 +4588,9 @@ ACE_INLINE ACE_HANDLE ACE_OS::join_leaf (ACE_HANDLE socket, const sockaddr *name, int namelen, - const ACE_QoS_Params &qos_params) + const ACE_Connect_QoS_Params &qos_params) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) ACE_SOCKCALL_RETURN (::WSAJoinLeaf ((ACE_SOCKET) socket, name, namelen, @@ -4803,7 +4621,7 @@ ACE_OS::ioctl (ACE_HANDLE socket, ACE_OVERLAPPED *overlapped, ACE_OVERLAPPED_COMPLETION_FUNC func) { -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) ACE_SOCKCALL_RETURN (::WSAIoctl ((ACE_SOCKET) socket, io_control_code, in_buffer_p, @@ -4812,7 +4630,7 @@ ACE_OS::ioctl (ACE_HANDLE socket, out_buffer, bytes_returned, (WSAOVERLAPPED *) overlapped, - func), + (LPWSAOVERLAPPED_COMPLETION_ROUTINE) func), int, SOCKET_ERROR); #else @@ -4825,7 +4643,7 @@ ACE_OS::ioctl (ACE_HANDLE socket, ACE_UNUSED_ARG (bytes_returned); ACE_UNUSED_ARG (overlapped); ACE_UNUSED_ARG (func); - ACE_NOTSUP_RETURN (-1); + ACE_NOTSUP_RETURN (ACE_INVALID_HANDLE); #endif /* ACE_HAS_WINSOCK2 */ } @@ -4861,10 +4679,10 @@ ACE_INLINE int ACE_OS::connect (ACE_HANDLE handle, const sockaddr *addr, int addrlen, - const ACE_QoS_Params &qos_params) + const ACE_Connect_QoS_Params &qos_params) { ACE_TRACE ("ACE_OS::connect"); -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) ACE_SOCKCALL_RETURN (::WSAConnect ((ACE_SOCKET) handle, (const sockaddr *) addr, (ACE_SOCKET_LEN) addrlen, @@ -5022,12 +4840,8 @@ ACE_OS::recv (ACE_HANDLE handle, char *buf, int len, int flags) } ACE_INLINE int -ACE_OS::recvfrom (ACE_HANDLE handle, - char *buf, - int len, - int flags, - struct sockaddr *addr, - int *addrlen) +ACE_OS::recvfrom (ACE_HANDLE handle, char *buf, int len, + int flags, struct sockaddr *addr, int *addrlen) { ACE_TRACE ("ACE_OS::recvfrom"); #if defined (ACE_PSOS) @@ -5049,7 +4863,7 @@ ACE_OS::recvfrom (ACE_HANDLE handle, (ACE_SOCKET_LEN *) addrlen); if (result == SOCKET_ERROR) { - ACE_OS::set_errno_to_wsa_last_error (); + errno = ::WSAGetLastError (); if (errno == WSAEMSGSIZE && ACE_BIT_ENABLED (flags, MSG_PEEK)) return len; @@ -5077,48 +4891,6 @@ ACE_OS::send (ACE_HANDLE handle, const char *buf, int len, int flags) } ACE_INLINE int -ACE_OS::recvfrom (ACE_HANDLE handle, - iovec *buffers, - int buffer_count, - size_t &number_of_bytes_recvd, - int &flags, - struct sockaddr *addr, - int *addrlen, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) -{ - ACE_TRACE ("ACE_OS::recvfrom"); - -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - DWORD bytes_recvd; - DWORD the_flags = flags; - int result = ::WSARecvFrom ((SOCKET) handle, - (WSABUF*)buffers, - buffer_count, - &bytes_recvd, - &the_flags, - addr, - addrlen, - overlapped, - func); - flags = the_flags; - number_of_bytes_recvd = ACE_static_cast(size_t,bytes_recvd); - return result; -#else - ACE_UNUSED_ARG (handle); - ACE_UNUSED_ARG (buffers); - ACE_UNUSED_ARG (buffer_count); - ACE_UNUSED_ARG (number_of_bytes_recvd); - ACE_UNUSED_ARG (flags); - ACE_UNUSED_ARG (addr); - ACE_UNUSED_ARG (addrlen); - ACE_UNUSED_ARG (overlapped); - ACE_UNUSED_ARG (func); - ACE_NOTSUP_RETURN (-1); -#endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */ -} - -ACE_INLINE int ACE_OS::sendto (ACE_HANDLE handle, const char *buf, int len, @@ -5149,57 +4921,6 @@ ACE_OS::sendto (ACE_HANDLE handle, } ACE_INLINE int -ACE_OS::sendto (ACE_HANDLE handle, - const iovec *buffers, - int buffer_count, - size_t &number_of_bytes_sent, - int flags, - const struct sockaddr *addr, - int addrlen, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) -{ - ACE_TRACE ("ACE_OS::sendto"); -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - DWORD bytes_sent; - int result = ::WSASendTo ((SOCKET) handle, - (WSABUF*)buffers, - buffer_count, - &bytes_sent, - flags, - addr, - addrlen, - overlapped, - func); - number_of_bytes_sent = ACE_static_cast(size_t, bytes_sent); - return result; -#else - ACE_UNUSED_ARG (overlapped); - ACE_UNUSED_ARG (func); - - number_of_bytes_sent = 0; - - int result = 0; - - for (int i = 0; i < buffer_count; i++) - { - result = ACE_OS::sendto (handle, - ACE_reinterpret_cast(char* ACE_CAST_CONST, - buffers[i].iov_base), - buffers[i].iov_len, - flags, - addr, - addrlen); - if (result == -1) - break; - number_of_bytes_sent += result; - } - - return result; -#endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */ -} - -ACE_INLINE int ACE_OS::getpeername (ACE_HANDLE handle, struct sockaddr *addr, int *addrlen) { @@ -5410,7 +5131,7 @@ ACE_OS::socket (int domain, { ACE_TRACE ("ACE_OS::socket"); -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#if defined (ACE_HAS_WINSOCK2) ACE_SOCKCALL_RETURN (::WSASocket (domain, type, proto, @@ -5457,7 +5178,7 @@ ACE_OS::recvmsg (ACE_HANDLE handle, struct msghdr *msg, int flags) if (result != 0) { - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; } else @@ -5495,7 +5216,7 @@ ACE_OS::sendmsg (ACE_HANDLE handle, if (result != 0) { - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; } else @@ -5572,7 +5293,7 @@ ACE_OS::fread (void *ptr, size_t size, size_t nelems, FILE *fp) if (::ReadFile (fp, ptr, tlen, &len, NULL) == FALSE) { - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; } else if (tlen != len) @@ -5600,7 +5321,7 @@ ACE_OS::fwrite (const void *ptr, size_t size, size_t nitems, FILE *fp) if (::WriteFile (fp, ptr, tlen, &len, NULL) == FALSE) { - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; } else if (tlen != len) @@ -6028,13 +5749,13 @@ ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len) if (family == AF_INET) { - ASYS_TCHAR temp[INET_ADDRSTRLEN]; + char temp[INET_ADDRSTRLEN]; // Stevens uses snprintf() in his implementation but snprintf() // doesn't appear to be very portable. For now, hope that using // sprintf() will not cause any string/memory overrun problems. ACE_OS::sprintf (temp, - ASYS_TEXT ("%d.%d.%d.%d"), + "%d.%d.%d.%d", p[0], p[1], p[2], p[3]); if (ACE_OS::strlen (temp) >= len) @@ -6043,7 +5764,7 @@ ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len) return 0; // Failure } - ACE_OS::strcpy (strptr, ASYS_ONLY_MULTIBYTE_STRING (temp)); + ACE_OS::strcpy (strptr, temp); return strptr; } @@ -6052,52 +5773,12 @@ ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len) } ACE_INLINE int -ACE_OS::set_errno_to_last_error (void) -{ -# if defined (ACE_WIN32) -// Borland C++ Builder 4 has a bug in the RTL that resets the -// <GetLastError> value to zero when errno is accessed. Thus, we have -// to use this to set errno to GetLastError. It's bad, but only for -// WIN32 -# if defined(__BORLANDC__) && (__BORLANDC__ == 0x540) - int last_error = ::GetLastError (); - return errno = last_error; -# else /* defined(__BORLANDC__) && (__BORLANDC__ == 0x540) */ - return errno = ::GetLastError (); -# endif /* defined(__BORLANDC__) && (__BORLANDC__ == 0x540) */ -#else - return errno; -# endif /* defined(ACE_WIN32) */ -} - -ACE_INLINE int -ACE_OS::set_errno_to_wsa_last_error (void) -{ -# if defined (ACE_WIN32) -// Borland C++ Builder 4 has a bug in the RTL that resets the -// <GetLastError> value to zero when errno is accessed. Thus, we have -// to use this to set errno to GetLastError. It's bad, but only for -// WIN32 -# if defined(__BORLANDC__) && (__BORLANDC__ == 0x540) - int last_error = ::WSAGetLastError (); - return errno = last_error; -# else /* defined(__BORLANDC__) && (__BORLANDC__ == 0x540) */ - return errno = ::WSAGetLastError (); -# endif /* defined(__BORLANDC__) && (__BORLANDC__ == 0x540) */ -#else - return errno; -# endif /* defined(ACE_WIN32) */ -} - -ACE_INLINE int ACE_OS::last_error (void) { // ACE_TRACE ("ACE_OS::last_error"); #if defined (ACE_WIN32) - int lerror = ::GetLastError (); - int lerrno = errno; - return lerrno == 0 ? lerror : lerrno; + return errno == 0 ? ::GetLastError () : errno; #else return errno; #endif /* ACE_HAS_WIN32 */ @@ -6190,14 +5871,8 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread) # if defined (ACE_HAS_STHREADS) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_continue (target_thread), ace_result_), int, -1); # elif defined (ACE_HAS_PTHREADS) -# if defined (ACE_HAS_PTHREADS_UNIX98_EXT) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_continue (target_thread), - ace_result_), - int, -1); -# else ACE_UNUSED_ARG (target_thread); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # elif defined (ACE_HAS_WTHREADS) DWORD result = ::ResumeThread (target_thread); if (result == ACE_SYSCALL_FAILED) @@ -6207,7 +5882,7 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread) # elif defined (ACE_PSOS) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::t_resume (target_thread), ace_result_), int, -1); # elif defined (VXWORKS) - ACE_OSCALL_RETURN (::taskResume (target_thread), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::taskResume (target_thread), ace_result_), int, -1); # endif /* ACE_HAS_STHREADS */ #else ACE_UNUSED_ARG (target_thread); @@ -6299,7 +5974,7 @@ ACE_OS::thr_getprio (ACE_hthread_t thr_id, int &prio) // passing a 0 in the second argument does not alter task priority, third arg gets existing one ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::t_setpri (thr_id, 0, (u_long *) &prio), ace_result_), int, -1); # elif defined (VXWORKS) - ACE_OSCALL_RETURN (::taskPriorityGet (thr_id, &prio), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::taskPriorityGet (thr_id, &prio), ace_result_), int, -1); # else ACE_UNUSED_ARG (thr_id); ACE_UNUSED_ARG (prio); @@ -6727,7 +6402,7 @@ ACE_OS::sigwait (sigset_t *set, int *sig) if (sig == 0) sig = &local_sig; #if defined (ACE_HAS_THREADS) -# if (defined (__FreeBSD__) && (__FreeBSD__ < 3)) || defined (CHORUS) || defined (ACE_PSOS) +# if (__FreeBSD__ < 3) || defined (CHORUS) || defined (ACE_PSOS) ACE_UNUSED_ARG (set); ACE_NOTSUP_RETURN (-1); # elif (defined (ACE_HAS_STHREADS) && !defined (_POSIX_PTHREAD_SEMANTICS)) @@ -6914,7 +6589,8 @@ ACE_OS::thr_kill (ACE_thread_t thr_id, int signum) if (tid == ERROR) return -1; else - ACE_OSCALL_RETURN (::kill (tid, signum), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::kill (tid, signum), ace_result_), + int, -1); # else /* This should not happen! */ ACE_UNUSED_ARG (thr_id); @@ -7050,7 +6726,9 @@ ACE_OS::thr_setprio (ACE_hthread_t thr_id, int prio) ace_result_), int, -1); # elif defined (VXWORKS) - ACE_OSCALL_RETURN (::taskPrioritySet (thr_id, prio), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::taskPrioritySet (thr_id, prio), + ace_result_), + int, -1); # else // For example, platforms that support Pthreads but LACK_SETSCHED. ACE_UNUSED_ARG (thr_id); @@ -7072,14 +6750,8 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread) # if defined (ACE_HAS_STHREADS) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_suspend (target_thread), ace_result_), int, -1); # elif defined (ACE_HAS_PTHREADS) -# if defined (ACE_HAS_PTHREADS_UNIX98_EXT) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_suspend (target_thread), - ace_result_), - int, -1); -# else ACE_UNUSED_ARG (target_thread); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # elif defined (ACE_HAS_WTHREADS) if (::SuspendThread (target_thread) != ACE_SYSCALL_FAILED) return 0; @@ -7089,7 +6761,7 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread) # elif defined (ACE_PSOS) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::t_suspend (target_thread), ace_result_), int, -1); # elif defined (VXWORKS) - ACE_OSCALL_RETURN (::taskSuspend (target_thread), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::taskSuspend (target_thread), ace_result_), int, -1); # endif /* ACE_HAS_STHREADS */ #else ACE_UNUSED_ARG (target_thread); @@ -7197,16 +6869,15 @@ ACE_OS::recvv (ACE_HANDLE handle, DWORD bytes_received = 0; int result = 1; - // Winsock 2 has WSARecv and can do this directly, but Winsock 1 needs + // Winsock 2 has WSASend and can do this directly, but Winsock 1 needs // to do the recvs piece-by-piece. # if (ACE_HAS_WINSOCK2 != 0) - DWORD flags = 0; result = ::WSARecv ((SOCKET) handle, (WSABUF *) buffers, n, &bytes_received, - &flags, + 0, 0, 0); # else @@ -7234,7 +6905,7 @@ ACE_OS::recvv (ACE_HANDLE handle, if (result == SOCKET_ERROR) { - ACE_OS::set_errno_to_wsa_last_error (); + errno = ::WSAGetLastError (); return -1; } else @@ -7277,7 +6948,7 @@ ACE_OS::sendv (ACE_HANDLE handle, if (result == SOCKET_ERROR) { - ACE_OS::set_errno_to_wsa_last_error (); + errno = ::WSAGetLastError (); return -1; } else @@ -7783,19 +7454,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen) { ACE_TRACE ("ACE_OS::hostname"); #if !defined (ACE_HAS_WINCE) -# if defined (ACE_HAS_PHARLAP) - // PharLap only can do net stuff with the RT version. -# if defined (ACE_HAS_PHARLAP_RT) - // @@This is not at all reliable... requires ethernet and BOOTP to be used. - // A more reliable way is to go thru the devices w/ EtsTCPGetDeviceCfg until - // a legit IP address is found, then get its name w/ gethostbyaddr. - ACE_SOCKCALL_RETURN (gethostname (name, maxnamelen), int, SOCKET_ERROR); -# else - ACE_UNUSED_ARG (name); - ACE_UNUSED_ARG (maxnamelen); - ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PHARLAP_RT */ -# elif defined (ACE_WIN32) +# if defined (ACE_WIN32) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::GetComputerNameA (name, LPDWORD (&maxnamelen)), ace_result_), int, -1); # elif defined (VXWORKS) @@ -8004,7 +7663,8 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle) #endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */ } -ACE_INLINE ASYS_TCHAR * +#if !defined (ACE_HAS_WINCE) +ACE_INLINE char * ACE_OS::dlerror (void) { ACE_TRACE ("ACE_OS::dlerror"); @@ -8013,28 +7673,14 @@ ACE_OS::dlerror (void) # elif defined (__hpux) ACE_OSCALL_RETURN (::strerror(errno), char *, 0); # elif defined (ACE_WIN32) - static ASYS_TCHAR buf[128]; -# if defined (ACE_HAS_PHARLAP) - ACE_OS::sprintf (buf, "error code %d", GetLastError()); -# else -#if !defined (ACE_HAS_MOSTLY_UNICODE_APIS) + static char buf[128]; FormatMessageA (FORMAT_MESSAGE_FROM_SYSTEM, NULL, - ::GetLastError (), + GetLastError (), 0, buf, sizeof buf, NULL); -#else - FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - ::GetLastError (), - 0, - buf, - sizeof buf / sizeof ASYS_TCHAR, - NULL); -#endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ -# endif /* ACE_HAS_PHARLAP */ return buf; # else ACE_NOTSUP_RETURN (0); @@ -8042,7 +7688,7 @@ ACE_OS::dlerror (void) } ACE_INLINE ACE_SHLIB_HANDLE -ACE_OS::dlopen (const ASYS_TCHAR *fname, +ACE_OS::dlopen (const char *fname, int mode) { ACE_TRACE ("ACE_OS::dlopen"); @@ -8078,11 +7724,7 @@ ACE_OS::dlopen (const ASYS_TCHAR *fname, # elif defined (ACE_WIN32) ACE_UNUSED_ARG (mode); -# if defined (ACE_HAS_MOSTLY_UNICODE_APIS) - ACE_WIN32CALL_RETURN (::LoadLibrary (filename), ACE_SHLIB_HANDLE, 0); -# else ACE_WIN32CALL_RETURN (::LoadLibraryA (filename), ACE_SHLIB_HANDLE, 0); -# endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ # elif defined (__hpux) # if defined(__GNUC__) || __cplusplus >= 199707L @@ -8140,6 +7782,8 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, ACE_NOTSUP_RETURN (0); # endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */ } +#endif /* ACE_HAS_WINCE */ + ACE_INLINE int ACE_OS::step (const char *str, char *expbuf) @@ -8346,8 +7990,7 @@ ACE_OS::getrusage (int who, struct rusage *ru) # if defined (ACE_WIN32) ACE_UNUSED_ARG (who); - FILETIME dummy_1; - FILETIME dummy_2; + FILETIME dummy_1, dummy_2; ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::GetProcessTimes (::GetCurrentProcess(), &dummy_1, // start &dummy_2, // exited @@ -8393,7 +8036,7 @@ ACE_OS::mmap (void *addr, LPSECURITY_ATTRIBUTES sa) { ACE_TRACE ("ACE_OS::mmap"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) int nt_flags = 0; ACE_HANDLE local_handle = ACE_INVALID_HANDLE; @@ -8539,7 +8182,7 @@ ACE_INLINE int ACE_OS::mprotect (void *addr, size_t len, int prot) { ACE_TRACE ("ACE_OS::mprotect"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) DWORD dummy; // Sigh! return ::VirtualProtect(addr, len, prot, &dummy) ? 0 : -1; #elif !defined (ACE_LACKS_MPROTECT) @@ -8556,7 +8199,7 @@ ACE_INLINE int ACE_OS::msync (void *addr, size_t len, int sync) { ACE_TRACE ("ACE_OS::msync"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) ACE_UNUSED_ARG (sync); ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FlushViewOfFile (addr, len), ace_result_), int, -1); @@ -9873,7 +9516,7 @@ ACE_INLINE int ACE_OS::getpagesize (void) { ACE_TRACE ("ACE_OS::getpagesize"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); return (int) sys_info.dwPageSize; @@ -10063,7 +9706,8 @@ ACE_OS::ioctl (ACE_HANDLE handle, int cmd, void *val) ACE_SOCKET sock = (ACE_SOCKET) handle; ACE_SOCKCALL_RETURN (::ioctlsocket (sock, cmd, (u_long *) val), int, -1); #elif defined (VXWORKS) - ACE_OSCALL_RETURN (::ioctl (handle, cmd, ACE_reinterpret_cast (int, val)), + // This may not work very well... + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::ioctl (handle, cmd, (int) val), ace_result_), int, -1); #elif defined (ACE_PSOS) ACE_OSCALL_RETURN (::ioctl (handle, cmd, (char *) val), int, -1); @@ -10343,11 +9987,7 @@ ACE_OS::mkdir (const char *path, mode_t mode) # if defined (ACE_WIN32) ACE_UNUSED_ARG (mode); -#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) - ACE_OSCALL_RETURN (::_mkdir ((char *) path), int, -1); -#else ACE_OSCALL_RETURN (::_mkdir (path), int, -1); - #endif /* __IBMCPP__ */ # elif defined (ACE_PSOS_LACKS_PHILE) ACE_UNUSED_ARG (path); ACE_UNUSED_ARG (mode); @@ -10448,19 +10088,6 @@ ACE_OS::strcpy (wchar_t *s, const wchar_t *t) # endif /* ACE_HAS_UNICODE */ } -ACE_INLINE size_t -ACE_OS::strspn (const wchar_t *s, const wchar_t *t) -{ -#if !defined (ACE_HAS_WINCE) && defined (ACE_HAS_UNICODE) - ACE_TRACE ("ACE_OS::strspn"); - return ::wcsspn (s, t); -#else - ACE_UNUSED_ARG (s); - ACE_UNUSED_ARG (t); - ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_WINCE */ -} - ACE_INLINE int ACE_OS::strcmp (const wchar_t *s, const wchar_t *t) { @@ -10471,27 +10098,15 @@ ACE_OS::strcmp (const wchar_t *s, const wchar_t *t) # if defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) return wcscmp (s, t); # else - const wchar_t *scan1 = s; - const wchar_t *scan2 = t; - - while (*scan1 != 0 && *scan1 == *scan2) + while (*s != 0 && + *t != 0 && + *s == *t) { - ++scan1; - ++scan2; + s++; + t++; } - // The following case analysis is necessary so that characters which - // look negative collate low against normal characters but high - // against the end-of-string NUL. - - if (*scan1 == '\0' && *scan2 == '\0') - return 0; - else if (*scan1 == '\0') - return -1; - else if (*scan2 == '\0') - return 1; - else - return *scan1 - *scan2; + return *s - *t; # endif /* ACE_HAS_XPG4_MULTIBYTE_CHAR */ # endif /* ACE_HAS_UNICODE */ } @@ -10528,12 +10143,12 @@ ACE_OS::strcmp (const ACE_USHORT16 *s, const ACE_USHORT16 *t) { ACE_TRACE ("ACE_OS::strcmp"); - while (*s != 0 - && *t != 0 - && *s == *t) + while (*s != 0 && + *t != 0 && + *s == *t) { - ++s; - ++t; + s++; + t++; } return *s - *t; @@ -10545,7 +10160,7 @@ ACE_OS::wslen (const WChar *s) { u_int len = 0; - while (*s++ != 0) + while (*s++) len++; return len; @@ -10685,68 +10300,54 @@ ACE_OS::strcasecmp (const wchar_t *s, const wchar_t *t) ACE_TRACE ("ACE_OS::strcasecmp"); # if !defined (ACE_WIN32) - const wchar_t *scan1 = s; - const wchar_t *scan2 = t; + // Handles most of what the BSD version does, but does not indicate + // lexicographic ordering if the strings are unequal. Just + // indicates equal (ignoring case) by return value == 0, else not + // equal. + int result = 0; - while (*scan1 != 0 - && ACE_OS::to_lower (*scan1) == ACE_OS::to_lower (*scan2)) + do { - ++scan1; - ++scan2; - } + int a = ACE_OS::to_lower (*s); + int b = ACE_OS::to_lower (*t); + result = ((a < b) ? -1 : (a > b)); + if (result != 0) + break; + } while (*s++ != '\0' && *t++ != '\0'); + // paranoid termination condition - // The following case analysis is necessary so that characters which - // look negative collate low against normal characters but high - // against the end-of-string NUL. + return result; // == 0 for match, else 1 - if (*scan1 == '\0' && *scan2 == '\0') - return 0; - else if (*scan1 == '\0') - return -1; - else if (*scan2 == '\0') - return 1; - else - return ACE_OS::to_lower (*scan1) - ACE_OS::to_lower (*scan2); # else /* ACE_WIN32 */ return ::_wcsicmp (s, t); # endif /* ACE_WIN32 */ } ACE_INLINE int -ACE_OS::strncasecmp (const wchar_t *s, - const wchar_t *t, - size_t len) +ACE_OS::strncasecmp (const wchar_t *s, const wchar_t *t, size_t len) { ACE_TRACE ("ACE_OS::strcasecmp"); # if !defined (ACE_WIN32) - const wchar_t *scan1 = s; - const wchar_t *scan2 = t; - ssize_t count = ssize_t (n); + // Handles most of what the BSD version does, but does not indicate + // lexicographic ordering if the strings are unequal. Just + // indicates equal (ignoring case) by return value == 0, else not + // equal. + int result = 0; - while (--count >= 0 - && *scan1 != 0 - && ACE_OS::to_lower (*scan1) == ACE_OS::to_lower (*scan2)) + while (*s != '\0' && *t != '\0' && len != 0) { - ++scan1; - ++scan2; - } + if (ACE_OS::to_lower (*s) != ACE_OS::to_lower (*t)) + { + result = ((ACE_OS::to_lower (*s) < ACE_OS::to_lower (*t)) ? -1 : 1); + break; + } - if (count < 0) - return 0; + ++s; ++t; --len; + } - // The following case analysis is necessary so that characters which - // look negative collate low against normal characters but high - // against the end-of-string NUL. + return result; // == 0 for match, else 1 - if (*scan1 == '\0' && *scan2 == '\0') - return 0; - else if (*scan1 == '\0') - return -1; - else if (*scan2 == '\0') - return 1; - else - return ACE_OS::to_lower (*scan1) - ACE_OS::to_lower (*scan2); # else /* ACE_WIN32 */ return ::_wcsnicmp (s, t, len); # endif /* ACE_WIN32 */ @@ -10787,20 +10388,6 @@ ACE_OS::strtol (const wchar_t *s, wchar_t **ptr, int base) return ::wcstol (s, ptr, base); } -ACE_INLINE unsigned long -ACE_OS::strtoul (const wchar_t *s, wchar_t **ptr, int base) -{ - ACE_TRACE ("ACE_OS::strtoul"); - return ::wcstoul (s, ptr, base); -} - -ACE_INLINE double -ACE_OS::strtod (const wchar_t *s, wchar_t **endptr) -{ - ACE_TRACE ("ACE_OS::strtod"); - return ::wcstod (s, endptr); -} - ACE_INLINE int ACE_OS::ace_isspace (wchar_t c) { @@ -10874,7 +10461,7 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr) ACE_INLINE int ACE_OS::hostname (wchar_t *name, size_t maxnamelen) { -# if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) +# if !defined (ACE_HAS_WINCE) ACE_TRACE ("ACE_OS::hostname"); ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::GetComputerNameW (name, LPDWORD (&maxnamelen)), ace_result_), int, -1); @@ -10911,20 +10498,6 @@ ACE_OS::getenv (const wchar_t *symbol) } ACE_INLINE int -ACE_OS::putenv (const wchar_t *string) -{ - ACE_TRACE ("ACE_OS::putenv"); - // VxWorks declares ::putenv with a non-const arg. -#if !defined (ACE_HAS_WINCE) && !defined (ACE_PSOS) - ACE_OSCALL_RETURN (::_wputenv ((wchar_t *) string), int, -1); -#else - // @@ WinCE and pSOS don't have the concept of environment variables. - ACE_UNUSED_ARG (string); - ACE_NOTSUP_RETURN (-1); -#endif /* ! ACE_HAS_WINCE && ! ACE_PSOS */ -} - -ACE_INLINE int ACE_OS::rename (const wchar_t *old_name, const wchar_t *new_name) { # if !defined (ACE_HAS_WINCE) @@ -10977,7 +10550,7 @@ ACE_OS::fdopen (ACE_HANDLE handle, const wchar_t *mode) if (crt_handle != -1) { # if defined(__BORLANDC__) - file = ::_wfdopen (crt_handle, ACE_const_cast (wchar_t *, mode)); + file = ::_wfdopen (crt_handle, (wchar_t*) mode); # else file = ::_wfdopen (crt_handle, mode); # endif /* defined(__BORLANDC__) */ @@ -11013,7 +10586,7 @@ ACE_OS::stat (const wchar_t *file, struct stat *stp) fhandle = ::FindFirstFile (file, &fdata); if (fhandle == INVALID_HANDLE_VALUE) { - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; } else if (fdata.nFileSizeHigh != 0) @@ -11049,22 +10622,6 @@ ACE_OS::perror (const wchar_t *s) } -// Here are functions that CE doesn't support at all. -// Notice that some of them might have UNICODE version. -ACE_INLINE wchar_t * -ACE_OS::fgets (wchar_t *buf, int size, FILE *fp) -{ -#if !defined (ACE_HAS_WINCE) - ACE_TRACE ("ACE_OS::fgets"); - ACE_OSCALL_RETURN (::fgetws (buf, size, fp), wchar_t *, 0); -#else - ACE_UNUSED_ARG (buf); - ACE_UNUSED_ARG (size); - ACE_UNUSED_ARG (fp); - ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_WINCE */ -} - ACE_INLINE int ACE_OS::system (const wchar_t *command) { @@ -11125,15 +10682,6 @@ ACE_OS::getcwd (wchar_t *buf, size_t size) return ::_wgetcwd (buf, size); # endif /* ACE_HAS_WINCE */ } - -ACE_INLINE int -ACE_OS::mkfifo (const wchar_t *file, mode_t mode) -{ - // ACE_TRACE ("ACE_OS::mkfifo"); - ACE_UNUSED_ARG (file); - ACE_UNUSED_ARG (mode); - ACE_NOTSUP_RETURN (-1); -} # endif /* ACE_WIN32 */ #endif /* ACE_HAS_UNICODE */ @@ -11893,25 +11441,6 @@ ACE_OS::strenvdup (const char *str) #endif /* ACE_HAS_WINCE */ } -#if !defined (ACE_HAS_WCHAR_TYPEDEFS_CHAR) && defined (ACE_WIN32) -ACE_INLINE wchar_t * -ACE_OS::strenvdup (const wchar_t *str) -{ -#if defined (ACE_HAS_WINCE) - // WinCE doesn't have environment variables so we just skip it. - return ACE_OS::strdup (str); -#else - wchar_t *temp = 0; - - if (str[0] == '$' - && (temp = ACE_OS::getenv (&str[1])) != 0) - return ACE_OS::strdup (temp); - else - return ACE_OS::strdup (str); -#endif /* ACE_HAS_WINCE */ -} -#endif /* ACE_HAS_WCHAR_TYPEDEFS_CHAR */ - ACE_INLINE ACE_OS_WString::~ACE_OS_WString (void) { diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index 70c0d7fee03..c6f5e15b430 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -235,16 +235,15 @@ ACE_Object_Manager::init (void) ACE_TSS_Emulation::tss_open (ts_storage_); # endif /* ACE_HAS_TSS_EMULATION */ - ACE_NEW_RETURN (preallocations_, - ACE_Object_Manager_Preallocations, + ACE_NEW_RETURN (preallocations_, ACE_Object_Manager_Preallocations, -1); + // Open the main thread's ACE_Log_Msg. (void) ACE_LOG_MSG; } - ACE_NEW_RETURN (default_mask_, - ACE_Sig_Set (1), - -1); + ACE_NEW_RETURN (default_mask_, ACE_Sig_Set (1), -1); + // Finally, indicate that the ACE_Object_Manager instance has // been initialized. object_manager_state_ = OBJ_MAN_INITIALIZED; @@ -252,7 +251,7 @@ ACE_Object_Manager::init (void) return 0; } else { // Had already initialized. - return 1; + return -1; } } @@ -302,9 +301,7 @@ ACE_Object_Manager::instance (void) { ACE_Object_Manager *instance_pointer; - ACE_NEW_RETURN (instance_pointer, - ACE_Object_Manager, - 0); + ACE_NEW_RETURN (instance_pointer, ACE_Object_Manager, 0); ACE_ASSERT (instance_pointer == instance_); instance_pointer->dynamically_allocated_ = 1; @@ -312,7 +309,9 @@ ACE_Object_Manager::instance (void) return instance_pointer; } else - return instance_; + { + return instance_; + } } ACE_Sig_Set & @@ -402,7 +401,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_Thread_Mutex *&lock) { if (lock == 0) { - if (starting_up () || shutting_down ()) + if (starting_up () || shutting_down ()) { // The Object_Manager and its internal lock have not been // constructed yet. Therefore, the program is single- @@ -410,9 +409,8 @@ ACE_Object_Manager::get_singleton_lock (ACE_Thread_Mutex *&lock) // instance has been destroyed, so the internal lock is not // available. Either way, we can not use double-checked // locking. So, we'll leak the lock. - ACE_NEW_RETURN (lock, - ACE_Thread_Mutex, - -1); + + ACE_NEW_RETURN (lock, ACE_Thread_Mutex, -1); } else { @@ -421,7 +419,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_Thread_Mutex *&lock) ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Object_Manager::instance ()-> - internal_lock_, + internal_lock_, -1)); if (lock == 0) @@ -458,9 +456,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_Mutex *&lock) // available. Either way, we can not use double-checked // locking. So, we'll leak the lock. - ACE_NEW_RETURN (lock, - ACE_Mutex, - -1); + ACE_NEW_RETURN (lock, ACE_Mutex, -1); } else { @@ -533,7 +529,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_RW_Thread_Mutex *&lock) { if (lock == 0) { - if (starting_up () || shutting_down ()) + if (starting_up () || shutting_down ()) { // The Object_Manager and its internal lock have not been // constructed yet. Therefore, the program is single- @@ -542,9 +538,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_RW_Thread_Mutex *&lock) // available. Either way, we can not use double-checked // locking. So, we'll leak the lock. - ACE_NEW_RETURN (lock, - ACE_RW_Thread_Mutex, - -1); + ACE_NEW_RETURN (lock, ACE_RW_Thread_Mutex, -1); } else { @@ -553,7 +547,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_RW_Thread_Mutex *&lock) ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Object_Manager::instance ()-> - internal_lock_, + internal_lock_, -1)); if (lock == 0) @@ -593,7 +587,7 @@ ACE_Object_Manager::fini (void) if (shutting_down_i ()) // Too late. Or, maybe too early. Either fini () has already // been called, or init () was never called. - return object_manager_state_ == OBJ_MAN_SHUT_DOWN ? 1 : -1; + return -1; // No mutex here. Only the main thread should destroy the singleton // ACE_Object_Manager instance. diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h index cacc50b5faa..96bd39daf79 100644 --- a/ace/Object_Manager.h +++ b/ace/Object_Manager.h @@ -182,13 +182,11 @@ class ACE_Export ACE_Object_Manager : public ACE_Object_Manager_Base public: virtual int init (void); // Explicitly initialize (construct the singleton instance of) the - // ACE_Object_Manager. Returns 0 on success, -1 on failure, and 1 - // if it had already been called. + // ACE_Object_Manager. virtual int fini (void); // Explicitly destroy the singleton instance of the - // ACE_Object_Manager. Returns 0 on success, -1 on failure, and 1 - // if it had already been called. + // ACE_Object_Manager. static int starting_up (void); // Returns 1 before the ACE_Object_Manager has been constructed. diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp index 9a6eb50e940..9738b4f1c1a 100644 --- a/ace/POSIX_Proactor.cpp +++ b/ace/POSIX_Proactor.cpp @@ -357,6 +357,8 @@ ACE_POSIX_Proactor::post_wakeup_completions (int how_many) return 0; } +// ********************************************************************* + class ACE_Export ACE_AIOCB_Notify_Pipe_Manager : public ACE_Handler { // = TITLE @@ -911,9 +913,7 @@ ACE_Asynch_Read_Stream_Impl * ACE_POSIX_SIG_Proactor::create_asynch_read_stream (void) { ACE_Asynch_Read_Stream_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_POSIX_SIG_Asynch_Read_Stream (this), - 0); + ACE_NEW_RETURN (implementation, ACE_POSIX_SIG_Asynch_Read_Stream (this), 0); return implementation; } @@ -921,9 +921,7 @@ ACE_Asynch_Write_Stream_Impl * ACE_POSIX_SIG_Proactor::create_asynch_write_stream (void) { ACE_Asynch_Write_Stream_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_POSIX_SIG_Asynch_Write_Stream (this), - 0); + ACE_NEW_RETURN (implementation, ACE_POSIX_SIG_Asynch_Write_Stream (this), 0); return implementation; } @@ -931,9 +929,7 @@ ACE_Asynch_Read_File_Impl * ACE_POSIX_SIG_Proactor::create_asynch_read_file (void) { ACE_Asynch_Read_File_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_POSIX_SIG_Asynch_Read_File (this), - 0); + ACE_NEW_RETURN (implementation, ACE_POSIX_SIG_Asynch_Read_File (this), 0); return implementation; } @@ -941,9 +937,7 @@ ACE_Asynch_Write_File_Impl * ACE_POSIX_SIG_Proactor::create_asynch_write_file (void) { ACE_Asynch_Write_File_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_POSIX_SIG_Asynch_Write_File (this), - 0); + ACE_NEW_RETURN (implementation, ACE_POSIX_SIG_Asynch_Write_File (this), 0); return implementation; } @@ -951,9 +945,7 @@ ACE_Asynch_Accept_Impl * ACE_POSIX_SIG_Proactor::create_asynch_accept (void) { ACE_Asynch_Accept_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_POSIX_SIG_Asynch_Accept (this), - 0); + ACE_NEW_RETURN (implementation, ACE_POSIX_SIG_Asynch_Accept (this), 0); return implementation; } diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp index 34803d53f54..cda7c90ee05 100644 --- a/ace/Parse_Node.cpp +++ b/ace/Parse_Node.cpp @@ -54,7 +54,7 @@ ACE_Parse_Node::dump (void) const ACE_TRACE ("ACE_Parse_Node::dump"); } -const ASYS_TCHAR * +const char * ACE_Parse_Node::name (void) const { ACE_TRACE ("ACE_Parse_Node::name"); @@ -78,12 +78,12 @@ ACE_Parse_Node::link (ACE_Parse_Node *n) ACE_Stream_Node::ACE_Stream_Node (const ACE_Static_Node *str_ops, const ACE_Parse_Node *str_mods) #if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) - : ACE_Parse_Node (str_ops == 0 ? ACE_static_cast (ASYS_TCHAR *, + : ACE_Parse_Node (str_ops == 0 ? ACE_static_cast (char *, ASYS_TEXT ("<unknown>")) - : ACE_static_cast (ASYS_TCHAR *, + : ACE_static_cast (char *, str_ops->name ())), #else - : ACE_Parse_Node ((str_ops == 0 ? ASYS_TEXT ("<unknown>") : str_ops->name ())), + : ACE_Parse_Node (str_ops == 0 ? "<unknown>" : str_ops->name ()), #endif /* defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ node_ (str_ops), mods_ (str_mods) @@ -110,7 +110,7 @@ ACE_Parse_Node::ACE_Parse_Node (void) } -ACE_Parse_Node::ACE_Parse_Node (const ASYS_TCHAR *nm) +ACE_Parse_Node::ACE_Parse_Node (const char *nm) : name_ (nm), next_ (0) { @@ -145,7 +145,7 @@ ACE_Suspend_Node::dump (void) const ACE_TRACE ("ACE_Suspend_Node::dump"); } -ACE_Suspend_Node::ACE_Suspend_Node (const ASYS_TCHAR *name) +ACE_Suspend_Node::ACE_Suspend_Node (const char *name) : ACE_Parse_Node (name) { ACE_TRACE ("ACE_Suspend_Node::ACE_Suspend_Node"); @@ -159,7 +159,7 @@ ACE_Resume_Node::dump (void) const ACE_TRACE ("ACE_Resume_Node::dump"); } -ACE_Resume_Node::ACE_Resume_Node (const ASYS_TCHAR *name) +ACE_Resume_Node::ACE_Resume_Node (const char *name) : ACE_Parse_Node (name) { ACE_TRACE ("ACE_Resume_Node::ACE_Resume_Node"); @@ -202,7 +202,7 @@ ACE_Remove_Node::dump (void) const ACE_TRACE ("ACE_Remove_Node::dump"); } -ACE_Remove_Node::ACE_Remove_Node (const ASYS_TCHAR *name) +ACE_Remove_Node::ACE_Remove_Node (const char *name) : ACE_Parse_Node (name) { ACE_TRACE ("ACE_Remove_Node::ACE_Remove_Node"); @@ -223,8 +223,8 @@ ACE_Remove_Node::apply (void) } ACE_Dynamic_Node::ACE_Dynamic_Node (const ACE_Service_Type *sr, - ASYS_TCHAR *parms) - : ACE_Static_Node (sr->name (), parms), + char *parms) + : ACE_Static_Node (sr->chname (), parms), record_ (sr) { ACE_TRACE ("ACE_Dynamic_Node::ACE_Dynamic_Node"); @@ -274,8 +274,8 @@ ACE_Static_Node::dump (void) const ACE_TRACE ("ACE_Static_Node::dump"); } -ACE_Static_Node::ACE_Static_Node (const ASYS_TCHAR *nm, - ASYS_TCHAR *params) +ACE_Static_Node::ACE_Static_Node (const char *nm, + char *params) : ACE_Parse_Node (nm), parameters_ (params) { @@ -289,14 +289,14 @@ ACE_Static_Node::record (void) const ACE_Service_Type *sr; if (ACE_Service_Repository::instance()->find - (this->name (), + (ASYS_WIDE_STRING (this->name ()), (const ACE_Service_Type **) &sr) == -1) return 0; else return sr; } -ASYS_TCHAR * +char * ACE_Static_Node::parameters (void) const { ACE_TRACE ("ACE_Static_Node::parameters"); @@ -344,7 +344,7 @@ ACE_Location_Node::~ACE_Location_Node (void) ACE_TRACE ("ACE_Location_Node::~ACE_Location_Node"); } -const ASYS_TCHAR * +const char * ACE_Location_Node::pathname (void) const { ACE_TRACE ("ACE_Location_Node::pathname"); @@ -352,7 +352,7 @@ ACE_Location_Node::pathname (void) const } void -ACE_Location_Node::pathname (const ASYS_TCHAR *p) +ACE_Location_Node::pathname (const char *p) { ACE_TRACE ("ACE_Location_Node::pathname"); this->pathname_ = p; @@ -395,7 +395,7 @@ ACE_Location_Node::open_handle (void) // Transform the pathname into the appropriate dynamic link library // by searching the ACE_LD_SEARCH_PATH. - int result = ACE::ldfind (this->pathname (), + int result = ACE::ldfind (ASYS_WIDE_STRING (this->pathname ()), dl_pathname, (sizeof dl_pathname / sizeof (ASYS_TCHAR))); @@ -438,8 +438,8 @@ ACE_Object_Node::dump (void) const ACE_TRACE ("ACE_Object_Node::dump"); } -ACE_Object_Node::ACE_Object_Node (const ASYS_TCHAR *path, - const ASYS_TCHAR *obj_name) +ACE_Object_Node::ACE_Object_Node (const char *path, + const char *obj_name) : object_name_ (obj_name) { ACE_TRACE ("ACE_Object_Node::ACE_Object_Node"); @@ -457,7 +457,7 @@ ACE_Object_Node::symbol (ACE_Service_Object_Exterminator *) this->symbol_ = (void *) ACE_OS::dlsym ((ACE_SHLIB_HANDLE) this->handle (), - ASYS_ONLY_MULTIBYTE_STRING (object_name)); + object_name); if (this->symbol_ == 0) { @@ -498,8 +498,8 @@ ACE_Function_Node::dump (void) const ACE_TRACE ("ACE_Function_Node::dump"); } -ACE_Function_Node::ACE_Function_Node (const ASYS_TCHAR *path, - const ASYS_TCHAR *func_name) +ACE_Function_Node::ACE_Function_Node (const char *path, + const char *func_name) : function_name_ (func_name) { ACE_TRACE ("ACE_Function_Node::ACE_Function_Node"); @@ -519,8 +519,8 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) // Locate the factory function <function_name> in the shared // object. - ASYS_TCHAR *function_name = ACE_const_cast (ASYS_TCHAR *, - this->function_name_); + char *function_name = ACE_const_cast (char *, + this->function_name_); // According to the new ANSI C++ specification, casting a void* // pointer to a function pointer is not allowed. However, @@ -536,7 +536,7 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) long temp_ptr = ACE_reinterpret_cast(long, ACE_OS::dlsym ((ACE_SHLIB_HANDLE) this->handle (), - ASYS_ONLY_MULTIBYTE_STRING (function_name))); + ASYS_WIDE_STRING (function_name))); func = ACE_reinterpret_cast(void *(*)(ACE_Service_Object_Exterminator *), temp_ptr); @@ -550,7 +550,7 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("dlsym failed for function %s\n"), - function_name)); + ASYS_WIDE_STRING (function_name))); ASYS_TCHAR *errmsg = ACE_OS::dlerror (); @@ -573,7 +573,7 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) ace_yyerrno++; ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), - this->function_name_), + ASYS_WIDE_STRING (this->function_name_)), 0); } } @@ -633,7 +633,7 @@ ACE_Static_Function_Node::dump (void) const ACE_TRACE ("ACE_Static_Function_Node::dump"); } -ACE_Static_Function_Node::ACE_Static_Function_Node (const ASYS_TCHAR *func_name) +ACE_Static_Function_Node::ACE_Static_Function_Node (const char *func_name) : function_name_ (func_name) { ACE_TRACE ("ACE_Static_Function_Node::ACE_Static_Function_Node"); @@ -653,7 +653,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) ACE_Static_Svc_Descriptor **ssdp = 0; ACE_STATIC_SVCS &svcs = *ACE_Service_Config::static_svcs (); - ASYS_TCHAR *function_name = ACE_const_cast (ASYS_TCHAR *, this->function_name_); + char *function_name = ACE_const_cast (char *, this->function_name_); for (ACE_STATIC_SVCS_ITERATOR iter (svcs); iter.next (ssdp) != 0; @@ -661,7 +661,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) { ACE_Static_Svc_Descriptor *ssd = *ssdp; if (ACE_OS::strcmp (ssd->name_, - function_name) == 0) + ASYS_WIDE_STRING (function_name)) == 0) func = (void *(*)(ACE_Service_Object_Exterminator*)) ssd->alloc_; } @@ -675,7 +675,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("no static service registered for function %s\n"), - function_name), + ASYS_WIDE_STRING (function_name)), 0); } } @@ -688,7 +688,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) ace_yyerrno++; ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), - this->function_name_), + ACE_WIDE_STRING (this->function_name_)), 0); } diff --git a/ace/Parse_Node.h b/ace/Parse_Node.h index 492895e85b2..b6975d1355d 100644 --- a/ace/Parse_Node.h +++ b/ace/Parse_Node.h @@ -30,14 +30,14 @@ class ACE_Export ACE_Parse_Node // tree of Service Nodes. public: ACE_Parse_Node (void); - ACE_Parse_Node (const ASYS_TCHAR *name); + ACE_Parse_Node (const char *name); virtual ~ACE_Parse_Node (void); ACE_Parse_Node *link (void) const; void link (ACE_Parse_Node *); virtual void apply (void) = 0; - const ASYS_TCHAR *name (void) const; + const char *name (void) const; void print (void) const; void dump (void) const; @@ -47,7 +47,7 @@ public: // Declare the dynamic allocation hooks. private: - const ASYS_TCHAR *name_; + const char *name_; ACE_Parse_Node *next_; }; @@ -56,7 +56,7 @@ class ACE_Export ACE_Suspend_Node : public ACE_Parse_Node // = TITLE // Suspend a Service Node. public: - ACE_Suspend_Node (const ASYS_TCHAR *name); + ACE_Suspend_Node (const char *name); ~ACE_Suspend_Node (void); virtual void apply (void); @@ -73,7 +73,7 @@ class ACE_Export ACE_Resume_Node : public ACE_Parse_Node // = TITLE // Resume a Service Node. public: - ACE_Resume_Node (const ASYS_TCHAR *name); + ACE_Resume_Node (const char *name); ~ACE_Resume_Node (void); virtual void apply (void); @@ -90,7 +90,7 @@ class ACE_Export ACE_Remove_Node : public ACE_Parse_Node // = TITLE // Remove a Service Node. public: - ACE_Remove_Node (const ASYS_TCHAR *name); + ACE_Remove_Node (const char *name); ~ACE_Remove_Node (void); virtual void apply (void); @@ -107,12 +107,12 @@ class ACE_Export ACE_Static_Node : public ACE_Parse_Node // = TITLE // Handle a statically linked node. public: - ACE_Static_Node (const ASYS_TCHAR *name, ASYS_TCHAR *params = 0); + ACE_Static_Node (const char *name, char *params = 0); virtual ~ACE_Static_Node (void); virtual void apply (void); virtual const ACE_Service_Type *record (void) const; - ASYS_TCHAR *parameters (void) const; + char *parameters (void) const; void dump (void) const; // Dump the state of an object. @@ -121,7 +121,7 @@ public: // Declare the dynamic allocation hooks. private: - ASYS_TCHAR *parameters_; + char *parameters_; // "Command-line" parameters. }; @@ -130,7 +130,7 @@ class ACE_Export ACE_Dynamic_Node : public ACE_Static_Node // = TITLE // Handle a dynamically linked node. public: - ACE_Dynamic_Node (const ACE_Service_Type *, ASYS_TCHAR *params); + ACE_Dynamic_Node (const ACE_Service_Type *, char *params); virtual ~ACE_Dynamic_Node (void); virtual const ACE_Service_Type *record (void) const; @@ -179,8 +179,8 @@ public: virtual void set_symbol (void *h); ACE_SHLIB_HANDLE handle (void) const; void handle (const ACE_SHLIB_HANDLE h); - const ASYS_TCHAR *pathname (void) const; - void pathname (const ASYS_TCHAR *h); + const char *pathname (void) const; + void pathname (const char *h); int dispose (void) const; virtual ~ACE_Location_Node (void); @@ -194,7 +194,7 @@ public: protected: ACE_SHLIB_HANDLE open_handle (void); - const ASYS_TCHAR *pathname_; + const char *pathname_; // Pathname to the shared library we are working on. int must_delete_; @@ -212,7 +212,7 @@ class ACE_Export ACE_Object_Node : public ACE_Location_Node // = TITLE // Keeps track of the symbol name for a shared object. public: - ACE_Object_Node (const ASYS_TCHAR *pathname, const ASYS_TCHAR *obj_name); + ACE_Object_Node (const char *pathname, const char *obj_name); virtual void *symbol (ACE_Service_Object_Exterminator * = 0); virtual ~ACE_Object_Node (void); @@ -223,7 +223,7 @@ public: // Declare the dynamic allocation hooks. private: - const ASYS_TCHAR *object_name_; + const char *object_name_; // Name of the object that we're parsing. }; @@ -232,7 +232,7 @@ class ACE_Export ACE_Function_Node : public ACE_Location_Node // = TITLE // Keeps track of the symbol name of for a shared function. public: - ACE_Function_Node (const ASYS_TCHAR *pathname, const ASYS_TCHAR *func_name); + ACE_Function_Node (const char *pathname, const char *func_name); virtual void *symbol (ACE_Service_Object_Exterminator *gobbler = 0); virtual ~ACE_Function_Node (void); @@ -243,7 +243,7 @@ public: // Declare the dynamic allocation hooks. private: - const ASYS_TCHAR *function_name_; + const char *function_name_; // Name of the function that we're parsing. }; @@ -275,7 +275,7 @@ class ACE_Export ACE_Static_Function_Node : public ACE_Location_Node // linked in from a DLL, but is statically linked with the // application. public: - ACE_Static_Function_Node (const ASYS_TCHAR *func_name); + ACE_Static_Function_Node (const char *func_name); virtual void *symbol (ACE_Service_Object_Exterminator * = 0); virtual ~ACE_Static_Function_Node (void); @@ -286,7 +286,7 @@ public: // Declare the dynamic allocation hooks. private: - const ASYS_TCHAR *function_name_; + const char *function_name_; // Name of the function that we're parsing. }; diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp index 53f5212e0e6..e76ccd73e2b 100644 --- a/ace/Pipe.cpp +++ b/ace/Pipe.cpp @@ -64,12 +64,7 @@ ACE_Pipe::open (void) // Make sure that the TCP stack doesn't try to buffer small writes. // Since this communication is purely local to the host it doesn't // affect network performance. -# if defined (ACE_HAS_PHARLAP_RT) - int level = SOL_SOCKET; -# else - int level = IPPROTO_TCP; -# endif /* ACE_HAS_PHARLAP_RT */ - if (writer.set_option (level, TCP_NODELAY, + if (writer.set_option (IPPROTO_TCP, TCP_NODELAY, &one, sizeof one) == -1) return -1; #endif /* ACE_LACKS_TCP_NODELAY */ diff --git a/ace/Priority_Reactor.cpp b/ace/Priority_Reactor.cpp index de12d4b755e..6ce6b11ffc8 100644 --- a/ace/Priority_Reactor.cpp +++ b/ace/Priority_Reactor.cpp @@ -35,13 +35,13 @@ ACE_Priority_Reactor::init_bucket (void) TUPLE_ALLOCATOR (ACE_Select_Reactor::DEFAULT_SIZE)); // The event handlers are assigned to a new As the Event - ACE_NEW (this->bucket_, - QUEUE *[npriorities]); - + ACE_NEW (this->bucket_, QUEUE*[npriorities]); // This loops "ensures" exception safety. - for (int i = 0; i < npriorities; ++i) - ACE_NEW (this->bucket_[i], - QUEUE (this->tuple_allocator_)); + int i; + for (i = 0; i < npriorities; ++i) + { + ACE_NEW (this->bucket_[i], QUEUE (this->tuple_allocator_)); + } } ACE_Priority_Reactor::ACE_Priority_Reactor (ACE_Sig_Handler *sh, @@ -69,10 +69,10 @@ ACE_Priority_Reactor::ACE_Priority_Reactor (size_t size, ACE_Priority_Reactor::~ACE_Priority_Reactor (void) { ACE_TRACE ("ACE_Priority_Reactor::~ACE_Priority_Reactor"); - for (int i = 0; i < npriorities; ++i) - delete this->bucket_[i]; - + { + delete this->bucket_[i]; + } delete[] this->bucket_; delete tuple_allocator_; } @@ -88,37 +88,49 @@ ACE_Priority_Reactor::dispatch_io_set (int number_of_active_handles, ACE_TRACE ("ACE_Priority_Reactor::dispatch_io_set"); if (number_of_active_handles == 0) - return 0; + { + return 0; + } + + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Priority_Reactor::dispatch_io_set\n"))); + + ACE_HANDLE handle; + // The range for which there exists any Event_Tuple is computed on - // the ordering loop, minimizing iterations on the dispatching loop. + // the ordering loop, minimizing iterations on the dispatching + // loop. int min_priority = ACE_Event_Handler::HI_PRIORITY; int max_priority = ACE_Event_Handler::LO_PRIORITY; ACE_Handle_Set_Iterator handle_iter (dispatch_mask); - for (ACE_HANDLE handle; - (handle = handle_iter ()) != ACE_INVALID_HANDLE; - ) + while ((handle = handle_iter ()) != ACE_INVALID_HANDLE) { - ACE_Event_Tuple et (this->handler_rep_.find (handle), - handle); + ACE_Event_Tuple et (this->handler_rep_.find (handle), handle); int prio = et.event_handler_->priority (); // If the priority is out of range assign the minimum priority. if (prio < ACE_Event_Handler::LO_PRIORITY || prio > ACE_Event_Handler::HI_PRIORITY) - prio = ACE_Event_Handler::LO_PRIORITY; + { + prio = ACE_Event_Handler::LO_PRIORITY; + } bucket_[prio]->enqueue_tail (et); - // Update the priority ranges.... if (min_priority > prio) - min_priority = prio; + { + min_priority = prio; + } if (max_priority < prio) - max_priority = prio; + { + max_priority = prio; + } } + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("dispatching.... %d\n"), number_of_active_handles)); + for (int i = max_priority; i >= min_priority; --i) { // Remove all the entries from the wrappers @@ -141,7 +153,9 @@ ACE_Priority_Reactor::dispatch_io_set (int number_of_active_handles, } if (number_dispatched > 0 && this->state_changed_) - return -1; + { + return -1; + } return 0; } diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp index 6089b432e8f..8801109ffef 100644 --- a/ace/Proactor.cpp +++ b/ace/Proactor.cpp @@ -50,7 +50,7 @@ class ACE_Export ACE_Proactor_Timer_Handler : public ACE_Task <ACE_NULL_SYNCH> // to waiting on the timer queue and event. If the event is // signaled, the thread will refresh the time it is currently // waiting on (in case the earliest time has changed). - + friend class ACE_Proactor; // Proactor has special privileges // Access needed to: timer_event_ @@ -65,7 +65,7 @@ public: int destroy (void); // Proactor calls this to shut down the timer handler // gracefully. Just calling the destructor alone doesnt do what - // <destroy> does. <destroy> make sure the thread exits properly. + // <destroy> does. <destroy> make sure the thread exits properly. protected: virtual int svc (void); @@ -97,8 +97,8 @@ ACE_Proactor_Timer_Handler::~ACE_Proactor_Timer_Handler (void) // Signal timer event. this->timer_event_.signal (); - - // Wait for the Timer Handler thread to exit. + + // Wait for the Timer Handler thread to exit. this->thr_mgr ()->wait (); } @@ -113,12 +113,12 @@ ACE_Proactor_Timer_Handler::svc (void) { // Is the timer queue empty? empty_flag = this->proactor_.timer_queue ()->is_empty (); - + if (!empty_flag) - { - // Get the earliest absolute time. - absolute_time = this->proactor_.timer_queue ()->earliest_time (); - + { + // Get the earliest absolute time. + absolute_time = this->proactor_.timer_queue ()->earliest_time (); + // Block for absolute time. result = this->timer_event_.wait (&absolute_time); } @@ -127,7 +127,7 @@ ACE_Proactor_Timer_Handler::svc (void) // Wait for ever. result = this->timer_event_.wait (); } - + // Check for timer expiries. if (result == -1) { @@ -163,13 +163,13 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (TIMER_QUEUE &timer_queue, const ACE_Time_Value &time) { ACE_UNUSED_ARG (timer_queue); - + if (this->proactor_ == 0) ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%t) No Proactor set in ACE_Proactor_Handle_Timeout_Upcall,") ASYS_TEXT (" no completion port to post timeout to?!@\n")), -1); - + // Create the Asynch_Timer. ACE_Asynch_Result_Impl *asynch_timer = this->proactor_->create_asynch_timer (*handler, act, @@ -179,11 +179,11 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (TIMER_QUEUE &timer_queue, -1); if (asynch_timer == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%N:%l:(%P | %t):%p\n"), - ASYS_TEXT ("ACE_Proactor_Handle_Timeout_Upcall::timeout:") - ASYS_TEXT ("create_asynch_timer failed")), + "%N:%l:(%P | %t):%p\n", + "ACE_Proactor_Handle_Timeout_Upcall::timeout:" + "create_asynch_timer failed"), -1); - + // Post a completion. if (asynch_timer->post_completion (this->proactor_->implementation ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -244,25 +244,21 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation, delete_timer_queue_ (0) { this->implementation (implementation); - + if (this->implementation () == 0) { #if defined (ACE_HAS_AIO_CALLS) // POSIX Proactor. #if defined (ACE_POSIX_AIOCB_PROACTOR) - ACE_NEW (implementation, - ACE_POSIX_AIOCB_Proactor); + ACE_NEW (implementation, ACE_POSIX_AIOCB_Proactor); #elif defined (ACE_POSIX_SIG_PROACTOR) - ACE_NEW (implementation, - ACE_POSIX_SIG_Proactor); + ACE_NEW (implementation, ACE_POSIX_SIG_Proactor); #else /* Default is to use the SIG one */ - ACE_NEW (implementation, - ACE_POSIX_SIG_Proactor); + ACE_NEW (implementation, ACE_POSIX_SIG_Proactor); #endif #elif (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) // WIN_Proactor. - ACE_NEW (implementation, - ACE_WIN32_Proactor); + ACE_NEW (implementation, ACE_WIN32_Proactor); #endif /* ACE_HAS_AIO_CALLS */ this->implementation (implementation); this->delete_implementation_ = 1; @@ -270,11 +266,11 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation, // Set the timer queue. this->timer_queue (tq); - + // Create the timer handler ACE_NEW (this->timer_handler_, ACE_Proactor_Timer_Handler (*this)); - + // Activate <timer_handler> if (this->timer_handler_->activate (THR_NEW_LWP | THR_DETACHED) == -1) ACE_ERROR ((LM_ERROR, @@ -296,16 +292,16 @@ ACE_Proactor::instance (size_t /* threads */) { // Perform Double-Checked Locking Optimization. ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance (), + *ACE_Static_Object_Lock::instance (), 0)); if (ACE_Proactor::proactor_ == 0) - { - ACE_NEW_RETURN (ACE_Proactor::proactor_, + { + ACE_NEW_RETURN (ACE_Proactor::proactor_, ACE_Proactor, 0); - ACE_Proactor::delete_proactor_ = 1; - } + ACE_Proactor::delete_proactor_ = 1; + } } return ACE_Proactor::proactor_; } @@ -316,7 +312,7 @@ ACE_Proactor::instance (ACE_Proactor *r) ACE_TRACE ("ACE_Proactor::instance"); ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance (), 0)); + *ACE_Static_Object_Lock::instance (), 0)); ACE_Proactor *t = ACE_Proactor::proactor_; @@ -333,7 +329,7 @@ ACE_Proactor::close_singleton (void) ACE_TRACE ("ACE_Proactor::close_singleton"); ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance ())); + *ACE_Static_Object_Lock::instance ())); if (ACE_Proactor::delete_proactor_) { @@ -359,7 +355,7 @@ ACE_Proactor::run_event_loop (void) // whether it is zero or non-zero. if (ACE_Proactor::end_event_loop_ != 0) return 0; - + // First time you are in. Increment the thread count. { // Obtain the lock in the MT environments. @@ -370,32 +366,32 @@ ACE_Proactor::run_event_loop (void) // Increment the thread count. ACE_Proactor::event_loop_thread_count_ ++; } - + // Run the event loop. while (1) { // Check the end loop flag. It is ok to do this without lock, - // since we care just whether it is zero or non-zero. + // since we care just whether it is zero or non-zero. if (ACE_Proactor::end_event_loop_ != 0) break; - + // <end_event_loop> is not set. Ready to do <handle_events>. result = ACE_Proactor::instance ()->handle_events (); if (ACE_Service_Config::reconfig_occurred ()) - ACE_Service_Config::reconfigure (); - + ACE_Service_Config::reconfigure (); + else if (result == -1) - break; + break; } - + // Leaving the event loop. Decrement the thread count. // Obtain the lock in the MT environments. #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1); #endif /* ACE_MT_SAFE */ - + // Decrement the thread count. ACE_Proactor::event_loop_thread_count_ --; @@ -418,19 +414,19 @@ ACE_Proactor::run_event_loop (ACE_Time_Value &tv) (ACE_Object_Manager::ACE_PROACTOR_EVENT_LOOP_LOCK); #endif /* ACE_MT_SAFE */ - // Early check. It is ok to do this without lock, since we care just + // Early check. It is ok to do this without lock, since we care just // whether it is zero or non-zero. if (ACE_Proactor::end_event_loop_ != 0 || tv == ACE_Time_Value::zero) return 0; - + // First time you are in. Increment the thread count. { // Obtain the lock in the MT environments. #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1); #endif /* ACE_MT_SAFE */ - + // Increment the thread count. ACE_Proactor::event_loop_thread_count_ ++; } @@ -448,11 +444,11 @@ ACE_Proactor::run_event_loop (ACE_Time_Value &tv) result = ACE_Proactor::instance ()->handle_events (tv); if (ACE_Service_Config::reconfig_occurred ()) - ACE_Service_Config::reconfigure (); - + ACE_Service_Config::reconfigure (); + // An error has occurred. else if (result == -1) - break; + break; } // Leaving the event loop. Decrement the thread count. @@ -461,7 +457,7 @@ ACE_Proactor::run_event_loop (ACE_Time_Value &tv) #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1); #endif /* ACE_MT_SAFE */ - + // Decrement the thread count. ACE_Proactor::event_loop_thread_count_ --; @@ -472,10 +468,10 @@ int ACE_Proactor::end_event_loop (void) { ACE_TRACE ("ACE_Proactor::end_event_loop"); - + // Obtain the lock, set the end flag and post the wakeup - // completions. - + // completions. + // Obtain the lock in the MT environments. #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) ACE_Thread_Mutex *lock = @@ -483,18 +479,18 @@ ACE_Proactor::end_event_loop (void) (ACE_Object_Manager::ACE_PROACTOR_EVENT_LOOP_LOCK); ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1); #endif /* ACE_MT_SAFE */ - + // Set the end flag. ACE_Proactor::end_event_loop_ = 1; - + // Number of completions to post. int how_many = ACE_Proactor::event_loop_thread_count_; - + // Reset the thread count. ACE_Proactor::event_loop_thread_count_ = 0; // Post completions to all the threads so that they will all wake - // up. + // up. return ACE_Proactor::post_wakeup_completions (how_many); } @@ -511,10 +507,10 @@ ACE_Proactor::close (void) // Close the implementation. if (this->implementation ()->close () == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%N:%l:(%P | %t):%p\n"), - ASYS_TEXT ("ACE_Proactor::close:implementation couldnt be closed")), + "%N:%l:(%P | %t):%p\n", + "ACE_Proactor::close:implementation couldnt be closed"), -1); - + // Delete the implementation. if (this->delete_implementation_) { @@ -528,7 +524,7 @@ ACE_Proactor::close (void) delete this->timer_handler_; this->timer_handler_ = 0; } - + // Delete the timer queue. if (this->delete_timer_queue_) { @@ -542,7 +538,7 @@ ACE_Proactor::close (void) int ACE_Proactor::register_handle (ACE_HANDLE handle, - const void *completion_key) + const void *completion_key) { return this->implementation ()->register_handle (handle, completion_key); @@ -579,12 +575,12 @@ ACE_Proactor::schedule_timer (ACE_Handler &handler, // absolute time. ACE_Time_Value absolute_time = this->timer_queue_->gettimeofday () + time; - + // Only one guy goes in here at a time ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->timer_queue_->mutex (), - -1); + -1); // Schedule the timer long result = this->timer_queue_->schedule (&handler, @@ -595,7 +591,7 @@ ACE_Proactor::schedule_timer (ACE_Handler &handler, { // no failures: check to see if we are the earliest time if (this->timer_queue_->earliest_time () == absolute_time) - + // wake up the timer thread if (this->timer_handler_->timer_event_.signal () == -1) { @@ -684,8 +680,7 @@ ACE_Proactor::timer_queue (TIMER_QUEUE *tq) // New timer queue. if (tq == 0) { - ACE_NEW (this->timer_queue_, - TIMER_HEAP); + this->timer_queue_ = new TIMER_HEAP; this->delete_timer_queue_ = 1; } else @@ -959,36 +954,21 @@ template class ACE_Timer_Wheel_Iterator_T<ACE_Handler *, ACE_SYNCH_RECURSIVE_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Timer_Queue_T<ACE_Handler *,\ - ACE_Proactor_Handle_Timeout_Upcall,\ - ACE_SYNCH_RECURSIVE_MUTEX> + ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX> #pragma instantiate ACE_Timer_Queue_Iterator_T<ACE_Handler *,\ - ACE_Proactor_Handle_Timeout_Upcall,\ - ACE_SYNCH_RECURSIVE_MUTEX> + ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX> #pragma instantiate ACE_Timer_List_T<ACE_Handler *,\ - ACE_Proactor_Handle_Timeout_Upcall,\ - ACE_SYNCH_RECURSIVE_MUTEX> + ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX> #pragma instantiate ACE_Timer_List_Iterator_T<ACE_Handler *,\ - ACE_Proactor_Handle_Timeout_Upcall,\ - ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Timer_Node_T<ACE_Handler *> -#pragma instantiate ACE_Unbounded_Set<ACE_Timer_Node_T<ACE_Handler *> *> -#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Timer_Node_T<ACE_Handler *> *> -#pragma instantiate ACE_Node <ACE_Timer_Node_T<ACE_Handler *> *> -#pragma instantiate ACE_Free_List<ACE_Timer_Node_T<ACE_Handler *> > -#pragma instantiate ACE_Locked_Free_List<ACE_Timer_Node_T<ACE_Handler *>,\ - ACE_Null_Mutex> + ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX> #pragma instantiate ACE_Timer_Heap_T<ACE_Handler *,\ - ACE_Proactor_Handle_Timeout_Upcall,\ - ACE_SYNCH_RECURSIVE_MUTEX> + ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX> #pragma instantiate ACE_Timer_Heap_Iterator_T<ACE_Handler *,\ - ACE_Proactor_Handle_Timeout_Upcall,\ - ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Timer_Wheel_T<ACE_Handler *,\ - ACE_Proactor_Handle_Timeout_Upcall,\ - ACE_SYNCH_RECURSIVE_MUTEX> + ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX> +#pragma instantiate ACE_Timer_Wheel_T<ACE_Handler *, + ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX> #pragma instantiate ACE_Timer_Wheel_Iterator_T<ACE_Handler *,\ - ACE_Proactor_Handle_Timeout_Upcall,\ - ACE_SYNCH_RECURSIVE_MUTEX> + ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ #else /* !ACE_WIN32 || !ACE_HAS_AIO_CALLS */ diff --git a/ace/Process.cpp b/ace/Process.cpp index b2be00615fb..d560a9d51e8 100644 --- a/ace/Process.cpp +++ b/ace/Process.cpp @@ -239,16 +239,13 @@ ACE_Process_Options::ACE_Process_Options (int ie, command_line_argv_calculated_ (0), command_line_buf_ (0) { - ACE_NEW (command_line_buf_, - TCHAR[cobl]); + ACE_NEW (command_line_buf_, TCHAR[cobl]); command_line_buf_[0] = '\0'; #if !defined (ACE_HAS_WINCE) working_directory_[0] = '\0'; - ACE_NEW (environment_buf_, - TCHAR[ebl]); - ACE_NEW (environment_argv_, - LPTSTR[mea]); + ACE_NEW (environment_buf_, TCHAR[ebl]); + ACE_NEW (environment_argv_, LPTSTR[mea]); environment_buf_[0] = '\0'; environment_argv_[0] = 0; @@ -285,8 +282,8 @@ ACE_Process_Options::inherit_environment (void) // Add the string to our env buffer. if (this->setenv_i (existing_environment + slot, len) == -1) { - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p.\n"), - ASYS_TEXT ("ACE_Process_Options::ACE_Process_Options"))); + ACE_ERROR ((LM_ERROR, "%p.\n", + "ACE_Process_Options::ACE_Process_Options")); break; } @@ -424,7 +421,7 @@ ACE_Process_Options::setenv_i (LPTSTR assignment, // If environment larger than allocated buffer return. Also check to // make sure we have enough room. - if (environment_argv_index_ == max_environ_argv_index_ + if (environment_argv_index_ == max_environ_argv_index_ || (len + environment_buf_index_) >= environment_buf_len_) return -1; @@ -524,7 +521,7 @@ ACE_Process_Options::~ACE_Process_Options (void) int ACE_Process_Options::command_line (LPCTSTR argv[]) { - // @@ Factor out the code between this + // @@ Factor out the code between this int i = 0; if (argv[i]) diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp index 6be9d9b4c4c..d1d3f0ada79 100644 --- a/ace/Process_Manager.cpp +++ b/ace/Process_Manager.cpp @@ -55,9 +55,7 @@ ACE_Process_Manager::resize (size_t size) ACE_Process_Descriptor *temp; - ACE_NEW_RETURN (temp, - ACE_Process_Descriptor[size], - -1); + ACE_NEW_RETURN (temp, ACE_Process_Descriptor[size], -1); for (size_t i = 0; i < this->max_table_size_; i++) temp[i] = this->proc_table_[i]; // Structure assignment. diff --git a/ace/QoS.cpp b/ace/QoS.cpp new file mode 100644 index 00000000000..620a58c436f --- /dev/null +++ b/ace/QoS.cpp @@ -0,0 +1,130 @@ +// $Id$ + +#define ACE_BUILD_DLL + +#include "ace/ACE_QoS.h" + +ACE_RCSID( ace, "$Id$" ) + +ACE_ALLOC_HOOK_DEFINE( ACE_QoS ) + +class Ace_Export ACE_QoS +{ + // = TITLE + // Define the basic QoS parameters + +public: + // = Initializattion and termination methods. + // Default + ACE_QoS::ACE_QoS( void ) + { + ACE_TRACE( "ACE_QoS::ACE_QoS" ); + } + + // set CBR rate + int ACE_QoS::set_cbr_rate( int rate ) + { + ACE_TRACE( "ACE_QoS::set_cbr_rate" ); + +#if defined (ACE_HAS_FORE_ATM_WS2) + AAL_PARAMETERS_IE ie_aalparams; + ATM_TRAFFIC_DESCRIPTOR_IE ie_td; + ATM_BROADBAND_BEARER_CAPBILITY_IE ie_bbc; + ATM_QOS_CLASS_IE ie_qos; + Q2931_IE *ie_ptr; + int size; + + ie_aalparams.AALType = AALTYPE_5; + ie_aalparams.AALSpecificParameters.AAL5Parameters.ForwardMaxCPCSSDUSize = 1516; + ie_aalparams.AALSpecificParameters.AAL5Parameters.BackwardMaxCPCSSDUSize = 1516; + ie_aalparams.AALSpecificParameters.AAL5Parameters.Mode = AAL5_MODE_MESSAGE; + ie_aalparams.AALSpecificParameters.AAL5Parameters.SSCSType = AAL5_SSCS_NULL; + + size = sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(AAL_PARAMETERS_IE); + + ie_td.Forward.PeakCellRate_CLP0 = SAP_FIELD_ABSENT; + ie_td.Forward.PeakCellRate_CLP01 = cellRate; + ie_td.Forward.SustainableCellRate_CLP0 = SAP_FIELD_ABSENT; + ie_td.Forward.SustainableCellRate_CLP01 = SAP_FIELD_ABSENT; + ie_td.Forward.MaxBurstSize_CLP0 = SAP_FIELD_ABSENT; + ie_td.Forward.MaxBurstSize_CLP01 = SAP_FIELD_ABSENT; + ie_td.Forward.Tagging = SAP_FIELD_ABSENT; + + ie_td.Backward.PeakCellRate_CLP0 = SAP_FIELD_ABSENT; + ie_td.Backward.PeakCellRate_CLP01 = cellRate; + ie_td.Backward.SustainableCellRate_CLP0 = SAP_FIELD_ABSENT; + ie_td.Backward.SustainableCellRate_CLP01 = SAP_FIELD_ABSENT; + ie_td.Backward.MaxBurstSize_CLP0 = SAP_FIELD_ABSENT; + ie_td.Backward.MaxBurstSize_CLP01 = SAP_FIELD_ABSENT; + ie_td.Backward.Tagging = SAP_FIELD_ABSENT; + + ie_td.BestEffort = 0; // Note: this must be set to zero for CBR + + size += sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(ATM_TRAFFIC_DESCRIPTOR_IE); + + ie_bbc.BearerClass = BCOB_X; + ie_bbc.TrafficType = TT_CBR; + ie_bbc.TimingRequirements = TR_END_TO_END; + ie_bbc.ClippingSusceptability = CLIP_NOT; + ie_bbc.UserPlaneConnectionConfig = UP_P2P; + + size += sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + + sizeof(ATM_BROADBAND_BEARER_CAPABILITY_IE); + + ie_qos.QOSClassForward = QOS_CLASS1; + ie_qos.QOSClassBackward = QOS_CLASS1; + + size += sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(ATM_QOS_CLASS_IE); + + qos_.ProviderSpecific.buf = (char *) malloc(size); + qos_.ProviderSpecific.len = size; + memset(qos_.ProviderSpecific.buf, 0, size); + + ie_ptr = (Q2931_IE *) qos_.ProviderSpecific.buf; + ie_ptr->IEType = IE_AALParameters; + ie_ptr->IELength = sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + + sizeof(AAL_PARAMETERS_IE); + memcpy(ie_ptr->IE, &ie_aalparams, sizeof(AAL_PARAMETERS_IE)); + + ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength); + ie_ptr->IEType = IE_TrafficDescriptor; + ie_ptr->IELength = sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(ATM_TRAFFIC_DESCRIPTOR_IE); + memcpy(ie_ptr->IE, &ie_td, sizeof(ATM_TRAFFIC_DESCRIPTOR_IE)); + + ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength); + ie_ptr->IEType = IE_BroadbandBearerCapability; + ie_ptr->IELength = sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(ATM_BROADBAND_BEARER_CAPABILITY_IE); + memcpy(ie_ptr->IE, &ie_bbc, sizeof(ATM_BROADBAND_BEARER_CAPABILITY_IE)); + + ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength); + ie_ptr->IEType = IE_QOSClass; + ie_ptr->IELength = sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(ATM_QOS_CLASS_IE); + memcpy(ie_ptr->IE, &ie_qos, sizeof(ATM_QOS_CLASS_IE)); + + qos_.SendingFlowspec.TokenRate = -1; + qos_.SendingFlowspec.TokenBucketSize = -1; + qos_.SendingFlowspec.PeakBandwidth = -1; + qos_.SendingFlowspec.Latency = -1; + qos_.SendingFlowspec.DelayVariation = -1; + qos_.SendingFlowspec.LevelOfGuarantee = BestEffortService ; + // will most probably be ignored by the service provider + qos_.SendingFlowspec.CostOfCall = 0; + + qos_.ReceivingFlowspec.TokenRate = -1; + qos_.ReceivingFlowspec.TokenBucketSize = -1; + qos_.ReceivingFlowspec.PeakBandwidth = -1; + qos_.ReceivingFlowspec.Latency = -1; + qos_.ReceivingFlowspec.DelayVariation = -1; + qos_.ReceivingFlowspec.LevelOfGuarantee = BestEffortService; + // will most probably be ignored by the service provider + qos_.ReceivingFlowspec.CostOfCall = 0; +#elif defined (ACE_HAS_FORE_ATM_XTI) + // XTI part +#endif // ACE_HAS_FORE_ATM_WS2 && ACE_HAS_FORE_ATM_XTI + } + + QOS ACE_QoS::get_qos( void ) + { + return qos_; + } +} diff --git a/ace/QoS.h b/ace/QoS.h new file mode 100644 index 00000000000..17292afd502 --- /dev/null +++ b/ace/QoS.h @@ -0,0 +1,70 @@ +// $Id$ + +// QoS class definition (refer to WinSock2 QoS) + +#ifndef QOS_H +#define QOS_H + +#include + +#if !defined(ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class Ace_Export ACE_QoS +{ + // = TITLE + // Define the basic QoS parameters + +public: + // = Initializattion and termination methods. + ACE_QoS( void ); + // Default + + ~ACE_QoS( void ); + // Default dtor + + // set CBR rate + int set_cbr_rate( int ); + + // get QoS struct + QOS get_qos( void ); + +private: +#if defined (ACE_HAS_FORE_ATM_WS2) + // just map to WS2 GQOS struct + QOS qos_; +#elif defined (ACE_HAS_FOR_ATM_XTI) +typedef enum { + BEST_EFFORT, + CONTROLLED_LOAD, + GUARANTEED +} SERVICETYPE; + +typedef struct _flowspec { + int TokeRate; + int TokenBucketSize; + int PeakBandwidth; + int Latency; + int DelayVariation; + SERVICETYPE ServiceType; + int MaxSduSize; + int MinimumPolicedSize; +} FLOWSPEC; + +typedef struct _BUF { + ulong len; + char *buf; +} BUF; + +typedef struct _QualityOfService { + FLOWSPEC SendingFlowspec; + FLOWSPEC ReceivingFlowspec; + BUF ProviderSpecific; +} QOS; + + QOS qos_; +#endif // ACE_HAS_FORE_ATM_WS2 && ACE_HAS_FOREATM_XTI +} + +#endif /* QOS_H */ diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp index 5abb8601885..251f5c563e3 100644 --- a/ace/RB_Tree.cpp +++ b/ace/RB_Tree.cpp @@ -17,16 +17,21 @@ ACE_RCSID(ace, RB_Tree, "$Id$") +///////////////////////////////////////////////////// +// template class ACE_RB_Tree_Node<EXT_ID, INT_ID> // +///////////////////////////////////////////////////// + + // Constructor. template <class EXT_ID, class INT_ID> ACE_RB_Tree_Node<EXT_ID, INT_ID>::ACE_RB_Tree_Node (const EXT_ID &k, const INT_ID &t) - : k_ (k), - t_ (t), - color_ (RED), - parent_ (0), - left_ (0), - right_ (0) + : k_ (k) + , t_ (t) + , color_ (RED) + , parent_ (0) + , left_ (0) + , right_ (0) { ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::ACE_RB_Tree_Node (const EXT_ID &k, const INT_ID &t)"); } @@ -35,7 +40,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::ACE_RB_Tree_Node (const EXT_ID &k, const INT_I // Destructor. template <class EXT_ID, class INT_ID> -ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node (void) +ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node () { ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node"); @@ -46,6 +51,12 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node (void) delete right_; } + + +//////////////////////////////////////////////// +// template class ACE_RB_Tree<EXT_ID, INT_ID> // +//////////////////////////////////////////////// + // Constructor. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -57,10 +68,10 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (ACE_Allocator ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::" "ACE_RB_Tree (ACE_Allocator *alloc)"); if (this->open (alloc) == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("ACE_RB_Tree::ACE_RB_Tree\n"))); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("ACE_RB_Tree::ACE_RB_Tree\n"))); } + // Copy constructor. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -75,12 +86,10 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (const ACE_RB_T // Make a deep copy of the passed tree. ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> iter(rbt); - - for (iter.first (); - - iter.is_done () == 0; iter.next ()) - insert_i (*(iter.key ()), - *(iter.item ())); + for (iter.first (); iter.is_done () == 0; iter.next ()) + { + insert_i (*(iter.key ()), *(iter.item ())); + } } // Destructor. @@ -90,11 +99,12 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree () { ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree"); - // Use the locked public method, to be totally safe, as the class - // can be used with an allocator and placement new. + // Use the locked public method, to be totally safe, as the + // class can be used with an allocator and placement new. this->close (); } + // Assignment operator. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void @@ -108,19 +118,17 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator = (const ACE_RB_Tr // Make a deep copy of the passed tree. ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> iter(rbt); - - for (iter.first (); - iter.is_done () == 0; - iter.next ()) - insert_i (*(iter.key ()), - *(iter.item ())); + for (iter.first (); iter.is_done () == 0; iter.next ()) + { + insert_i (*(iter.key ()), *(iter.item ())); + } // Use the same allocator as the rhs. allocator_ = rbt.allocator_; } -// Less than comparison function for keys, default functor -// implementation returns 1 if k1 < k2, 0 otherwise. +// Less than comparison function for keys, default +// functor implementation returns 1 if k1 < k2, 0 otherwise. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> int ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::lessthan (const EXT_ID &k1, const EXT_ID &k2) @@ -129,6 +137,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::lessthan (const EXT_ID &k1, return this->compare_keys_ (k1, k2); } + // Method for right rotation of the tree about a given node. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void @@ -137,37 +146,48 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right (ACE_RB_Tre ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right"); if (! x) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("\nerror: x is a null pointer in " - "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n"))); + { + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), + ASYS_TEXT ("\nerror: x is a null pointer in " + "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n"))); + } else if (! (x->left())) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("\nerror: x->left () is a null pointer in ") - ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n"))); + { + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), + ASYS_TEXT ("\nerror: x->left () is a null pointer in " + "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n"))); + } else + { + ACE_RB_Tree_Node<EXT_ID, INT_ID> * y; + y = x->left (); + x->left (y->right ()); + if (y->right ()) { - ACE_RB_Tree_Node<EXT_ID, INT_ID> * y; - y = x->left (); - x->left (y->right ()); - if (y->right ()) - y->right ()->parent (x); - y->parent (x->parent ()); - if (x->parent ()) - { - if (x == x->parent ()->right ()) - x->parent ()->right (y); - else - x->parent ()->left (y); - } + y->right ()->parent (x); + } + y->parent (x->parent ()); + if (x->parent ()) + { + if (x == x->parent ()->right ()) + { + x->parent ()->right (y); + } else - root_ = y; - y->right (x); - x->parent (y); + { + x->parent ()->left (y); + } + } + else + { + root_ = y; } + y->right (x); + x->parent (y); + } } + // Method for left rotation of the tree about a given node. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void @@ -176,145 +196,169 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left (ACE_RB_Tree ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left"); if (! x) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), + { + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("\nerror: x is a null pointer in " "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n"))); + } else if (! (x->right())) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("\nerror: x->right () is a null pointer ") - ASYS_TEXT ("in ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n"))); + { + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), + ASYS_TEXT ("\nerror: x->right () is a null pointer " + "in ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n"))); + } else + { + ACE_RB_Tree_Node<EXT_ID, INT_ID> * y; + y = x->right (); + x->right (y->left ()); + if (y->left ()) { - ACE_RB_Tree_Node<EXT_ID, INT_ID> * y; - y = x->right (); - x->right (y->left ()); - if (y->left ()) - y->left ()->parent (x); - y->parent (x->parent ()); - if (x->parent ()) - { - if (x == x->parent ()->left ()) - x->parent ()->left (y); - else - x->parent ()->right (y); - } + y->left ()->parent (x); + } + y->parent (x->parent ()); + if (x->parent ()) + { + if (x == x->parent ()->left ()) + { + x->parent ()->left (y); + } else - root_ = y; - y->left (x); - x->parent (y); + { + x->parent ()->right (y); + } } + else + { + root_ = y; + } + y->left (x); + x->parent (y); + } } + // Method for restoring Red-Black properties after deletion. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void -ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_delete_fixup (ACE_RB_Tree_Node<EXT_ID, INT_ID> *x) +ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_delete_fixup (ACE_RB_Tree_Node<EXT_ID, INT_ID> * x) { ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_delete_fixup"); - while (x != 0 - && x->parent () - && x->color () == ACE_RB_Tree_Node_Base::BLACK) + while (x && + x->parent () && + x->color () == ACE_RB_Tree_Node_Base::BLACK) + { + if (x == x->parent ()->left ()) { - if (x == x->parent ()->left ()) + ACE_RB_Tree_Node<EXT_ID, INT_ID> *w = x->parent ()->right (); + if (w && w->color () == ACE_RB_Tree_Node_Base::RED) + { + w->color (ACE_RB_Tree_Node_Base::BLACK); + x->parent ()->color (ACE_RB_Tree_Node_Base::RED); + RB_rotate_left (x->parent ()); + w = x->parent ()->right (); + } + // CLR pp. 263 says that nil nodes are implicitly colored BLACK + if ((w) && + (!w->left () || + w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK) && + (!w->right () || + w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK)) + { + w->color (ACE_RB_Tree_Node_Base::RED); + x = x->parent (); + } + else + { + // CLR pp. 263 says that nil nodes are implicitly colored BLACK + if (w && + (!w->right () || + w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK)) { - ACE_RB_Tree_Node<EXT_ID, INT_ID> *w = x->parent ()->right (); - if (w && w->color () == ACE_RB_Tree_Node_Base::RED) - { - w->color (ACE_RB_Tree_Node_Base::BLACK); - x->parent ()->color (ACE_RB_Tree_Node_Base::RED); - RB_rotate_left (x->parent ()); - w = x->parent ()->right (); - } - // CLR pp. 263 says that nil nodes are implicitly colored BLACK - if ((w) && - (!w->left () - || w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK) - && (!w->right () - || w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK)) + if (w->left ()) { - w->color (ACE_RB_Tree_Node_Base::RED); - x = x->parent (); - } - else - { - // CLR pp. 263 says that nil nodes are implicitly colored BLACK - if (w && - (!w->right () - || w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK)) - { - if (w->left ()) - w->left ()->color (ACE_RB_Tree_Node_Base::BLACK); - w->color (ACE_RB_Tree_Node_Base::RED); - RB_rotate_right (w); - w = x->parent ()->right (); - } - if (w) - { - w->color (x->parent ()->color ()); - if (w->right ()) - w->right ()->color (ACE_RB_Tree_Node_Base::BLACK); - } - x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); - RB_rotate_left (x->parent ()); - x = root_; + w->left ()->color (ACE_RB_Tree_Node_Base::BLACK); } + w->color (ACE_RB_Tree_Node_Base::RED); + RB_rotate_right (w); + w = x->parent ()->right (); } + if (w) + { + w->color (x->parent ()->color ()); + if (w->right ()) + { + w->right ()->color (ACE_RB_Tree_Node_Base::BLACK); + } + } + x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); + RB_rotate_left (x->parent ()); + x = root_; + } + } + else + { + ACE_RB_Tree_Node<EXT_ID, INT_ID> *w = x->parent ()->left (); + if (w && w->color () == ACE_RB_Tree_Node_Base::RED) + { + w->color (ACE_RB_Tree_Node_Base::BLACK); + x->parent ()->color (ACE_RB_Tree_Node_Base::RED); + RB_rotate_right (x->parent ()); + w = x->parent ()->left (); + } + // CLR pp. 263 says that nil nodes are implicitly colored BLACK + if (w && + (!w->left () || + w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK) && + (!w->right () || + w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK)) + { + w->color (ACE_RB_Tree_Node_Base::RED); + x = x->parent (); + } else + { + // CLR pp. 263 says that nil nodes are implicitly colored BLACK + if (w && + (!w->left () || + w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK)) { - ACE_RB_Tree_Node<EXT_ID, INT_ID> *w = x->parent ()->left (); - if (w && w->color () == ACE_RB_Tree_Node_Base::RED) - { - w->color (ACE_RB_Tree_Node_Base::BLACK); - x->parent ()->color (ACE_RB_Tree_Node_Base::RED); - RB_rotate_right (x->parent ()); - w = x->parent ()->left (); - } - // CLR pp. 263 says that nil nodes are implicitly colored BLACK - if (w && - (!w->left () - || w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK) - && (!w->right () - || w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK)) - { - w->color (ACE_RB_Tree_Node_Base::RED); - x = x->parent (); - } - else + w->color (ACE_RB_Tree_Node_Base::RED); + if (w->right ()) { - // CLR pp. 263 says that nil nodes are implicitly colored BLACK - if (w && - (!w->left () - || w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK)) - { - w->color (ACE_RB_Tree_Node_Base::RED); - if (w->right ()) - w->right ()->color (ACE_RB_Tree_Node_Base::BLACK); - RB_rotate_left (w); - w = x->parent ()->left (); - } - if (w) - { - w->color (x->parent ()->color ()); - if (w->left ()) - w->left ()->color (ACE_RB_Tree_Node_Base::BLACK); - } - x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); - RB_rotate_right (x->parent ()); - x = root_; + w->right ()->color (ACE_RB_Tree_Node_Base::BLACK); } + RB_rotate_left (w); + w = x->parent ()->left (); } + if (w) + { + w->color (x->parent ()->color ()); + if (w->left ()) + { + w->left ()->color (ACE_RB_Tree_Node_Base::BLACK); + } + } + x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); + RB_rotate_right (x->parent ()); + x = root_; + } } + } if (x) + { x->color (ACE_RB_Tree_Node_Base::BLACK); + } } -// Return a pointer to a matching node if there is one, a pointer to -// the node under which to insert the item if the tree is not empty -// and there is no such match, or 0 if the tree is empty. + + +// Return a pointer to a matching node if there is one, +// a pointer to the node under which to insert the item +// if the tree is not empty and there is no such match, +// or 0 if the tree is empty. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<EXT_ID, INT_ID> * ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find_node (const EXT_ID &k, ACE_RB_Tree_Base::RB_SearchResult &result) @@ -325,47 +369,52 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find_node (const EXT_ID &k, ACE_RB_Tree_Node<EXT_ID, INT_ID> *current = root_; while (current) + { + // While there are more nodes to examine. + if (this->lessthan (current->key (), k)) { - // While there are more nodes to examine. - if (this->lessthan (current->key (), k)) - { - // If the search key is greater than the current node's key. - if (current->right ()) - // If the right subtree is not empty, search to the right. - current = current->right (); - else - { - // If the right subtree is empty, we're done searching, - // and are positioned to the left of the insertion point. - result = LEFT; - break; - } - } - else if (this->lessthan (k, current->key ())) - { - // Else if the search key is less than the current node's key. - if (current->left ()) - // If the left subtree is not empty, search to the left. - current = current->left (); - else - { - // If the left subtree is empty, we're done searching, - // and are positioned to the right of the insertion point. - result = RIGHT; - break; - } - } + // If the search key is greater than the current node's key. + if (current->right ()) + { + // If the right subtree is not empty, search to the right. + current = current->right (); + } else - { - // If the keys match exactly, we're done as well. - result = EXACT; - break; - } + { + // If the right subtree is empty, we're done searching, + // and are positioned to the left of the insertion point. + result = LEFT; + break; + } + } + else if (this->lessthan (k, current->key ())) + { + // Else if the search key is less than the current node's key. + if (current->left ()) + { + // If the left subtree is not empty, search to the left. + current = current->left (); + } + else + { + // If the left subtree is empty, we're done searching, + // and are positioned to the right of the insertion point. + result = RIGHT; + break; + } + } + else + { + // If the keys match exactly, we're done as well. + result = EXACT; + break; } + } return current; } + // Rebalance the tree after insertion of a node. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void @@ -376,74 +425,74 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rebalance (ACE_RB_Tree_N ACE_RB_Tree_Node<EXT_ID, INT_ID> *y = 0; while (x && - x->parent () - && x->parent ()->color () == ACE_RB_Tree_Node_Base::RED) + x->parent () && + x->parent ()->color () == ACE_RB_Tree_Node_Base::RED) + { + if (! x->parent ()->parent ()) { - if (! x->parent ()->parent ()) - { - // If we got here, something is drastically wrong! - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("\nerror: parent's parent is null in ") - ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rebalance\n"))); - return; - } + // If we got here, something is drastically wrong! + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), + ASYS_TEXT ("\nerror: parent's parent is null in " + "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rebalance\n"))); + return; + } - if (x->parent () == x->parent ()->parent ()->left ()) + if (x->parent () == x->parent ()->parent ()->left ()) + { + y = x->parent ()->parent ()->right (); + if (y && y->color () == ACE_RB_Tree_Node_Base::RED) + { + // Handle case 1 (see CLR book, pp. 269). + x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); + y->color (ACE_RB_Tree_Node_Base::BLACK); + x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED); + x = x->parent ()->parent (); + } + else + { + if (x == x->parent ()->right ()) { - y = x->parent ()->parent ()->right (); - if (y && y->color () == ACE_RB_Tree_Node_Base::RED) - { - // Handle case 1 (see CLR book, pp. 269). - x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); - y->color (ACE_RB_Tree_Node_Base::BLACK); - x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED); - x = x->parent ()->parent (); - } - else - { - if (x == x->parent ()->right ()) - { - // Transform case 2 into case 3 (see CLR book, pp. 269). - x = x->parent (); - RB_rotate_left (x); - } - - // Handle case 3 (see CLR book, pp. 269). - x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); - x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED); - RB_rotate_right (x->parent ()->parent ()); - } + // Transform case 2 into case 3 (see CLR book, pp. 269). + x = x->parent (); + RB_rotate_left (x); } + + // Handle case 3 (see CLR book, pp. 269). + x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); + x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED); + RB_rotate_right (x->parent ()->parent ()); + } + } + else + { + y = x->parent ()->parent ()->left (); + if (y && y->color () == ACE_RB_Tree_Node_Base::RED) + { + // Handle case 1 (see CLR book, pp. 269). + x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); + y->color (ACE_RB_Tree_Node_Base::BLACK); + x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED); + x = x->parent ()->parent (); + } else + { + if (x == x->parent ()->left ()) { - y = x->parent ()->parent ()->left (); - if (y && y->color () == ACE_RB_Tree_Node_Base::RED) - { - // Handle case 1 (see CLR book, pp. 269). - x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); - y->color (ACE_RB_Tree_Node_Base::BLACK); - x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED); - x = x->parent ()->parent (); - } - else - { - if (x == x->parent ()->left ()) - { - // Transform case 2 into case 3 (see CLR book, pp. 269). - x = x->parent (); - RB_rotate_right (x); - } - - // Handle case 3 (see CLR book, pp. 269). - x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); - x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED); - RB_rotate_left (x->parent ()->parent ()); - } + // Transform case 2 into case 3 (see CLR book, pp. 269). + x = x->parent (); + RB_rotate_right (x); } + + // Handle case 3 (see CLR book, pp. 269). + x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); + x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED); + RB_rotate_left (x->parent ()->parent ()); + } } + } } + // Method to find the successor node of the given node in the tree. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<EXT_ID, INT_ID> * @@ -452,18 +501,21 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_successor (ACE_RB_T ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_successor"); if (x->right ()) + { return RB_tree_minimum (x->right ()); + } ACE_RB_Tree_Node<EXT_ID, INT_ID> *y = x->parent (); while ((y) && (x == y->right ())) - { - x = y; - y = y->parent (); - } + { + x = y; + y = y->parent (); + } return y; } + // Method to find the predecessor node of the given node in the tree. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<EXT_ID, INT_ID> * @@ -472,19 +524,21 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_predecessor (ACE_RB ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_predecessor"); if (x->left ()) + { return RB_tree_maximum (x->left ()); + } ACE_RB_Tree_Node<EXT_ID, INT_ID> *y = x->parent (); - while ((y) && (x == y->left ())) - { - x = y; - y = y->parent (); - } + { + x = y; + y = y->parent (); + } return y; } + // Method to find the minimum node of the subtree rooted at the given node. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<EXT_ID, INT_ID> * @@ -493,11 +547,14 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_minimum (ACE_RB_Tre ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_minimum"); while ((x) && (x->left ())) + { x = x->left (); + } return x; } + // Method to find the maximum node of the subtree rooted at the given node. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<EXT_ID, INT_ID> * @@ -506,15 +563,18 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_maximum (ACE_RB_Tre ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_maximum"); while ((x) && (x->right ())) + { x = x->right (); + } return x; } -// Close down an RB_Tree. this method should only be called with -// locks already held. +// Close down an RB_Tree. this method should +// only be called with locks already held. -template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> int +template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> +int ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close_i () { ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close_i"); @@ -526,9 +586,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close_i () return 0; } -// Returns a pointer to the item corresponding to the given key, or 0 -// if it cannot find the key in the tree. This method should only be -// called with locks already held. +// Returns a pointer to the item corresponding to the given key, +// or 0 if it cannot find the key in the tree. This method should +// only be called with locks already held. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> int ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find_i (const EXT_ID &k, @@ -541,26 +601,30 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find_i (const EXT_ID &k, ACE_RB_Tree_Node<EXT_ID, INT_ID> *current = find_node (k, result); if (current && result == EXACT) - { - // Found an exact match: return a pointer to the node. - entry = current; - return 0; - } + { + // Found an exact match: return a pointer to the node. + entry = current; + return 0; + } else + { // The node is not there. return -1; + } } -// Inserts a *copy* of the key and the item into the tree: both the -// key type EXT_ID and the item type INT_ID must have well defined -// semantics for copy construction and < comparison. This method -// returns a pointer to the inserted item copy, or 0 if an error -// occurred. NOTE: if an identical key already exists in the tree, no -// new item is created, and the returned pointer addresses the -// existing item associated with the existing key. This method should + +// Inserts a *copy* of the key and the item into the tree: +// both the key type EXT_ID and the item type INT_ID must have well +// defined semantics for copy construction and < comparison. +// This method returns a pointer to the inserted item copy, +// or 0 if an error occurred. NOTE: if an identical key +// already exists in the tree, no new item is created, and +// the returned pointer addresses the existing item +// associated with the existing key. This method should // only be called with locks already held. -template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> INT_ID * +template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> INT_ID* ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, const INT_ID &t) { ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, const INT_ID &t)"); @@ -569,105 +633,116 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, RB_SearchResult result = LEFT; ACE_RB_Tree_Node<EXT_ID, INT_ID> *current = find_node (k, result); if (current) + { + // If the keys match, just return a pointer to the node's item. + if (result == EXACT) { - // If the keys match, just return a pointer to the node's item. - if (result == EXACT) - return ¤t->item (); - - // Otherwise if we're to the left of the insertion point, insert - // into the right subtree. - else if (result == LEFT) + return &(current->item ()); + } + // Otherwise if we're to the left of the insertion + // point, insert into the right subtree. + else if (result == LEFT) + { + if (current->right ()) + { + // If there is already a right subtree, complain. + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), + ASYS_TEXT ("\nright subtree already present in " + "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0); + } + else + { + // The right subtree is empty: insert new node there. + current->right (new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t)); + if (current->right ()) { - if (current->right ()) - // If there is already a right subtree, complain. - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("\nright subtree already present in ") - ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), - 0); - else - { - // The right subtree is empty: insert new node there. - ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0; - - ACE_NEW_RETURN (tmp, - (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t), - 0); - current->right (tmp); - - // If the node was successfully inserted, set its - // parent, rebalance the tree, color the root black, and - // return a pointer to the inserted item. - INT_ID *item = &(current->right ()->item ()); - current->right ()->parent (current); - RB_rebalance (current->right ()); - root_->color (ACE_RB_Tree_Node_Base::BLACK); - ++current_size_; - return item; - } + // If the node was successfully inserted, set its parent, rebalance + // the tree, color the root black, and return a pointer to the + // inserted item. + INT_ID *item = &(current->right ()->item ()); + current->right ()->parent (current); + RB_rebalance (current->right ()); + root_->color (ACE_RB_Tree_Node_Base::BLACK); + ++current_size_; + return item; } - // Otherwise, we're to the right of the insertion point, so - // insert into the left subtree. - else // (result == RIGHT) + else { - if (current->left ()) - // If there is already a left subtree, complain. - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("\nleft subtree already present in ") - ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), - 0); - else - { - // The left subtree is empty: insert new node there. - ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0; - ACE_NEW_RETURN (tmp, - (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t), - 0); - current->left (tmp); - - // If the node was successfully inserted, set its - // parent, rebalance the tree, color the root black, and - // return a pointer to the inserted item. - INT_ID *item = ¤t->left ()->item (); - current->left ()->parent (current); - RB_rebalance (current->left ()); - root_->color (ACE_RB_Tree_Node_Base::BLACK); - ++current_size_; - return item; - } + // Memory allocation failed. + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), + ASYS_TEXT ("\nmemory allocation to current->right_ failed " + "in ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0); } + } } - else + // Otherwise, we're to the right of the insertion + // point, so insert into the left subtree. + else // (result == RIGHT) { - // The tree is empty: insert at the root and color the root - // black. - ACE_NEW_RETURN (root_, - (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t), - 0); - if (root_) + if (current->left ()) + { + // If there is already a left subtree, complain. + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), + ASYS_TEXT ("\nleft subtree already present in " + "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0); + } + else + { + // The left subtree is empty: insert new node there. + current->left (new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t)); + if (current->left ()) { + // If the node was successfully inserted, set its parent, rebalance + // the tree, color the root black, and return a pointer to the + // inserted item. + INT_ID *item = &(current->left ()->item ()); + current->left ()->parent (current); + RB_rebalance (current->left ()); root_->color (ACE_RB_Tree_Node_Base::BLACK); ++current_size_; - return &root_->item (); + return item; + } + else + { + // Memory allocation failed. + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), + ASYS_TEXT ("\nmemory allocation to current->left_ failed in " + "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0); } + } } - return 0; + } + else + { + // The tree is empty: insert at the root and color the root black. + root_ = new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t); + if (root_) + { + root_->color (ACE_RB_Tree_Node_Base::BLACK); + ++current_size_; + return &(root_->item ()); + } + else + { + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), + ASYS_TEXT ("\nmemory allocation to root_ failed in " + "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0); + } + } } + // Inserts a *copy* of the key and the item into the tree: both the -// key type EXT_ID and the item type INT_ID must have well defined -// semantics for copy construction. The default implementation also -// requires that the key type support well defined < semantics. This -// method passes back a pointer to the inserted (or existing) node, -// and the search status. If the node already exists, the method -// returns 1. If the node does not exist, and a new one is -// successfully created, and the method returns 0. If there was an -// error, the method returns -1. +// key type EXT_ID and the item type INT_ID must have well defined semantics +// for copy construction. The default implementation also requires that +// the key type support well defined < semantics. This method passes back +// a pointer to the inserted (or existing) node, and the search status. If +// the node already exists, the method returns 1. If the node does not +// exist, and a new one is successfully created, and the method returns 0. +// If there was an error, the method returns -1. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> int -ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, - const INT_ID &t, +ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, const INT_ID &t, ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry) { ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, const INT_ID &t, " @@ -677,95 +752,112 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, RB_SearchResult result = LEFT; ACE_RB_Tree_Node<EXT_ID, INT_ID> *current = find_node (k, result); if (current) + { + // If the keys match, just return a pointer to the node's item. + if (result == EXACT) + { + entry = current; + return 1; + } + // Otherwise if we're to the left of the insertion + // point, insert into the right subtree. + else if (result == LEFT) { - // If the keys match, just return a pointer to the node's item. - if (result == EXACT) + if (current->right ()) + { + // If there is already a right subtree, complain. + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), + ASYS_TEXT ("\nright subtree already present in " + "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1); + } + else + { + // The right subtree is empty: insert new node there. + current->right (new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t)); + if (current->right ()) { - entry = current; - return 1; + // If the node was successfully inserted, set its parent, rebalance + // the tree, color the root black, and return a pointer to the + // inserted item. + entry = current->right (); + current->right ()->parent (current); + RB_rebalance (current->right ()); + root_->color (ACE_RB_Tree_Node_Base::BLACK); + ++current_size_; + return 0; } - // Otherwise if we're to the left of the insertion - // point, insert into the right subtree. - else if (result == LEFT) + else { - if (current->right ()) - { - // If there is already a right subtree, complain. - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("\nright subtree already present in ") - ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), - -1); - } - else - { - // The right subtree is empty: insert new node there. - ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0; - ACE_NEW_RETURN (tmp, - (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t), - -1); - current->right (tmp); - - // If the node was successfully inserted, set its parent, rebalance - // the tree, color the root black, and return a pointer to the - // inserted item. - entry = current->right (); - current->right ()->parent (current); - RB_rebalance (current->right ()); - root_->color (ACE_RB_Tree_Node_Base::BLACK); - ++current_size_; - return 0; - } + // Memory allocation failed. + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), + ASYS_TEXT ("\nmemory allocation to current->right_ failed " + "in ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1); } - // Otherwise, we're to the right of the insertion point, so - // insert into the left subtree. - else // (result == RIGHT) + } + } + // Otherwise, we're to the right of the insertion + // point, so insert into the left subtree. + else // (result == RIGHT) + { + if (current->left ()) + { + // If there is already a left subtree, complain. + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), + ASYS_TEXT ("\nleft subtree already present in " + "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1); + } + else + { + // The left subtree is empty: insert new node there. + current->left (new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t)); + if (current->left ()) { - if (current->left ()) - // If there is already a left subtree, complain. - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("\nleft subtree already present in ") - ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), - -1); - else - { - // The left subtree is empty: insert new node there. - ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0; - ACE_NEW_RETURN (tmp, - (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t), - -1); - current->left (tmp); - // If the node was successfully inserted, set its - // parent, rebalance the tree, color the root black, and - // return a pointer to the inserted item. - entry = current->left (); - current->left ()->parent (current); - RB_rebalance (current->left ()); - root_->color (ACE_RB_Tree_Node_Base::BLACK); - ++current_size_; - return 0; - } + // If the node was successfully inserted, set its parent, rebalance + // the tree, color the root black, and return a pointer to the + // inserted item. + entry = current->left (); + current->left ()->parent (current); + RB_rebalance (current->left ()); + root_->color (ACE_RB_Tree_Node_Base::BLACK); + ++current_size_; + return 0; } + else + { + // Memory allocation failed. + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), + ASYS_TEXT ("\nmemory allocation to current->left_ failed in " + "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1); + } + } } + } else + { + // The tree is empty: insert at the root and color the root black. + root_ = new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t); + if (root_) { - // The tree is empty: insert at the root and color the root black. - ACE_NEW_RETURN (root_, - (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t), - -1); root_->color (ACE_RB_Tree_Node_Base::BLACK); ++current_size_; entry = root_; return 0; } + else + { + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), + ASYS_TEXT ("\nmemory allocation to root_ failed in " + "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1); + } + } } -// Removes the item associated with the given key from the tree and -// destroys it. Returns 1 if it found the item and successfully -// destroyed it, 0 if it did not find the item, or -1 if an error -// occurred. This method should only be called with locks already -// held. + +// Removes the item associated with the given key from the +// tree and destroys it. Returns 1 if it found the item +// and successfully destroyed it, 0 if it did not find the +// item, or -1 if an error occurred. This method should +// only be called with locks already held. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> int ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (const EXT_ID &k, INT_ID &i) @@ -782,7 +874,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (const EXT_ID &k, { // Return the internal id stored in the deleted node. i = z->item (); - return -1 == this->remove_i (z) ? -1 : 1; + return (-1 == this->remove_i (z)) ? -1 : 1; } else { @@ -796,46 +888,56 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (ACE_RB_Tree_Node< { ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> *z)"); - // Delete the node and reorganize the tree to satisfy the Red-Black - // properties. + // Delete the node and reorganize the tree to satisfy the Red-Black properties. - ACE_RB_Tree_Node<EXT_ID, INT_ID> *x; - ACE_RB_Tree_Node<EXT_ID, INT_ID> *y; + ACE_RB_Tree_Node<EXT_ID, INT_ID> *x, *y; - if (z->left () && z->right ()) + if ((z->left ()) && (z->right ())) + { y = RB_tree_successor (z); + } else + { y = z; - + } if (y->left ()) + { x = y->left (); + } else + { x = y->right (); - + } if (x) - x->parent (y->parent ()); - + { + x->parent (y->parent ()); + } if (y->parent ()) + { + if (y == y->parent ()->left ()) { - if (y == y->parent ()->left ()) - y->parent ()->left (x); - else - y->parent ()->right (x); + y->parent ()->left (x); + } + else + { + y->parent ()->right (x); } + } else + { root_ = x; - + } if (y != z) - { - // Copy the elements of y into z. - z->key () = y->key (); - z->item () = y->item (); - } - + { + // Copy the elements of y into z. + z->key () = y->key (); + z->item () = y->item (); + } // CLR pp. 263 says that nil nodes are implicitly colored BLACK if (!y || y->color () == ACE_RB_Tree_Node_Base::BLACK) + { RB_delete_fixup (x); - + } y->parent (0); y->right (0); y->left (0); @@ -845,6 +947,13 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (ACE_RB_Tree_Node< return 0; } + + +/////////////////////////////////////////////////////////////////////// +// template class // +// ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> // +/////////////////////////////////////////////////////////////////////// + ACE_ALLOC_HOOK_DEFINE(ACE_RB_Tree_Iterator_Base) // Constructor. @@ -857,9 +966,13 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_I // Position the iterator at the first (or last) node in the tree. if (set_first) - node_ = tree_->RB_tree_minimum (tree_->root_); + { + node_ = tree_->RB_tree_minimum (tree_->root_); + } else - node_ = tree_->RB_tree_maximum (tree_->root_); + { + node_ = tree_->RB_tree_maximum (tree_->root_); + } } // Copy constructor. @@ -882,6 +995,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator= (co node_ = iter.node_; } + // Destructor. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -890,6 +1004,12 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_ ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Iterator_Base"); } + +////////////////////////////////////////////////////////////////// +// template class // +// ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> // +////////////////////////////////////////////////////////////////// + ACE_ALLOC_HOOK_DEFINE(ACE_RB_Tree_Iterator) // Constructor. @@ -902,6 +1022,7 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterat ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator"); } + // Destructor. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -910,6 +1031,11 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Itera ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Iterator"); } +////////////////////////////////////////////////////////////////////////// +// template class // +// ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> // +////////////////////////////////////////////////////////////////////////// + ACE_ALLOC_HOOK_DEFINE(ACE_RB_Tree_Reverse_Iterator) // Constructor. @@ -921,6 +1047,7 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tre ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Reverse_Iterator"); } + // Destructor. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -929,4 +1056,5 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tr ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Reverse_Iterator"); } + #endif /* !defined (ACE_RB_TREE_C) */ diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h index f75160d9a01..7b61793711a 100644 --- a/ace/RB_Tree.h +++ b/ace/RB_Tree.h @@ -473,6 +473,10 @@ public: // = Iteration methods. + int next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const; + // Passes back the <entry> under the iterator. Returns 0 if + // the iteration has completed, otherwise 1. + int done (void) const; // Returns 1 when the iteration has completed, otherwise 0. @@ -577,17 +581,6 @@ public: ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. - int next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const; - // Passes back the <entry> under the iterator. Returns 0 if - // the iteration has completed, otherwise 1. This method must - // be declared and defined in both the derived forward and - // reverse iterator classes rather than in the base iterator - // class because of a method signature resolution problem - // caused by the existence of the deprecated next (void) - // method in the derived forward iterator class. When that - // deprecated method is removed, this method should be removed - // from the derived classes and placed in the base class. - // = DEPRECATED methods. Please migrate your code to use the new methods instead EXT_ID *key (void); @@ -666,17 +659,6 @@ public: ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. - int next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const; - // Passes back the <entry> under the iterator. Returns 0 if - // the iteration has completed, otherwise 1. This method must - // be declared and defined in both the derived forward and - // reverse iterator classes rather than in the base iterator - // class because of a method signature resolution problem - // caused by the existence of the deprecated next (void) - // method in the derived forward iterator class. When that - // deprecated method is removed, this method should be removed - // from the derived classes and placed in the base class. - }; #if defined (__ACE_INLINE__) diff --git a/ace/RB_Tree.i b/ace/RB_Tree.i index 094812f3359..be04facc288 100644 --- a/ace/RB_Tree.i +++ b/ace/RB_Tree.i @@ -724,6 +724,25 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::current_size () // ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> // /////////////////////////////////////////////////////////////////////// +// Passes back the <entry> under the iterator. Returns 0 if +// the iteration has completed, otherwise 1. + +template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> +ACE_INLINE int +ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const +{ + ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next"); + + if (this->node_) + { + next_entry = this->node_; + return 1; + } + + return 0; +} + + // Returns 1 when the iteration has completed, otherwise 0. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -909,32 +928,6 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (int) } -// Passes back the <entry> under the iterator. Returns 0 if -// the iteration has completed, otherwise 1. This method must -// be declared and defined in both the derived forward and -// reverse iterator classes rather than in the base iterator -// class because of a method signature resolution problem -// caused by the existence of the deprecated next (void) -// method in the derived forward iterator class. When that -// deprecated method is removed, this method should be removed -// from the derived classes and placed in the base class. - -template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> -ACE_INLINE int -ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const -{ - ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next"); - - if (this->node_) - { - next_entry = this->node_; - return 1; - } - - return 0; -} - - // Accessor for key of node under iterator (if any). DEPRECATED. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -1102,34 +1095,3 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- this->forward_i (); return retv; } - - -// Passes back the <entry> under the iterator. Returns 0 if -// the iteration has completed, otherwise 1. This method must -// be declared and defined in both the derived forward and -// reverse iterator classes rather than in the base iterator -// class because of a method signature resolution problem -// caused by the existence of the deprecated next (void) -// method in the derived forward iterator class. When that -// deprecated method is removed, this method should be removed -// from the derived classes and placed in the base class. - -template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> -ACE_INLINE int -ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const -{ - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next"); - - if (this->node_) - { - next_entry = this->node_; - return 1; - } - - return 0; -} - - - - - diff --git a/ace/README b/ace/README index 44e5118b055..bacb522154d 100644 --- a/ace/README +++ b/ace/README @@ -169,9 +169,6 @@ ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR Compiler handles explicit calling of template destructor correctly. See "ace/OS.h" for details. -ACE_HAS_BROKEN_ACCEPT_ADDR Platform can't correctly deal - with a NULL addr to accept() - (e.g, VxWorks). ACE_HAS_BROKEN_NAMESPACES Compiler/platform doesn't support namespaces (or the support is not fully @@ -379,9 +376,6 @@ ACE_HAS_OSF_TIMOD_H Platform supports the OSF TLI ACE_HAS_PENTIUM Platform is an Intel Pentium microprocessor. ACE_HAS_POLL Platform contains <poll.h> -ACE_HAS_POSITION_INDEPENDENT_MALLOC The ACE_Malloc<> class uses - "position-independent" features - provided by ACE_Based_Pointer<>. ACE_HAS_POSIX_NONBLOCK Platform supports POSIX O_NONBLOCK semantics ACE_HAS_POSIX_SEM Platform supports POSIX @@ -411,8 +405,6 @@ ACE_HAS_PTHREADS_DRAFT7 Platform's 'Pthreads' is .1c draft 7 ACE_HAS_PTHREADS_STD Platform supports POSIX.1c-1995 threads (This is the final standard Pthreads). -ACE_HAS_PTHREADS_UNIX98_EXT Platform has the UNIX98 extensions to - Pthreads (susp/cont, rwlocks) ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP Platform has pthread_condattr_setkind_np(). ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP Platform has pthread_mutexattr_setkind_np(). diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp index ebf860d9786..bb43fcbdee8 100644 --- a/ace/Reactor.cpp +++ b/ace/Reactor.cpp @@ -35,19 +35,15 @@ ACE_Reactor::ACE_Reactor (ACE_Reactor_Impl *impl, || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) \ || defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) #if defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) - ACE_NEW (impl, - ACE_TP_Reactor); + ACE_NEW (impl, ACE_TP_Reactor); #else - ACE_NEW (impl, - ACE_Select_Reactor); + ACE_NEW (impl, ACE_Select_Reactor); #endif /* ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL */ #else /* We are on Win32 and we have winsock and ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL is not defined */ #if defined (ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL) - ACE_NEW (impl, - ACE_Msg_WFMO_Reactor); + ACE_NEW (impl, ACE_Msg_WFMO_Reactor); #else - ACE_NEW (impl, - ACE_WFMO_Reactor); + ACE_NEW (impl, ACE_WFMO_Reactor); #endif /* ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL */ #endif /* !defined (ACE_WIN32) || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) */ this->implementation (impl); @@ -84,9 +80,7 @@ ACE_Reactor::instance (void) if (ACE_Reactor::reactor_ == 0) { - ACE_NEW_RETURN (ACE_Reactor::reactor_, - ACE_Reactor, - 0); + ACE_NEW_RETURN (ACE_Reactor::reactor_, ACE_Reactor, 0); ACE_Reactor::delete_reactor_ = 1; } } diff --git a/ace/Reactor.h b/ace/Reactor.h index cf26d6fb25d..9cc24fac749 100644 --- a/ace/Reactor.h +++ b/ace/Reactor.h @@ -135,11 +135,6 @@ public: // = Event loop drivers. - virtual int work_pending (const ACE_Time_Value &max_wait_time = ACE_Time_Value::zero); - // Returns non-zero if there are I/O events "ready" for dispatching, - // but does not actually dispatch the event handlers. By default, - // don't block while checking this, i.e., "poll". - virtual int handle_events (ACE_Time_Value *max_wait_time = 0); virtual int alertable_handle_events (ACE_Time_Value *max_wait_time = 0); // This event loop driver blocks for up to <max_wait_time> before diff --git a/ace/Reactor.i b/ace/Reactor.i index 847857a96bb..9bc9c833eac 100644 --- a/ace/Reactor.i +++ b/ace/Reactor.i @@ -53,12 +53,6 @@ ACE_Reactor::close (void) } ACE_INLINE int -ACE_Reactor::work_pending (const ACE_Time_Value &max_wait_time) -{ - return this->implementation ()->work_pending (max_wait_time); -} - -ACE_INLINE int ACE_Reactor::handle_events (ACE_Time_Value *max_wait_time) { return this->implementation ()->handle_events (max_wait_time); diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h index 67d12ec66c1..e5ed3b2f18f 100644 --- a/ace/Reactor_Impl.h +++ b/ace/Reactor_Impl.h @@ -116,10 +116,6 @@ public: // Close down and release all resources. // = Event loop drivers. - virtual int work_pending (const ACE_Time_Value &max_wait_time = ACE_Time_Value::zero) = 0; - // Returns non-zero if there are I/O events "ready" for dispatching, - // but does not actually dispatch the event handlers. By default, - // don't block while checking this, i.e., "poll". virtual int handle_events (ACE_Time_Value *max_wait_time = 0) = 0; virtual int alertable_handle_events (ACE_Time_Value *max_wait_time = 0) = 0; diff --git a/ace/Registry_Name_Space.cpp b/ace/Registry_Name_Space.cpp index 30686c25d52..543ddd1a4e2 100644 --- a/ace/Registry_Name_Space.cpp +++ b/ace/Registry_Name_Space.cpp @@ -16,8 +16,7 @@ ACE_Registry_Name_Space::ACE_Registry_Name_Space (void) ACE_Registry_Name_Space::ACE_Registry_Name_Space (ACE_Name_Options *name_options) { if (this->open (name_options) != 0) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_Registry_Name_Space::open"))); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Registry_Name_Space::open"))); } @@ -26,19 +25,17 @@ ACE_Registry_Name_Space::~ACE_Registry_Name_Space (void) } -int +int ACE_Registry_Name_Space::open (ACE_Name_Options *name_options) { - const ASYS_TCHAR *host = name_options->nameserver_host (); + const char *host = name_options->nameserver_host (); ACE_Registry::Naming_Context predefined; - + int result = ACE_Predefined_Naming_Contexts::connect (predefined, HKEY_LOCAL_MACHINE, - ASYS_ONLY_WIDE_STRING (host)); + ACE_WIDE_STRING (host)); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_Predefined_Naming_Context::connect")), - result); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Predefined_Naming_Context::connect")), result); else { // Directory @@ -58,68 +55,68 @@ ACE_Registry_Name_Space::open (ACE_Name_Options *name_options) } -int -ACE_Registry_Name_Space::bind (const ACE_WString &name, - const ACE_WString &value, +int +ACE_Registry_Name_Space::bind (const ACE_WString &name, + const ACE_WString &value, const char *type) { // Pointer to data const ACE_USHORT16 *data = value.fast_rep (); - + // Size u_long size = value.length () * sizeof (ACE_USHORT16); - + // Represent value as an ACE_Registry::Object ACE_Registry::Object object ((void *) data, size, REG_SZ); // Add new <key>/<value> pair - return this->context_.bind (name.fast_rep(), + return this->context_.bind (name.fast_rep(), object); } -int -ACE_Registry_Name_Space::rebind (const ACE_WString &name, - const ACE_WString &value, +int +ACE_Registry_Name_Space::rebind (const ACE_WString &name, + const ACE_WString &value, const char *type) { // Pointer to data const ACE_USHORT16 *data = value.fast_rep (); - + // Size u_long size = value.length () * sizeof (ACE_USHORT16); - + // Represent value as an ACE_Registry::Object ACE_Registry::Object object ((void *) data, size, REG_SZ); // Add new <key>/<value> pair - return this->context_.rebind (name.fast_rep (), + return this->context_.rebind (name.fast_rep (), object); } -int +int ACE_Registry_Name_Space::unbind (const ACE_WString &name) { return this->context_.unbind (name.fast_rep ()); } -int -ACE_Registry_Name_Space::resolve (const ACE_WString &name, - ACE_WString &value, +int +ACE_Registry_Name_Space::resolve (const ACE_WString &name, + ACE_WString &value, char *&type) { - // This object will be used to query the size of the data. + // This object will be used to query the size of the data. // Note: The query_object.data will be null for this invocation. ACE_Registry::Object query_object; int result = this->context_.resolve (name.fast_rep (), query_object); if (result != 0) return result; - // Resize the value passed by the user + // Resize the value passed by the user // Note: -1 is used because the size includes the null terminator value.resize ((query_object.size () - 1) / sizeof (ACE_USHORT16)); @@ -137,9 +134,9 @@ ACE_Registry_Name_Space::resolve (const ACE_WString &name, return 0; } - -int -ACE_Registry_Name_Space:: list_names (ACE_WSTRING_SET &set, + +int +ACE_Registry_Name_Space:: list_names (ACE_WSTRING_SET &set, const ACE_WString &pattern) { ACE_BINDING_SET binding_set; @@ -147,7 +144,7 @@ ACE_Registry_Name_Space:: list_names (ACE_WSTRING_SET &set, pattern); if (result != 0) return result; - + ACE_BINDING_ITERATOR iterator (binding_set); for (ACE_Name_Binding *entry = 0; @@ -160,8 +157,8 @@ ACE_Registry_Name_Space:: list_names (ACE_WSTRING_SET &set, } -int -ACE_Registry_Name_Space::list_values (ACE_WSTRING_SET &set, +int +ACE_Registry_Name_Space::list_values (ACE_WSTRING_SET &set, const ACE_WString &pattern) { ACE_BINDING_SET binding_set; @@ -169,7 +166,7 @@ ACE_Registry_Name_Space::list_values (ACE_WSTRING_SET &set, pattern); if (result != 0) return result; - + ACE_BINDING_ITERATOR iterator (binding_set); for (ACE_Name_Binding *entry = 0; @@ -182,16 +179,16 @@ ACE_Registry_Name_Space::list_values (ACE_WSTRING_SET &set, } -int -ACE_Registry_Name_Space::list_types (ACE_WSTRING_SET &set, +int +ACE_Registry_Name_Space::list_types (ACE_WSTRING_SET &set, const ACE_WString &pattern) { return 0; } -int -ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set, +int +ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set, const ACE_WString &pattern) { ACE_Registry::Binding_List list; @@ -206,22 +203,22 @@ ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set, { // Yeeesss! STL rules! ACE_Registry::Binding &binding = *i; - + if (binding.type () == ACE_Registry::OBJECT) - { + { // Key ACE_Registry::Istring string = binding.name (); ACE_WString key (string.c_str ()); - + // Value ACE_WString value; char *type = 0; result = this->resolve (key, value, - type); + type); if (result != 0) ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Registry::Naming_Context::resolve")), result); - + // Complete binding ACE_Name_Binding binding (key, value, type); set.insert (binding); @@ -231,23 +228,23 @@ ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set, } -int -ACE_Registry_Name_Space::list_value_entries (ACE_BINDING_SET &set, +int +ACE_Registry_Name_Space::list_value_entries (ACE_BINDING_SET &set, const ACE_WString &pattern) { return this->list_name_entries (set, pattern); } -int -ACE_Registry_Name_Space::list_type_entries (ACE_BINDING_SET &set, +int +ACE_Registry_Name_Space::list_type_entries (ACE_BINDING_SET &set, const ACE_WString &pattern) { return this->list_name_entries (set, pattern); } -void +void ACE_Registry_Name_Space::dump (void) const { } diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp index e33702af313..cbd886b0d13 100644 --- a/ace/Remote_Name_Space.cpp +++ b/ace/Remote_Name_Space.cpp @@ -7,11 +7,11 @@ ACE_RCSID(ace, Remote_Name_Space, "$Id$") int -ACE_Remote_Name_Space::open (const ASYS_TCHAR *servername, u_short port) +ACE_Remote_Name_Space::open (const char *servername, u_short port) { ACE_TRACE ("ACE_Remote_Name_Space::open"); ACE_INET_Addr servaddr; - + // Initialize Addr if (servaddr.set (port, servername) == -1) return -1; @@ -19,7 +19,7 @@ ACE_Remote_Name_Space::open (const ASYS_TCHAR *servername, u_short port) // Connect to Name Server process. if (this->ns_proxy_.open (servaddr) == -1) return -1; - + return 0; } @@ -28,7 +28,7 @@ ACE_Remote_Name_Space::ACE_Remote_Name_Space (void) ACE_TRACE ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"); } -ACE_Remote_Name_Space::ACE_Remote_Name_Space (const ASYS_TCHAR *hostname, +ACE_Remote_Name_Space::ACE_Remote_Name_Space (const char *hostname, u_short port) { ACE_TRACE ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"); @@ -36,9 +36,9 @@ ACE_Remote_Name_Space::ACE_Remote_Name_Space (const ASYS_TCHAR *hostname, ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"))); } -int -ACE_Remote_Name_Space::bind (const ACE_WString &name, - const ACE_WString &value, +int +ACE_Remote_Name_Space::bind (const ACE_WString &name, + const ACE_WString &value, const char *type) { ACE_TRACE ("ACE_Remote_Name_Space::bind"); @@ -47,14 +47,14 @@ ACE_Remote_Name_Space::bind (const ACE_WString &name, name.length () * sizeof (ACE_USHORT16), value.fast_rep (), value.length () * sizeof (ACE_USHORT16), - type, + type, ACE_OS::strlen (type)); return this->ns_proxy_.request_reply (request); } -int -ACE_Remote_Name_Space::rebind (const ACE_WString &name, - const ACE_WString &value, +int +ACE_Remote_Name_Space::rebind (const ACE_WString &name, + const ACE_WString &value, const char *type) { ACE_TRACE ("ACE_Remote_Name_Space::rebind"); @@ -63,14 +63,14 @@ ACE_Remote_Name_Space::rebind (const ACE_WString &name, name.length () * sizeof (ACE_USHORT16), value.fast_rep (), value.length () * sizeof (ACE_USHORT16), - type, + type, ACE_OS::strlen (type)); return this->ns_proxy_.request_reply (request); } -int -ACE_Remote_Name_Space::resolve (const ACE_WString &name, - ACE_WString &value, +int +ACE_Remote_Name_Space::resolve (const ACE_WString &name, + ACE_WString &value, char *&type) { ACE_TRACE ("ACE_Remote_Name_Space::resolve"); @@ -89,14 +89,14 @@ ACE_Remote_Name_Space::resolve (const ACE_WString &name, ACE_WString temp (reply.value (), reply.value_len () / sizeof (ACE_USHORT16)); value = temp; - ACE_NEW_RETURN (type, + ACE_NEW_RETURN (type, char[reply.type_len () + 1], -1); ACE_OS::strcpy (type, reply.type ()); return 0; } -int +int ACE_Remote_Name_Space::unbind (const ACE_WString &name) { ACE_TRACE ("ACE_Remote_Name_Space::unbind"); @@ -107,8 +107,8 @@ ACE_Remote_Name_Space::unbind (const ACE_WString &name) return this->ns_proxy_.request_reply (request); } -int -ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set, +int +ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set, const ACE_WString &pattern) { ACE_TRACE ("ACE_Remote_Name_Space::list_names"); @@ -118,7 +118,7 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set, 0, 0, 0, 0); if (this->ns_proxy_.send_request (request) == -1) return -1; - + ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0); while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) @@ -138,8 +138,8 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set, return 0; } -int -ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set, +int +ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set, const ACE_WString &pattern) { ACE_TRACE ("ACE_Remote_Name_Space::list_values"); @@ -149,7 +149,7 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set, 0, 0, 0, 0); if (this->ns_proxy_.send_request (request) == -1) return -1; - + ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0); while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) @@ -170,8 +170,8 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set, return 0; } -int -ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set, +int +ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set, const ACE_WString &pattern) { ACE_TRACE ("ACE_Remote_Name_Space::list_types"); @@ -182,7 +182,7 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set, if (this->ns_proxy_.send_request (request) == -1) return -1; - + ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0); while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) @@ -202,8 +202,8 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set, return 0; } -int -ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set, +int +ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set, const ACE_WString &pattern) { ACE_TRACE ("ACE_Remote_Name_Space::list_names"); @@ -214,7 +214,7 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set, if (this->ns_proxy_.send_request (request) == -1) return -1; - + ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0); while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) @@ -240,8 +240,8 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set, return 0; } -int -ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set, +int +ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set, const ACE_WString &pattern) { ACE_TRACE ("ACE_Remote_Name_Space::list_values"); @@ -252,7 +252,7 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set, if (this->ns_proxy_.send_request (request) == -1) return -1; - + ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0); while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) @@ -278,8 +278,8 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set, return 0; } -int -ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set, +int +ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set, const ACE_WString &pattern) { ACE_TRACE ("ACE_Remote_Name_Space::list_types"); @@ -290,7 +290,7 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set, if (this->ns_proxy_.send_request (request) == -1) return -1; - + ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0); while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) @@ -330,3 +330,4 @@ ACE_Remote_Name_Space::dump (void) const this->ns_proxy_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } + diff --git a/ace/Remote_Name_Space.h b/ace/Remote_Name_Space.h index 154c57ece5c..3ba0b8edce9 100644 --- a/ace/Remote_Name_Space.h +++ b/ace/Remote_Name_Space.h @@ -48,12 +48,12 @@ public: ACE_Remote_Name_Space (void); // "Do-nothing" constructor. - ACE_Remote_Name_Space (const ASYS_TCHAR *hostname, u_short port); + ACE_Remote_Name_Space (const char *hostname, u_short port); // Specifies the scope of this namespace, opens and memory-maps the // associated file (if accessible) or contacts the dedicated name // server process for NET_LOCAL namespace. - int open (const ASYS_TCHAR *servername, u_short port); + int open (const char *servername, u_short port); // Specifies the scope of this namespace, opens and memory-maps the // associated file (if accessible) or contacts the dedicated name // server process for NET_LOCAL namespace. diff --git a/ace/Remote_Tokens.cpp b/ace/Remote_Tokens.cpp index 23c8426e0e6..72881602d7d 100644 --- a/ace/Remote_Tokens.cpp +++ b/ace/Remote_Tokens.cpp @@ -58,9 +58,7 @@ ACE_TSS_Connection::make_TSS_TYPE (void) const ACE_SOCK_Connector connector; ACE_SOCK_Stream *stream = 0; - ACE_NEW_RETURN (stream, - ACE_SOCK_Stream, - 0); + ACE_NEW_RETURN (stream, ACE_SOCK_Stream, 0); if (connector.connect (*stream, server_address_) == -1) { @@ -102,7 +100,7 @@ ACE_Remote_Token_Proxy::~ACE_Remote_Token_Proxy (void) } int -ACE_Remote_Token_Proxy::open (const ASYS_TCHAR *name, +ACE_Remote_Token_Proxy::open (const char *name, int ignore_deadlock, int debug) { @@ -125,8 +123,7 @@ ACE_Remote_Token_Proxy::initiate_connection (void) if (token_ == 0) { errno = ENOENT; - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("ACE_Remote_Token_Proxy not open.\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, "ACE_Remote_Token_Proxy not open.\n"), -1); } ACE_SOCK_Stream *peer = ACE_Token_Connections::instance ()->get_connection (); @@ -161,7 +158,7 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request, // Receive reply via blocking read. - if (peer->recv (&reply, sizeof reply) != sizeof reply) + if (peer->recv (&reply, sizeof reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("recv failed")), -1); if (reply.decode () == -1) @@ -212,8 +209,8 @@ ACE_Remote_Token_Proxy::acquire (int notify, default : ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%t) %p shadow acquire failed\n"), - ASYS_TEXT ("ACE_Remote_Token_Proxy")), + "(%t) %p shadow acquire failed\n", + "ACE_Remote_Token_Proxy"), -1); } } @@ -221,8 +218,8 @@ ACE_Remote_Token_Proxy::acquire (int notify, ACE_Token_Request request (token_->type (), this->type (), ACE_Token_Request::ACQUIRE, - ASYS_ONLY_MULTIBYTE_STRING (this->name ()), - ASYS_ONLY_MULTIBYTE_STRING (this->client_id ()), + this->name (), + this->client_id (), options); request.notify (notify); @@ -272,8 +269,8 @@ ACE_Remote_Token_Proxy::tryacquire (void (*sleep_hook)(void *)) ACE_Token_Request request (token_->type (), this->type (), ACE_Token_Request::RELEASE, - ASYS_ONLY_MULTIBYTE_STRING (this->name ()), - ASYS_ONLY_MULTIBYTE_STRING (this->client_id ()), + this->name (), + this->client_id (), ACE_Synch_Options::synch); return this->request_reply (request, @@ -294,15 +291,15 @@ ACE_Remote_Token_Proxy::renew (int requeue_position, return -1; else if (debug_) ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) shadow: renew would block. owner %s.\n"), + "(%t) shadow: renew would block. owner %s.\n", this->token_->owner_id ())); } ACE_Token_Request request (token_->type (), this->type (), ACE_Token_Request::RENEW, - ASYS_ONLY_MULTIBYTE_STRING (this->name ()), - ASYS_ONLY_MULTIBYTE_STRING (this->client_id ()), + this->name (), + this->client_id (), options); request.requeue_position (requeue_position); @@ -317,8 +314,8 @@ ACE_Remote_Token_Proxy::renew (int requeue_position, ACE_Token_Proxy::release (); } ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p error on remote renew, releasing shadow mutex.\n"), - ASYS_TEXT ("ACE_Remote_Token_Proxy")), -1); + "%p error on remote renew, releasing shadow mutex.\n", + "ACE_Remote_Token_Proxy"), -1); } else { @@ -338,8 +335,8 @@ ACE_Remote_Token_Proxy::release (ACE_Synch_Options &options) ACE_Token_Request request (token_->type (), this->type (), ACE_Token_Request::RELEASE, - ASYS_ONLY_MULTIBYTE_STRING (this->name ()), - ASYS_ONLY_MULTIBYTE_STRING (this->client_id ()), + this->name (), + this->client_id (), options); int result = this->request_reply (request, options); @@ -350,7 +347,7 @@ ACE_Remote_Token_Proxy::release (ACE_Synch_Options &options) // If race conditions exist such that we are no longer the owner, // this release will perform a remove. if (ACE_Token_Proxy::release () == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%t) shadow: release failed\n"))); + ACE_ERROR ((LM_ERROR, "(%t) shadow: release failed\n")); return result; } @@ -372,7 +369,7 @@ ACE_Remote_Token_Proxy::token_acquired (ACE_TPQ_Entry *) // ACE_Token_Proxy::token_acquired (vp); } -const ASYS_TCHAR* +const char* ACE_Remote_Token_Proxy::owner_id (void) { ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id"); @@ -387,8 +384,8 @@ ACE_Remote_Token_Proxy::dump (void) const ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Tokens::dump:\n") - ASYS_TEXT (" ignore_shadow_deadlock_ = %d\n"), - ignore_shadow_deadlock_)); + " ignore_shadow_deadlock_ = %d\n", + ignore_shadow_deadlock_)); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n"))); ACE_Token_Proxy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -434,3 +431,4 @@ template class ACE_Singleton <ACE_TSS_Connection, ACE_TSS_CONNECTION_MUTEX>; #pragma instantiate ACE_TSS <ACE_SOCK_Stream> #pragma instantiate ACE_Singleton <ACE_TSS_Connection, ACE_TSS_CONNECTION_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/ace/Remote_Tokens.h b/ace/Remote_Tokens.h index 4aa5dab587c..f9fd4ee6664 100644 --- a/ace/Remote_Tokens.h +++ b/ace/Remote_Tokens.h @@ -51,7 +51,7 @@ public: virtual ~ACE_Remote_Token_Proxy (void); // Death. - int open (const ASYS_TCHAR *name, + int open (const char *name, int ignore_deadlock = 0, int debug = 0); // Same as Token_Proxy. <name> is the string uniquely identifying @@ -113,7 +113,7 @@ public: virtual void token_acquired (ACE_TPQ_Entry *); // Override the default to do nothing. - virtual const ASYS_TCHAR* owner_id (void); + virtual const char* owner_id (void); // the client id of the current token holder static void set_server_address (const ACE_INET_Addr &server_address); @@ -153,7 +153,7 @@ public: ACE_Remote_Mutex (void); // Null creation. Remote_Token_Proxy::open must be called. - ACE_Remote_Mutex (const ASYS_TCHAR *token_name, + ACE_Remote_Mutex (const char *token_name, int ignore_deadlock = 0, int debug = 0); // Calls Remote_Token_Proxy::open for you. @@ -165,7 +165,7 @@ public: // Return deep copy. protected: - virtual ACE_Tokens *create_token (const ASYS_TCHAR *name); + virtual ACE_Tokens *create_token (const char *name); // Make the correct type of ACE_Tokens. This is called by the Token // Manager. }; @@ -186,7 +186,7 @@ class ACE_Export ACE_Remote_RLock : public ACE_Remote_Token_Proxy public: ACE_Remote_RLock (void); - ACE_Remote_RLock (const ASYS_TCHAR *token_name, + ACE_Remote_RLock (const char *token_name, int ignore_deadlock = 0, int debug = 0); @@ -202,7 +202,7 @@ public: // Return deep copy. protected: - virtual ACE_Tokens *create_token (const ASYS_TCHAR *name); + virtual ACE_Tokens *create_token (const char *name); // Make the correct type of ACE_Tokens. This is called by the Token // Manager. }; @@ -222,7 +222,7 @@ class ACE_Export ACE_Remote_WLock : public ACE_Remote_Token_Proxy public: ACE_Remote_WLock (void); - ACE_Remote_WLock (const ASYS_TCHAR *token_name, + ACE_Remote_WLock (const char *token_name, int ignore_deadlock = 0, int debug = 0); @@ -238,7 +238,7 @@ public: // Return deep copy. protected: - virtual ACE_Tokens *create_token (const ASYS_TCHAR *name); + virtual ACE_Tokens *create_token (const char *name); // Make the correct type of ACE_Tokens. This is called by the Token // Manager. }; diff --git a/ace/Remote_Tokens.i b/ace/Remote_Tokens.i index 5392280cbe0..2a87bf30919 100644 --- a/ace/Remote_Tokens.i +++ b/ace/Remote_Tokens.i @@ -10,7 +10,7 @@ ACE_Remote_Mutex::ACE_Remote_Mutex (void) } ACE_INLINE -ACE_Remote_Mutex::ACE_Remote_Mutex (const ASYS_TCHAR *token_name, +ACE_Remote_Mutex::ACE_Remote_Mutex (const char *token_name, int ignore_deadlock, int debug) { @@ -27,7 +27,7 @@ ACE_Remote_Mutex::clone (void) const } ACE_INLINE ACE_Tokens * -ACE_Remote_Mutex::create_token (const ASYS_TCHAR *name) +ACE_Remote_Mutex::create_token (const char *name) { return new ACE_Mutex_Token (name); } @@ -35,7 +35,7 @@ ACE_Remote_Mutex::create_token (const ASYS_TCHAR *name) // ************************************************************ ACE_INLINE -ACE_Remote_RLock::ACE_Remote_RLock (const ASYS_TCHAR *token_name, +ACE_Remote_RLock::ACE_Remote_RLock (const char *token_name, int ignore_deadlock, int debug) { @@ -44,7 +44,7 @@ ACE_Remote_RLock::ACE_Remote_RLock (const ASYS_TCHAR *token_name, } ACE_INLINE ACE_Tokens * -ACE_Remote_RLock::create_token (const ASYS_TCHAR *name) +ACE_Remote_RLock::create_token (const char *name) { return new ACE_RW_Token (name); } @@ -66,7 +66,7 @@ ACE_Remote_RLock::clone (void) const // ************************************************************ ACE_INLINE -ACE_Remote_WLock::ACE_Remote_WLock (const ASYS_TCHAR *token_name, +ACE_Remote_WLock::ACE_Remote_WLock (const char *token_name, int ignore_deadlock, int debug) { @@ -76,7 +76,7 @@ ACE_Remote_WLock::ACE_Remote_WLock (const ASYS_TCHAR *token_name, ACE_INLINE ACE_Tokens * -ACE_Remote_WLock::create_token (const ASYS_TCHAR *name) +ACE_Remote_WLock::create_token (const char *name) { return new ACE_RW_Token (name); } @@ -94,3 +94,5 @@ ACE_Remote_WLock::clone (void) const ignore_deadlock_, debug_); } + + diff --git a/ace/SOCK.cpp b/ace/SOCK.cpp index 67a10d44d64..010b1c1f986 100644 --- a/ace/SOCK.cpp +++ b/ace/SOCK.cpp @@ -54,22 +54,6 @@ ACE_SOCK::get_local_addr (ACE_Addr &sa) const return 0; } -// Close down a ACE_SOCK. - -int -ACE_SOCK::close (void) -{ - ACE_TRACE ("ACE_SOCK::close"); - int result = 0; - - if (this->get_handle () != ACE_INVALID_HANDLE) - { - result = ACE_OS::closesocket (this->get_handle ()); - this->set_handle (ACE_INVALID_HANDLE); - } - return result; -} - int ACE_SOCK::open (int type, int protocol_family, @@ -85,8 +69,8 @@ ACE_SOCK::open (int type, if (this->get_handle () == ACE_INVALID_HANDLE) return -1; - else if (protocol_family != PF_UNIX - && reuse_addr + else if (protocol_family != PF_UNIX && + reuse_addr && this->set_option (SOL_SOCKET, SO_REUSEADDR, &one, @@ -98,76 +82,32 @@ ACE_SOCK::open (int type, return 0; } -// General purpose constructor for performing server ACE_SOCK -// creation. - -ACE_SOCK::ACE_SOCK (int type, - int protocol_family, - int protocol, - int reuse_addr) -{ - // ACE_TRACE ("ACE_SOCK::ACE_SOCK"); - if (this->open (type, - protocol_family, - protocol, - reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_SOCK::ACE_SOCK"))); -} +// Close down a ACE_SOCK. int -ACE_SOCK::open (int type, - int protocol_family, - int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr) +ACE_SOCK::close (void) { - ACE_TRACE ("ACE_SOCK::open"); - - this->set_handle (ACE_OS::socket (protocol_family, - type, - protocol, - protocolinfo, - g, - flags)); - - int one = 1; + ACE_TRACE ("ACE_SOCK::close"); + int result = 0; - if (this->get_handle () == ACE_INVALID_HANDLE) - return -1; - else if (reuse_addr - && this->set_option (SOL_SOCKET, - SO_REUSEADDR, - &one, - sizeof one) == -1) + if (this->get_handle () != ACE_INVALID_HANDLE) { - this->close (); - return -1; + result = ACE_OS::closesocket (this->get_handle ()); + this->set_handle (ACE_INVALID_HANDLE); } - return 0; + return result; } +// General purpose constructor for performing server ACE_SOCK +// creation. + ACE_SOCK::ACE_SOCK (int type, int protocol_family, int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, int reuse_addr) { // ACE_TRACE ("ACE_SOCK::ACE_SOCK"); - if (this->open (type, - protocol_family, - protocol, - protocolinfo, - g, - flags, - reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_SOCK::ACE_SOCK"))); + if (this->open (type, protocol_family, + protocol, reuse_addr) == -1) + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_SOCK::ACE_SOCK"))); } - diff --git a/ace/SOCK.h b/ace/SOCK.h index 6918bf12ff3..ff7fe250221 100644 --- a/ace/SOCK.h +++ b/ace/SOCK.h @@ -75,34 +75,14 @@ public: int protocol_family, int protocol, int reuse_addr); - // Wrapper around the BSD-style <socket> system call (no QoS). - - int open (int type, - int protocol_family, - int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr); - // Wrapper around the QoS-enabled <WSASocket> function. + // Wrapper around the <socket> system call. protected: ACE_SOCK (int type, int protocol_family, int protocol = 0, int reuse_addr = 0); - // Constructor with arguments to call the BSD-style <socket> system - // call (no QoS). - - ACE_SOCK (int type, - int protocol_family, - int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr); - // Constructor with arguments to call the QoS-enabled <WSASocket> - // function. + // Constructor with arguments to call the <socket> system call. ACE_SOCK (void); // Default constructor is private to prevent instances of this class diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp index 96726920173..04c8553631e 100644 --- a/ace/SOCK_Acceptor.cpp +++ b/ace/SOCK_Acceptor.cpp @@ -14,14 +14,14 @@ ACE_RCSID(ace, SOCK_Acceptor, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Acceptor) -// Do nothing routine for constructor. +// Do nothing routine for constructor. ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (void) { ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor"); } -// Performs the timed accept operation. +// Performs the timed accept operation. int ACE_SOCK_Acceptor::shared_accept_start (ACE_Time_Value *timeout, @@ -45,7 +45,7 @@ ACE_SOCK_Acceptor::shared_accept_start (ACE_Time_Value *timeout, ACE_NONBLOCK); // Set the handle into non-blocking mode if it's not already // in it. - if (in_blocking_mode + if (in_blocking_mode && ACE::set_flags (handle, ACE_NONBLOCK) == -1) return -1; @@ -82,7 +82,7 @@ ACE_SOCK_Acceptor::shared_accept_finish (ACE_SOCK_Stream new_stream, #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) if (reset_new_handle) // Reset the event association inherited by the new handle. - ::WSAEventSelect ((SOCKET) new_handle, 0, 0); + ::WSAEventSelect ((SOCKET) new_handle, 0, 0); #else ACE_UNUSED_ARG (reset_new_handle); #endif /* ACE_WIN32 */ @@ -90,12 +90,12 @@ ACE_SOCK_Acceptor::shared_accept_finish (ACE_SOCK_Stream new_stream, return new_handle == ACE_INVALID_HANDLE ? -1 : 0; } -// General purpose routine for accepting new connections. +// General purpose routine for accepting new connections. int -ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, - ACE_Addr *remote_addr, - ACE_Time_Value *timeout, +ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, + ACE_Addr *remote_addr, + ACE_Time_Value *timeout, int restart, int reset_new_handle) const { @@ -125,14 +125,14 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, new_stream.set_handle (ACE_OS::accept (this->get_handle (), addr, len_ptr)); - while (new_stream.get_handle () == ACE_INVALID_HANDLE + while (new_stream.get_handle () == ACE_INVALID_HANDLE && restart != 0 && errno == EINTR && timeout == 0); // Reset the size of the addr, which is only necessary for UNIX // domain sockets. - if (new_stream.get_handle () != ACE_INVALID_HANDLE + if (new_stream.get_handle () != ACE_INVALID_HANDLE && remote_addr != 0) remote_addr->set_size (len); } @@ -143,10 +143,10 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, } int -ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, +ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, ACE_Accept_QoS_Params qos_params, - ACE_Addr *remote_addr, - ACE_Time_Value *timeout, + ACE_Addr *remote_addr, + ACE_Time_Value *timeout, int restart, int reset_new_handle) const { @@ -177,14 +177,14 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, addr, len_ptr, qos_params)); - while (new_stream.get_handle () == ACE_INVALID_HANDLE + while (new_stream.get_handle () == ACE_INVALID_HANDLE && restart != 0 && errno == EINTR && timeout == 0); // Reset the size of the addr, which is only necessary for UNIX // domain sockets. - if (new_stream.get_handle () != ACE_INVALID_HANDLE + if (new_stream.get_handle () != ACE_INVALID_HANDLE && remote_addr != 0) remote_addr->set_size (len); } @@ -196,16 +196,16 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, // General purpose routine for performing server ACE_SOCK creation. -ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, - int reuse_addr, +ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, + int reuse_addr, int protocol_family, - int backlog, + int backlog, int protocol) { ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor"); if (this->open (local_sap, reuse_addr, - protocol_family, + protocol_family, backlog, protocol) == -1) ACE_ERROR ((LM_ERROR, @@ -219,65 +219,20 @@ ACE_SOCK_Acceptor::dump (void) const ACE_TRACE ("ACE_SOCK_Acceptor::dump"); } -int -ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int protocol_family, - int backlog, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_Acceptor::open"); - ACE_UNUSED_ARG (local_sap); - ACE_UNUSED_ARG (protocolinfo); - ACE_UNUSED_ARG (g); - ACE_UNUSED_ARG (flags); - ACE_UNUSED_ARG (reuse_addr); - ACE_UNUSED_ARG (protocol_family); - ACE_UNUSED_ARG (backlog); - ACE_UNUSED_ARG (protocol); - ACE_NOTSUP_RETURN (-1); -} - -ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int protocol_family, - int backlog, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor"); - if (this->open (local_sap, - protocolinfo, - g, - flags, - reuse_addr, - protocol_family, - backlog, - protocol) == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_SOCK_Acceptor"))); -} - // General purpose routine for performing server ACE_SOCK creation. int -ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap, +ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap, int reuse_addr, - int protocol_family, - int backlog, + int protocol_family, + int backlog, int protocol) { ACE_TRACE ("ACE_SOCK_Acceptor::open"); int error = 0; - + if (ACE_SOCK::open (SOCK_STREAM, - protocol_family, + protocol_family, protocol, reuse_addr) == -1) error = 1; @@ -295,8 +250,8 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap, local_inet_addr.sin_addr.s_addr = htonl (INADDR_ANY); } else - local_inet_addr = *(sockaddr_in *) local_sap.get_addr (); - + local_inet_addr = *(sockaddr_in *) local_sap.get_addr (); + if (local_inet_addr.sin_port == 0) { if (ACE::bind_port (this->get_handle (), @@ -305,24 +260,21 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap, } else { - if (ACE_OS::bind (this->get_handle (), + if (ACE_OS::bind (this->get_handle (), ACE_reinterpret_cast (sockaddr *, - &local_inet_addr), + &local_inet_addr), sizeof local_inet_addr) == -1) error = 1; } } else if (ACE_OS::bind (this->get_handle (), - (sockaddr *) local_sap.get_addr (), + (sockaddr *) local_sap.get_addr (), local_sap.get_size ()) == -1) error = 1; if (error || ACE_OS::listen (this->get_handle (), backlog) == -1) - { - error = 1; - this->close (); - } + this->close (); return error ? -1 : 0; } diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h index e86ba1e8522..18cd3005431 100644 --- a/ace/SOCK_Acceptor.h +++ b/ace/SOCK_Acceptor.h @@ -46,37 +46,14 @@ public: int protocol_family = PF_INET, int backlog = ACE_DEFAULT_BACKLOG, int protocol = 0); - // Initialize a passive-mode BSD-style acceptor socket (no QoS). - - ACE_SOCK_Acceptor (const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int protocol_family, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); - // Initialize a passive-mode QoS-enabled acceptor socket. Returns 0 - // on success and -1 on failure. + // Initiate a passive mode socket. int open (const ACE_Addr &local_sap, int reuse_addr = 0, int protocol_family = PF_INET, int backlog = ACE_DEFAULT_BACKLOG, int protocol = 0); - // Initialize a passive-mode BSD-style acceptor socket (no QoS). - // Returns 0 on success and -1 on failure. - - int open (const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int protocol_family, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); - // Initialize a passive-mode QoS-enabled acceptor socket. Returns 0 - // on success and -1 on failure. + // Initiate a passive mode socket. ~ACE_SOCK_Acceptor (void); // Default dtor. @@ -97,7 +74,7 @@ public: ACE_Time_Value *timeout = 0, int restart = 1, int reset_new_handle = 0) const; - // Accept a new <ACE_SOCK_Stream> connection using the QoS + // Accept a new <ACE_SOCK_Stream> connection using the RVSP QoS // information in <qos_params>. A <timeout> of 0 means block // forever, a <timeout> of {0, 0} means poll. <restart> == 1 means // "restart if interrupted," i.e., if errno == EINTR. diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp index f5f1ab00077..9938d839f4a 100644 --- a/ace/SOCK_Connector.cpp +++ b/ace/SOCK_Connector.cpp @@ -20,19 +20,19 @@ ACE_SOCK_Connector::dump (void) const ACE_TRACE ("ACE_SOCK_Connector::dump"); } -int +int ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream, ACE_Time_Value *timeout, const ACE_Addr &local_sap, int reuse_addr, - int protocol_family, + int protocol_family, int protocol) { ACE_TRACE ("ACE_SOCK_Connector::shared_connect_start"); // Only open a new socket if we don't already have a valid handle. if (new_stream.get_handle () == ACE_INVALID_HANDLE && new_stream.open (SOCK_STREAM, - protocol_family, + protocol_family, protocol, reuse_addr) == -1) return -1; @@ -58,7 +58,7 @@ ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream, return 0; } -int +int ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream, ACE_Time_Value *timeout, int result) @@ -98,14 +98,14 @@ 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, +ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, + const ACE_Addr &remote_sap, ACE_Time_Value *timeout, const ACE_Addr &local_sap, int reuse_addr, int /* flags */, int /* perms */, - int protocol_family, + int protocol_family, int protocol) { ACE_TRACE ("ACE_SOCK_Connector::connect"); @@ -127,17 +127,15 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, } int -ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_QoS_Params qos_params, +ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, + const ACE_Addr &remote_sap, + ACE_Connect_QoS_Params qos_params, ACE_Time_Value *timeout, const ACE_Addr &local_sap, - ACE_Protocol_Info * /* protocolinfo */, - ACE_SOCK_GROUP /* g */, - u_long /* flags */, int reuse_addr, + int /* flags */, int /* perms */, - int protocol_family, + int protocol_family, int protocol) { ACE_TRACE ("ACE_SOCK_Connector::connect"); @@ -205,8 +203,8 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream, return 0; } -ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, +ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, + const ACE_Addr &remote_sap, ACE_Time_Value *timeout, const ACE_Addr &local_sap, int reuse_addr, @@ -226,22 +224,20 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, perms, protocol_family, protocol) == -1 - && timeout != 0 + && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); } -ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_QoS_Params qos_params, +ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, + const ACE_Addr &remote_sap, + ACE_Connect_QoS_Params qos_params, ACE_Time_Value *timeout, const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, int reuse_addr, + int flags, int perms, int protocol_family, int protocol) @@ -253,16 +249,15 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, qos_params, timeout, local_sap, - protocolinfo, - g, - flags, reuse_addr, + flags, perms, protocol_family, protocol) == -1 - && timeout != 0 + && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); } + diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h index 6d4387239b6..ac5a96e8911 100644 --- a/ace/SOCK_Connector.h +++ b/ace/SOCK_Connector.h @@ -69,31 +69,28 @@ public: ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, const ACE_Addr &remote_sap, - ACE_QoS_Params qos_params, + ACE_Connect_QoS_Params qos_params, ACE_Time_Value *timeout = 0, const ACE_Addr &local_sap = ACE_Addr::sap_any, - ACE_Protocol_Info *protocolinfo = 0, - ACE_SOCK_GROUP g = 0, - u_long flags = 0, int reuse_addr = 0, + int flags = 0, int perms = 0, int protocol_family = PF_INET, int protocol = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <qos_params> contains QoS parameters that are passed - // to the IntServ (RSVP) and DiffServ protocols. The <timeout> is - // the amount of time to wait to connect. If it's 0 then we block - // indefinitely. If *timeout == {0, 0} then the connection is done - // using non-blocking mode. In this case, if the connection can't - // be made immediately the value of -1 is returned with <errno == - // EWOULDBLOCK>. If *timeout > {0, 0} then this is the amount of - // time to wait before timing out. If the time expires before the - // connection is made <errno == ETIME>. The <local_sap> is the - // value of local address to bind to. If it's the default value of - // <ACE_Addr::sap_any> then the user is letting the OS do the - // binding. If <reuse_addr> == 1 then the <local_addr> is reused, - // even if it hasn't been cleanedup yet. + // to RSVP. The <timeout> is the amount of time to wait to connect. + // If it's 0 then we block indefinitely. If *timeout == {0, 0} then + // the connection is done using non-blocking mode. In this case, if + // the connection can't be made immediately the value of -1 is + // returned with <errno == EWOULDBLOCK>. If *timeout > {0, 0} then + // this is the amount of time to wait before timing out. If the + // time expires before the connection is made <errno == ETIME>. The + // <local_sap> is the value of local address to bind to. If it's + // the default value of <ACE_Addr::sap_any> then the user is letting + // the OS do the binding. If <reuse_addr> == 1 then the + // <local_addr> is reused, even if it hasn't been cleanedup yet. int connect (ACE_SOCK_Stream &new_stream, const ACE_Addr &remote_sap, @@ -120,31 +117,28 @@ public: int connect (ACE_SOCK_Stream &new_stream, const ACE_Addr &remote_sap, - ACE_QoS_Params qos_params, + ACE_Connect_QoS_Params qos_params, ACE_Time_Value *timeout = 0, const ACE_Addr &local_sap = ACE_Addr::sap_any, - ACE_Protocol_Info *protocolinfo = 0, - ACE_SOCK_GROUP g = 0, - u_long flags = 0, int reuse_addr = 0, + int flags = 0, int perms = 0, int protocol_family = PF_INET, int protocol = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <qos_params> contains QoS parameters that are passed - // to the IntServ (RSVP) and DiffServ protocols. The <timeout> is - // the amount of time to wait to connect. If it's 0 then we block - // indefinitely. If *timeout == {0, 0} then the connection is done - // using non-blocking mode. In this case, if the connection can't - // be made immediately the value of -1 is returned with <errno == - // EWOULDBLOCK>. If *timeout > {0, 0} then this is the amount of - // time to wait before timing out. If the time expires before the - // connection is made <errno == ETIME>. The <local_sap> is the - // value of local address to bind to. If it's the default value of - // <ACE_Addr::sap_any> then the user is letting the OS do the - // binding. If <reuse_addr> == 1 then the <local_addr> is reused, - // even if it hasn't been cleanedup yet. + // to RSVP. The <timeout> is the amount of time to wait to connect. + // If it's 0 then we block indefinitely. If *timeout == {0, 0} then + // the connection is done using non-blocking mode. In this case, if + // the connection can't be made immediately the value of -1 is + // returned with <errno == EWOULDBLOCK>. If *timeout > {0, 0} then + // this is the amount of time to wait before timing out. If the + // time expires before the connection is made <errno == ETIME>. The + // <local_sap> is the value of local address to bind to. If it's + // the default value of <ACE_Addr::sap_any> then the user is letting + // the OS do the binding. If <reuse_addr> == 1 then the + // <local_addr> is reused, even if it hasn't been cleanedup yet. ~ACE_SOCK_Connector (void); // Default dtor. diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp index 2c12b6eadd9..aaae0b6f8c2 100644 --- a/ace/SOCK_Dgram.cpp +++ b/ace/SOCK_Dgram.cpp @@ -26,7 +26,7 @@ ACE_SOCK_Dgram::dump (void) const // returns the number of bytes read. ssize_t -ACE_SOCK_Dgram::recv (iovec io_vec[], +ACE_SOCK_Dgram::recv (iovec *io_vec, ACE_Addr &addr, int flags, const ACE_Time_Value *timeout) const @@ -133,42 +133,26 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, } ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, - const ACE_QoS_Params &qos_params, + const ACE_Connect_QoS_Params &qos_params, int protocol_family, int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, int reuse_addr) - : ACE_SOCK (SOCK_DGRAM, - protocol_family, - protocol, - protocolinfo, - g, - flags, - reuse_addr) + : ACE_SOCK (SOCK_DGRAM, protocol_family, protocol, reuse_addr) { ACE_UNUSED_ARG (qos_params); - ACE_UNUSED_ARG (local); } int ACE_SOCK_Dgram::open (const ACE_Addr &local, - const ACE_QoS_Params &qos_params, + const ACE_Connect_QoS_Params &qos_params, int protocol_family, int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, int reuse_addr) { ACE_UNUSED_ARG (local); ACE_UNUSED_ARG (qos_params); ACE_UNUSED_ARG (protocol_family); ACE_UNUSED_ARG (protocol); - ACE_UNUSED_ARG (protocolinfo); - ACE_UNUSED_ARG (g); - ACE_UNUSED_ARG (flags); ACE_UNUSED_ARG (reuse_addr); // Under construction... @@ -298,9 +282,7 @@ ACE_SOCK_Dgram::send (const iovec iov[], #if defined (ACE_HAS_ALLOCA) buf = alloca (length); #else - ACE_NEW_RETURN (buf, - char[length], - -1); + ACE_NEW_RETURN (buf, char[length], -1); #endif /* !defined (ACE_HAS_ALLOCA) */ char *ptr = buf; @@ -347,9 +329,7 @@ ACE_SOCK_Dgram::recv (iovec iov[], #if defined (ACE_HAS_ALLOCA) buf = alloca (length); #else - ACE_NEW_RETURN (buf, - char[length], - -1); + ACE_NEW_RETURN (buf, char[length], -1); #endif /* !defined (ACE_HAS_ALLOCA) */ length = ACE_SOCK_Dgram::recv (buf, length, addr, flags); diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h index 61d3f5af8b7..7ccf55f3f95 100644 --- a/ace/SOCK_Dgram.h +++ b/ace/SOCK_Dgram.h @@ -43,12 +43,9 @@ public: // dgram that will accept datagrams at the <local> address. ACE_SOCK_Dgram (const ACE_Addr &local, - const ACE_QoS_Params &qos_params, + const ACE_Connect_QoS_Params &qos_params, int protocol_family = PF_INET, int protocol = 0, - ACE_Protocol_Info *protocolinfo = 0, - ACE_SOCK_GROUP g = 0, - u_long flags = 0, int reuse_addr = 0); // This is a QoS-enabed method for initiating a socket dgram that // will accept datagrams at the <local> address. The <qos_params> @@ -62,12 +59,9 @@ public: // dgram that will accept datagrams at the <local> address. int open (const ACE_Addr &local, - const ACE_QoS_Params &qos_params, + const ACE_Connect_QoS_Params &qos_params, int protocol_family = PF_INET, int protocol = 0, - ACE_Protocol_Info *protocolinfo = 0, - ACE_SOCK_GROUP g = 0, - u_long flags = 0, int reuse_addr = 0); // This is a QoS-enabed method for initiating a socket dgram that // will accept datagrams at the <local> address. The <qos_params> @@ -81,14 +75,14 @@ public: size_t n, const ACE_Addr &addr, int flags = 0) const; - // Send an <n> byte <buf> to the datagram socket (uses <sendto(3)>). + // Send an <n> byte <buf> to the datagram socket (uses sendto(3)). ssize_t recv (void *buf, size_t n, ACE_Addr &addr, int flags = 0) const; // Receive an <n> byte <buf> from the datagram socket (uses - // <recvfrom(3)>). + // recvfrom(3)). ssize_t recv (iovec *io_vec, ACE_Addr &addr, @@ -106,14 +100,14 @@ public: const ACE_Addr &addr, int flags = 0) const; // Send an <iovec> of size <n> to the datagram socket (uses - // <sendmsg(3)>). + // sendmsg(3)). ssize_t recv (iovec iov[], size_t n, ACE_Addr &addr, int flags = 0) const; // Recv an <iovec> of size <n> to the datagram socket (uses - // <recvmsg(3)>). + // recvmsg(3)). ssize_t recv (void *buf, size_t n, @@ -128,43 +122,6 @@ public: // returned with <errno == ETIME>. If it succeeds the number of // bytes received is returned. - ssize_t send (const iovec buffers[], - int buffer_count, - size_t &number_of_bytes_sent, - int flags, - const ACE_Addr &addr, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const; - // Send <buffer_count> worth of <buffers> to <addr> using overlapped - // I/O (uses <WSASentTo>). Returns 0 on success. - - ssize_t recv (iovec buffers[], - int buffer_count, - size_t &number_of_bytes_recvd, - int &flags, - ACE_Addr &addr, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const; - // Recv <buffer_count> worth of <buffers> from <addr> using - // overlapped I/O (uses <WSARecvFrom>). Returns 0 on success. - - ssize_t send (const void *buf, - size_t n, - const ACE_Addr &addr, - int flags, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const; - // Send an <n> byte <buf> to the datagram socket (uses <WSASentTo>). - - ssize_t recv (void *buf, - size_t n, - ACE_Addr &addr, - int flags, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const; - // Receive an <n> byte <buf> from the datagram socket (uses - // <WSARecvFrom>). - void dump (void) const; // Dump the state of an object. diff --git a/ace/SOCK_Dgram.i b/ace/SOCK_Dgram.i index 723a3d3b9d8..efcb0b09974 100644 --- a/ace/SOCK_Dgram.i +++ b/ace/SOCK_Dgram.i @@ -29,11 +29,8 @@ ACE_SOCK_Dgram::send (const void *buf, sockaddr *saddr = (sockaddr *) addr.get_addr (); size_t len = addr.get_size (); return ACE_OS::sendto (this->get_handle (), - (const char *) buf, - n, - flags, - (struct sockaddr *) saddr, - len); + (const char *) buf, n, flags, + (struct sockaddr *) saddr, len); } // <recvfrom> an n byte datagram (connectionless version). @@ -49,110 +46,8 @@ ACE_SOCK_Dgram::recv (void *buf, int addr_len = addr.get_size (); ssize_t status = ACE_OS::recvfrom (this->get_handle (), - (char *) buf, - n, - flags, - (sockaddr *) saddr, - &addr_len); + (char *) buf, n, flags, + (sockaddr *) saddr, &addr_len); addr.set_size (addr_len); return status; } - -ASYS_INLINE ssize_t -ACE_SOCK_Dgram::send (const iovec buffers[], - int buffer_count, - size_t &number_of_bytes_sent, - int flags, - const ACE_Addr &addr, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const -{ - ACE_TRACE ("ACE_SOCK_Dgram::send"); - sockaddr *saddr = (sockaddr *) addr.get_addr (); - size_t len = addr.get_size (); - return ACE_OS::sendto (this->get_handle (), - buffers, - buffer_count, - number_of_bytes_sent, - flags, - (const sockaddr *) saddr, - len, - overlapped, - func); -} - -ASYS_INLINE ssize_t -ACE_SOCK_Dgram::recv (iovec buffers[], - int buffer_count, - size_t &number_of_bytes_recvd, - int &flags, - ACE_Addr &addr, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const -{ - ACE_TRACE ("ACE_SOCK_IO::recv"); - sockaddr *saddr = (sockaddr *) addr.get_addr (); - int addr_len = addr.get_size (); - - ssize_t status = ACE_OS::recvfrom (this->get_handle (), - buffers, - buffer_count, - number_of_bytes_recvd, - flags, - (sockaddr *) saddr, - &addr_len, - overlapped, - func); - addr.set_size (addr_len); - return status; -} - -// <sendto> an N byte datagram to <addr> (connectionless version). - -ASYS_INLINE ssize_t -ACE_SOCK_Dgram::send (const void *buf, - size_t n, - const ACE_Addr &addr, - int flags, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const -{ - ACE_TRACE ("ACE_SOCK_Dgram::send"); - - iovec buffer[1]; - buffer[0].iov_len = n; - buffer[0].iov_base = (char *) buf; - size_t number_of_bytes_sent = 0; - return this->send (buffer, - 1, - number_of_bytes_sent, - flags, - addr, - overlapped, - func); -} - -// <recvfrom> an n byte datagram (connectionless version). - -ASYS_INLINE ssize_t -ACE_SOCK_Dgram::recv (void *buf, - size_t n, - ACE_Addr &addr, - int flags, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const -{ - ACE_TRACE ("ACE_SOCK_Dgram::recv"); - - iovec buffer[1]; - buffer[0].iov_len = n; - buffer[0].iov_base = (char *) buf; - size_t number_of_bytes_recvd = 0; - return this->recv (buffer, - 1, - number_of_bytes_recvd, - flags, - addr, - overlapped, - func); -} diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp index 0a184226281..d1bf892d7a1 100644 --- a/ace/SOCK_Dgram_Mcast.cpp +++ b/ace/SOCK_Dgram_Mcast.cpp @@ -27,10 +27,10 @@ ACE_SOCK_Dgram_Mcast::ACE_SOCK_Dgram_Mcast (void) int ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr, - int reuse_addr, - const ASYS_TCHAR *net_if, - int protocol_family, - int protocol) + int reuse_addr, + const ASYS_TCHAR *net_if, + int protocol_family, + int protocol) { ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe_i"); @@ -41,10 +41,10 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr, // earlier. if (this->get_handle () == ACE_INVALID_HANDLE) { - if (ACE_SOCK::open (SOCK_DGRAM, - protocol_family, - protocol, - reuse_addr) == -1) + if (ACE_SOCK::open (SOCK_DGRAM, + protocol_family, + protocol, + reuse_addr) == -1) return -1; int one = 1; @@ -68,7 +68,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr, if (local.set (this->mcast_addr_.get_port_number ()) == -1) return -1; else if (ACE_SOCK_Dgram::shared_open (local, - protocol_family) == -1) + protocol_family) == -1) return -1; } #if defined (ACE_WIN32) @@ -97,7 +97,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr, size_t if_cnt; if (ACE::get_ip_interfaces (if_cnt, - if_addrs) != 0) + if_addrs) != 0) return -1; size_t nr_subscribed = 0; @@ -105,10 +105,10 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr, if (if_cnt < 2) { if (this->subscribe (mcast_addr, - reuse_addr, - ASYS_TEXT ("0.0.0.0"), - protocol_family, - protocol) == 0) + reuse_addr, + ASYS_WIDE_STRING ("0.0.0.0"), + protocol_family, + protocol) == 0) ++nr_subscribed; } else @@ -116,16 +116,16 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr, // offer multicast service, and subscribe to them. while (if_cnt > 0) { - --if_cnt; + --if_cnt; - // Convert to 0-based for indexing, next loop check. + // Convert to 0-based for indexing, next loop check. if (if_addrs[if_cnt].get_ip_address() == INADDR_LOOPBACK) continue; if (this->subscribe (mcast_addr, - reuse_addr, - ASYS_WIDE_STRING (if_addrs[if_cnt].get_host_addr()), - protocol_family, - protocol) == 0) + reuse_addr, + ASYS_WIDE_STRING (if_addrs[if_cnt].get_host_addr()), + protocol_family, + protocol) == 0) ++nr_subscribed; } @@ -144,7 +144,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr, // Create multicast request. if (this->make_multicast_address (this->mcast_addr_, - net_if) == -1) + net_if) == -1) return -1; else return 0; @@ -181,9 +181,9 @@ ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr, return 0; } -int +ACE_HANDLE ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr, - const ACE_QoS_Params &qos_params, + const ACE_Connect_QoS_Params &qos_params, int reuse_addr, const ASYS_TCHAR *net_if, int protocol_family, @@ -196,7 +196,7 @@ ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr, protocol); // Check for the error case. if (result == -1) - return -1; + return ACE_INVALID_HANDLE; #if defined (ACE_WIN32) // @@ Note that this code is currently broken since <subscribe_i> // calls the wrong version of subscribe recursively! @@ -207,27 +207,19 @@ ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr, #endif /* ACE_WIN32 */ // Tell network device driver to read datagrams with a // <mcast_request_if_> IP interface. - else if (ACE_OS::join_leaf (this->get_handle (), -#if defined (_UNICOS) - ACE_reinterpret_cast (const sockaddr *, - &this->mcast_request_if_.imr_multiaddr), - sizeof this->mcast_request_if_.imr_multiaddr, -#else /* ! _UNICOS */ + else + return ACE_OS::join_leaf (this->get_handle (), ACE_reinterpret_cast (const sockaddr *, &this->mcast_request_if_.imr_multiaddr.s_addr), sizeof this->mcast_request_if_.imr_multiaddr.s_addr, -#endif /* ! _UNICOS */ - qos_params) == ACE_INVALID_HANDLE) - return -1; - else - return 0; + qos_params); } int ACE_SOCK_Dgram_Mcast::unsubscribe_i (const ACE_INET_Addr &mcast_addr, - const ASYS_TCHAR *net_if, - int protocol_family, - int protocol) + const ASYS_TCHAR *net_if, + int protocol_family, + int protocol) { ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe_i"); #if defined (ACE_WIN32) @@ -256,7 +248,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_i (const ACE_INET_Addr &mcast_addr, size_t if_cnt; if (ACE::get_ip_interfaces (if_cnt, - if_addrs) != 0) + if_addrs) != 0) return -1; size_t nr_unsubscribed = 0; @@ -272,8 +264,8 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_i (const ACE_INET_Addr &mcast_addr, else while (if_cnt > 0) { - --if_cnt; - // Convert to 0-based for indexing, next loop check + --if_cnt; + // Convert to 0-based for indexing, next loop check if (if_addrs[if_cnt].get_ip_address() == INADDR_LOOPBACK) continue; if (this->unsubscribe (mcast_addr, @@ -302,8 +294,8 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_i (const ACE_INET_Addr &mcast_addr, ip_mreq multicast_address; // Create multicast request. if (this->make_multicast_address_i (mcast_addr, - multicast_address, - net_if) == -1) + multicast_address, + net_if) == -1) return -1; else return 0; @@ -332,9 +324,9 @@ ACE_SOCK_Dgram_Mcast::unsubscribe (const ACE_INET_Addr &mcast_addr, // Tell network device driver to read datagrams with a // multicast_address address. else if (ACE_SOCK::set_option (IPPROTO_IP, - IP_DROP_MEMBERSHIP, - &this->mcast_request_if_, - sizeof this->mcast_request_if_) == -1) + IP_DROP_MEMBERSHIP, + &this->mcast_request_if_, + sizeof this->mcast_request_if_) == -1) return -1; return 0; } @@ -375,8 +367,8 @@ ACE_SOCK_Dgram_Mcast::make_multicast_address_i (const ACE_INET_Addr &mcast_addr, #endif /* defined (ACE_PSOS) */ if (ACE_OS::ioctl (this->get_handle (), - SIOCGIFADDR, - &if_address) == -1) + SIOCGIFADDR, + &if_address) == -1) return -1; struct sockaddr_in *socket_address; diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h index b74db60e6da..5bc6cda37aa 100644 --- a/ace/SOCK_Dgram_Mcast.h +++ b/ace/SOCK_Dgram_Mcast.h @@ -66,12 +66,12 @@ public: // these numbers in alphanumeric form and <subscribe> will convert // them into numbers via <ACE_OS::atoi>. - int subscribe (const ACE_INET_Addr &mcast_addr, - const ACE_QoS_Params &qos_params, - int reuse_addr = 1, - const ASYS_TCHAR *net_if = 0, - int protocol_family = PF_INET, - int protocol = 0); + ACE_HANDLE subscribe (const ACE_INET_Addr &mcast_addr, + const ACE_Connect_QoS_Params &qos_params, + int reuse_addr = 1, + const ASYS_TCHAR *net_if = 0, + int protocol_family = PF_INET, + int protocol = 0); // This is a QoS-enabled method for joining a multicast group, which // passes <qos_params> via <ACE_OS::join_leaf>. The network // interface device driver is instructed to accept datagrams with @@ -82,7 +82,8 @@ public: // The <net_if> interface is hardware specific, e.g., use "netstat // -i" to find whether your interface is, such as "le0" or something // else. If net_if == 0, <subscribe> uses the default mcast - // interface. Returns: a 0 on success or -1 on failure. + // interface. Returns: an <ACE_HANDLE> to the newly created + // multipoint socket on success or ACE_INVALID_HANDLE on failure. // // Note that some platforms, such as pSoS, support only number, not // names, for network interfaces. For these platforms, just give diff --git a/ace/SOCK_IO.cpp b/ace/SOCK_IO.cpp index 2431033c70d..abf00af3559 100644 --- a/ace/SOCK_IO.cpp +++ b/ace/SOCK_IO.cpp @@ -94,9 +94,7 @@ ACE_SOCK_IO::send (size_t n, ...) const #if defined (ACE_HAS_ALLOCA) iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); #else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); + ACE_NEW_RETURN (iovp, iovec[total_tuples], -1); #endif /* !defined (ACE_HAS_ALLOCA) */ va_start (argp, n); @@ -134,9 +132,7 @@ ACE_SOCK_IO::recv (size_t n, ...) const #if defined (ACE_HAS_ALLOCA) iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); #else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); + ACE_NEW_RETURN (iovp, iovec[total_tuples], -1); #endif /* !defined (ACE_HAS_ALLOCA) */ va_start (argp, n); diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h index d3a29106c8e..e978945f0c2 100644 --- a/ace/SOCK_IO.h +++ b/ace/SOCK_IO.h @@ -125,12 +125,12 @@ public: ssize_t send (const void *buf, size_t n, ACE_OVERLAPPED *overlapped) const; - // Send <n> bytes via Win32 <WriteFile> using overlapped I/O. + // Send <n> bytes via Win32 WriteFile using overlapped I/O. ssize_t recv (void *buf, size_t n, ACE_OVERLAPPED *overlapped) const; - // Recv <n> bytes via Win32 <ReadFile> using overlapped I/O. + // Recv <n> bytes via Win32 ReadFile using overlapped I/O. void dump (void) const; // Dump the state of an object. diff --git a/ace/SPIPE_Connector.cpp b/ace/SPIPE_Connector.cpp index 8cb2c90822d..f06f9bbd0f5 100644 --- a/ace/SPIPE_Connector.cpp +++ b/ace/SPIPE_Connector.cpp @@ -26,8 +26,8 @@ ACE_SPIPE_Connector::ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io, if (this->connect (new_io, remote_sap, timeout, local_sap, reuse_addr, flags, perms) == -1 && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("address %s, %p\n"), - remote_sap.get_path_name (), ASYS_TEXT ("ACE_SPIPE_Connector"))); + ACE_ERROR ((LM_ERROR, "address %s, %p\n", + remote_sap.get_path_name (), "ACE_SPIPE_Connector")); } void @@ -62,7 +62,7 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, new_io.set_handle (handle); new_io.remote_addr_ = remote_sap; // class copy. -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) DWORD pipe_mode = PIPE_READMODE_MESSAGE | PIPE_WAIT; // Set named pipe mode and buffering characteristics. diff --git a/ace/SPIPE_Stream.cpp b/ace/SPIPE_Stream.cpp index 533a47bf080..29a5433dd3d 100644 --- a/ace/SPIPE_Stream.cpp +++ b/ace/SPIPE_Stream.cpp @@ -40,9 +40,7 @@ ACE_SPIPE_Stream::send (size_t n, ...) const #if defined (ACE_HAS_ALLOCA) iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); #else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); + ACE_NEW_RETURN (iovp, iovec[total_tuples], -1); #endif /* !defined (ACE_HAS_ALLOCA) */ va_start (argp, n); @@ -77,9 +75,7 @@ ACE_SPIPE_Stream::recv (size_t n, ...) const #if defined (ACE_HAS_ALLOCA) iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); #else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); + ACE_NEW_RETURN (iovp, iovec[total_tuples], -1); #endif /* !defined (ACE_HAS_ALLOCA) */ va_start (argp, n); diff --git a/ace/SString.cpp b/ace/SString.cpp index 84d12bedf9a..ce850e4673f 100644 --- a/ace/SString.cpp +++ b/ace/SString.cpp @@ -646,9 +646,7 @@ ACE_WString::char_rep (void) const { char *t; - ACE_NEW_RETURN (t, - char[this->len_ + 1], - 0); + ACE_NEW_RETURN (t, char[this->len_ + 1], 0); for (size_t i = 0; i < this->len_; i++) // Note that this cast may lose data if wide chars are diff --git a/ace/SString.h b/ace/SString.h index dd8e7778ebc..bb5602afccc 100644 --- a/ace/SString.h +++ b/ace/SString.h @@ -487,17 +487,6 @@ private: ACE_Export ostream &operator << (ostream &, const ACE_SString &); #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ -// This allows one to use W or C String based on the Unicode -// setting -#if defined (UNICODE) -typedef ACE_WString ACE_TString; -#else /* UNICODE */ -typedef ACE_CString ACE_TString; -#endif /* UNICODE */ - - -// ************************************************************ - class ACE_Export ACE_Tokenizer { // = TITLE diff --git a/ace/SV_Message_Queue.cpp b/ace/SV_Message_Queue.cpp index 60b0b05731a..90aa454ddc6 100644 --- a/ace/SV_Message_Queue.cpp +++ b/ace/SV_Message_Queue.cpp @@ -28,12 +28,12 @@ ACE_SV_Message_Queue::~ACE_SV_Message_Queue (void) ACE_TRACE ("ACE_SV_Message_Queue::~ACE_SV_Message_Queue"); } -ACE_SV_Message_Queue::ACE_SV_Message_Queue (key_t external_id, - int create, +ACE_SV_Message_Queue::ACE_SV_Message_Queue (key_t external_id, + int create, int perms) { ACE_TRACE ("ACE_SV_Message_Queue::ACE_SV_Message_Queue"); if (this->open (external_id, create, perms) == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_SV_Message_Queue::ACE_SV_Message_Queue"))); + ACE_ERROR ((LM_ERROR, "%p\n", + "ACE_SV_Message_Queue::ACE_SV_Message_Queue")); } diff --git a/ace/SV_Semaphore_Simple.cpp b/ace/SV_Semaphore_Simple.cpp index fda7b6b1cb0..aacec7f53fc 100644 --- a/ace/SV_Semaphore_Simple.cpp +++ b/ace/SV_Semaphore_Simple.cpp @@ -21,8 +21,8 @@ ACE_SV_Semaphore_Simple::dump (void) const } int -ACE_SV_Semaphore_Simple::control (int cmd, - int value, +ACE_SV_Semaphore_Simple::control (int cmd, + int value, u_short semnum) const { ACE_TRACE ("ACE_SV_Semaphore_Simple::control"); @@ -34,7 +34,7 @@ ACE_SV_Semaphore_Simple::control (int cmd, semctl_arg.val = value; return ACE_OS::semctl (this->internal_id_, - semnum, + semnum, cmd, semctl_arg); } @@ -50,9 +50,9 @@ ACE_SV_Semaphore_Simple::init (key_t k, int i) } // General ACE_SV_Semaphore operation. Increment or decrement by a -// specific amount (positive or negative; amount can`t be zero). - -int +// specific amount (positive or negative; amount can`t be zero). + +int ACE_SV_Semaphore_Simple::op (int val, u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Simple::op"); @@ -72,11 +72,11 @@ ACE_SV_Semaphore_Simple::op (int val, u_short n, int flags) const // Open or create one or more SV_Semaphores. We return 0 if all is // OK, else -1. -int -ACE_SV_Semaphore_Simple::open (key_t k, - int flags, - int initial_value, - u_short n, +int +ACE_SV_Semaphore_Simple::open (key_t k, + int flags, + int initial_value, + u_short n, int perms) { ACE_TRACE ("ACE_SV_Semaphore_Simple::open"); @@ -102,10 +102,10 @@ ACE_SV_Semaphore_Simple::open (key_t k, return 0; } -ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (key_t k, - int flags, - int initial_value, - u_short n, +ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (key_t k, + int flags, + int initial_value, + u_short n, int perms) : key_ (k) { @@ -121,11 +121,11 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (key_t k, // measured close to collition ratio of nearly 0.1% for // ACE::unique_name()-like strings. -key_t +key_t ACE_SV_Semaphore_Simple::name_2_key (const char *name) { ACE_TRACE ("ACE_SV_Semaphore_Simple::name_2_key"); - + if (name == 0) { errno = EINVAL; @@ -140,36 +140,36 @@ ACE_SV_Semaphore_Simple::name_2_key (const char *name) // Open or create a ACE_SV_Semaphore. We return 1 if all is OK, else // 0. - -int -ACE_SV_Semaphore_Simple::open (const char *name, - int flags, - int initial_value, - u_short n, + +int +ACE_SV_Semaphore_Simple::open (const char *name, + int flags, + int initial_value, + u_short n, int perms) { ACE_TRACE ("ACE_SV_Semaphore_Simple::open"); key_t key; - + if (name == 0) key = ACE_DEFAULT_SEM_KEY; - else + else key = this->name_2_key (name); return this->open (key, flags, initial_value, n, perms); } -ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name, - int flags, - int initial_value, - u_short n, +ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name, + int flags, + int initial_value, + u_short n, int perms) { ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"); if (this->open (name, flags, initial_value, n, perms) == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"))); + ACE_ERROR ((LM_ERROR, "%p\n", + "ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple")); } ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple (void) @@ -189,8 +189,8 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (void) // is being shut down, as we do an IPC_RMID on the ACE_SV_Semaphore, // regardless of whether other processes may be using it or not. Most // other processes should use close() below. - -int + +int ACE_SV_Semaphore_Simple::remove (void) const { ACE_TRACE ("ACE_SV_Semaphore_Simple::remove"); @@ -198,3 +198,4 @@ ACE_SV_Semaphore_Simple::remove (void) const ((ACE_SV_Semaphore_Simple *) this)->init (); return result; } + diff --git a/ace/SV_Shared_Memory.cpp b/ace/SV_Shared_Memory.cpp index de4d8f070e1..128b487415a 100644 --- a/ace/SV_Shared_Memory.cpp +++ b/ace/SV_Shared_Memory.cpp @@ -22,11 +22,11 @@ ACE_SV_Shared_Memory::dump (void) const // this segment. int -ACE_SV_Shared_Memory::open_and_attach (key_t external_id, - size_t sz, +ACE_SV_Shared_Memory::open_and_attach (key_t external_id, + size_t sz, int create, - int perms, - void *virtual_addr, + int perms, + void *virtual_addr, int flags) { ACE_TRACE ("ACE_SV_Shared_Memory::open_and_attach"); @@ -40,24 +40,24 @@ ACE_SV_Shared_Memory::open_and_attach (key_t external_id, // Constructor interface to this->open_and_attach () member function. -ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (key_t external_id, - size_t sz, - int create, - int perms, - void *virtual_addr, +ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (key_t external_id, + size_t sz, + int create, + int perms, + void *virtual_addr, int flags) { ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"); - if (this->open_and_attach (external_id, sz, create, + if (this->open_and_attach (external_id, sz, create, perms, virtual_addr, flags) == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); + ACE_ERROR ((LM_ERROR, "%p\n", + "ACE_SV_Shared_Memory::ACE_SV_Shared_Memory")); } // The "do nothing" constructor. ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (void) - : internal_id_ (0), + : internal_id_ (0), size_ (0), segment_ptr_ (0) { @@ -73,11 +73,11 @@ ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (void) ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (ACE_HANDLE int_id, int flags) - : internal_id_ (int_id), + : internal_id_ (int_id), size_ (0) { ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"); if (this->attach (0, flags) == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); + ACE_ERROR ((LM_ERROR, "%p\n", + "ACE_SV_Shared_Memory::ACE_SV_Shared_Memory")); } diff --git a/ace/Sched_Params.i b/ace/Sched_Params.i index 041f9cb1648..35d75826416 100644 --- a/ace/Sched_Params.i +++ b/ace/Sched_Params.i @@ -98,11 +98,10 @@ ACE_INLINE ACE_Sched_Priority_Iterator::ACE_Sched_Priority_Iterator (const ACE_Sched_Params::Policy &policy, int scope) : policy_ (policy), - scope_ (scope), - priority_ (0), - done_ (0) + scope_ (scope) { priority_ = ACE_Sched_Params::priority_min (this->policy (), this->scope ()); + this->done_ = 0; } ACE_INLINE diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h index 0b70607237c..cff77d9225d 100644 --- a/ace/Select_Reactor.h +++ b/ace/Select_Reactor.h @@ -35,7 +35,7 @@ typedef ACE_Select_Reactor_Token_T<ACE_Noop_Token> ACE_Select_Reactor_Token; #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ typedef ACE_Select_Reactor_T<ACE_Select_Reactor_Token> ACE_Select_Reactor; -ACE_TEMPLATE_SPECIALIZATION + class ACE_Export ACE_Guard< ACE_Select_Reactor_Token_T<ACE_Noop_Token> > { // = TITLE diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp index 83f9d3d29eb..8d9c0d974f0 100644 --- a/ace/Select_Reactor_T.cpp +++ b/ace/Select_Reactor_T.cpp @@ -545,8 +545,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::close (void) this->delete_timer_queue_ = 0; } - if (this->notify_handler_ != 0) - this->notify_handler_->close (); + this->notify_handler_->close (); if (this->delete_notify_handler_) { @@ -857,26 +856,6 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::remove_handler_i return this->handler_rep_.unbind (handle, mask); } -template <class ACE_SELECT_REACTOR_TOKEN> int -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::work_pending (const ACE_Time_Value &timeout) -{ -#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 (), - this->owner_) == 0) - return -1; -#endif /* defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) */ - - u_long width = (u_long) this->handler_rep_.max_handlep1 (); - - return ACE_OS::select (int (width), - this->wait_set_.rd_mask_, - this->wait_set_.wr_mask_, - this->wait_set_.ex_mask_, - timeout); -} - // Must be called with lock held. template <class ACE_SELECT_REACTOR_TOKEN> int @@ -892,7 +871,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::wait_for_multiple_events int number_of_active_handles = this->any_ready (dispatch_set); // If there are any bits enabled in the <ready_set_> then we'll - // handle those first, otherwise we'll block in <select>. + // handle those first, otherwise we'll block in select(). if (number_of_active_handles == 0) { @@ -1165,8 +1144,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_events #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 (), - this->owner_) == 0) + if (ACE_OS::thr_equal (ACE_Thread::self (), this->owner_) == 0) return -1; // Update the countdown to reflect time waiting for the mutex. diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h index 6c6a41e71e5..2f26d04379b 100644 --- a/ace/Select_Reactor_T.h +++ b/ace/Select_Reactor_T.h @@ -158,11 +158,6 @@ public: // = Event loop drivers. - virtual int work_pending (const ACE_Time_Value &max_wait_time = ACE_Time_Value::zero); - // Returns non-zero if there are I/O events "ready" for dispatching, - // but does not actually dispatch the event handlers. By default, - // don't block while checking this, i.e., "poll". - virtual int handle_events (ACE_Time_Value *max_wait_time = 0); virtual int alertable_handle_events (ACE_Time_Value *max_wait_time = 0); // This event loop driver that blocks for <max_wait_time> before diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp index 52a2ec4b190..8ddf2a95520 100644 --- a/ace/Service_Config.cpp +++ b/ace/Service_Config.cpp @@ -73,9 +73,8 @@ ACE_STATIC_SVCS * ACE_Service_Config::static_svcs (void) { if (ACE_Service_Config::static_svcs_ == 0) - ACE_NEW_RETURN (ACE_Service_Config::static_svcs_, - ACE_STATIC_SVCS, - 0); + ACE_NEW_RETURN (ACE_Service_Config::static_svcs_, ACE_STATIC_SVCS, 0); + return ACE_Service_Config::static_svcs_; } @@ -515,12 +514,11 @@ ACE_Service_Config::load_static_svcs (void) ACE_Service_Type *sr; - ACE_NEW_RETURN (sr, - ACE_Service_Type (ssd->name_, - stp, - 0, - ssd->active_), - -1); + ACE_NEW_RETURN (sr, ACE_Service_Type (ssd->name_, + stp, + 0, + ssd->active_), -1); + if (ACE_Service_Repository::instance ()->insert (sr) == -1) return -1; } @@ -534,7 +532,7 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[], LPCTSTR logger_key, int ignore_default_svc_conf_file) { - int result = 0; + int retval = 0; ACE_TRACE ("ACE_Service_Config::open"); if (ACE_Service_Config::is_initialized_ != 0) @@ -557,8 +555,7 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[], "enqueue_tail"), -1); - // Clear the LM_DEBUG bit from log messages if appropriate. This - // will be reset at the bottom of this function. + // Clear the LM_DEBUG bit from log messages if appropriate if (ACE::debug ()) ACE_Log_Msg::disable_debug_messages (); // Become a daemon before doing anything else. @@ -582,7 +579,7 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[], if (ACE_LOG_MSG->open (program_name, flags, key) == -1) - result = -1; + retval = -1; else { if (ACE::debug ()) @@ -600,11 +597,11 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[], // See if we need to load the static services. if (ACE_Service_Config::no_static_svcs_ == 0 && ACE_Service_Config::load_static_svcs () == -1) - result = -1; + retval = -1; else { int result = ACE_Service_Config::process_commandline_directives (); - result = ACE_Service_Config::process_directives () + result; + retval = ACE_Service_Config::process_directives () + result; } // There's no point in dealing with this on NT since it doesn't really @@ -625,7 +622,7 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[], if (ACE::debug ()) ACE_Log_Msg::enable_debug_messages (); - return result; + return retval; } ACE_Service_Config::ACE_Service_Config (const ASYS_TCHAR program_name[], diff --git a/ace/Service_Config.h b/ace/Service_Config.h index 2c991865674..9b068dbfca0 100644 --- a/ace/Service_Config.h +++ b/ace/Service_Config.h @@ -135,23 +135,8 @@ public: int ignore_default_svc_conf = 0); // This is the primary entry point into the ACE_Service_Config (the // constructor just handles simple initializations). It parses - // arguments passed in from the command-line. The arguments that - // are valid in a call to this method include: - // - // '-b' - Option to indicate that we should be a daemon - // '-d' - Turn on debugging mode - // '-f' - Option to read in the list of svc.conf file names - // '-k' - Option to read a wide string where in the logger output can - // be written - // '-y' - Turn on the flag for a repository of statically - // linked services (by default, these are not configured). - // '-n' - Need not have a repository of statically linked services - // '-S' - Option to read in the list of services on the command-line - // Please observe the difference between options '-f' that looks - // for a list of files and here a list of services. - // - // Returns number of errors that occurred on failure and 0 - // otherwise. + // arguments passed in from the command-line. Returns number of + // errors that occurred on failure and 0 otherwise. virtual ~ACE_Service_Config (void); // Perform user-specified close activities and remove dynamic @@ -336,6 +321,19 @@ protected: // <ACE_Service_Config>. Note that <argv[0]> is assumed to be the // program name. + // The arguments that are valid in a call to this method are + // '-b' - Option to indicate that we should be a daemon + // '-d' - Turn on debugging mode + // '-f' - Option to read in the list of svc.conf file names + // '-k' - Option to read a wide string where in the logger output can + // be written + // '-y' - Turn on the flag for a repository of statically + // linked services + // '-n' - Need not have a repository of statically linked services + // '-S' - Option to read in the list of services on the command-line + // Please observe the difference between options '-f' that looks + // for a list of files and here a list of services. + static int start_daemon (void); // Become a daemon. diff --git a/ace/Signal.cpp b/ace/Signal.cpp index a596ba17a33..16fd4fef9f5 100644 --- a/ace/Signal.cpp +++ b/ace/Signal.cpp @@ -465,9 +465,8 @@ ACE_Sig_Handlers_Set::instance (int signum) if (signum <= 0 || signum >= ACE_NSIG) return 0; // This will cause problems... else if (ACE_Sig_Handlers_Set::sig_handlers_[signum] == 0) - ACE_NEW_RETURN (ACE_Sig_Handlers_Set::sig_handlers_[signum], - ACE_SIG_HANDLERS_SET, - 0); + ACE_NEW_RETURN (ACE_Sig_Handlers_Set::sig_handlers_[signum], ACE_SIG_HANDLERS_SET, 0); + return ACE_Sig_Handlers_Set::sig_handlers_[signum]; } @@ -528,10 +527,8 @@ ACE_Sig_Handlers::register_handler (int signum, // Create a new 3rd party disposition, remembering its // preferred signal blocking etc...; - ACE_NEW_RETURN (extern_sh, - ACE_Sig_Adapter (sa, - ++ACE_Sig_Handlers::sigkey_), - -1); + ACE_NEW_RETURN (extern_sh, ACE_Sig_Adapter (sa, ++ACE_Sig_Handlers::sigkey_), -1); + // Add the external signal handler to the set of handlers // for this signal. if (ACE_Sig_Handlers_Set::instance (signum)->insert (extern_sh) == -1) @@ -541,10 +538,8 @@ ACE_Sig_Handlers::register_handler (int signum, } } // Add our new handler at this point. - ACE_NEW_RETURN (ace_sig_adapter, - ACE_Sig_Adapter (new_sh, - ++ACE_Sig_Handlers::sigkey_), - -1); + ACE_NEW_RETURN (ace_sig_adapter, ACE_Sig_Adapter (new_sh, ++ACE_Sig_Handlers::sigkey_), -1); + // Add the ACE signal handler to the set of handlers for this // signal (make sure it goes before the external one if there is // one of these). @@ -755,10 +750,7 @@ ACE_Sig_Handlers::handler (int signum, ACE_Event_Handler *new_sh) // ACE_Unbounded_Set...). ACE_Sig_Adapter *temp; - ACE_NEW_RETURN (temp, - ACE_Sig_Adapter (new_sh, - ++ACE_Sig_Handlers::sigkey_), - 0); + ACE_NEW_RETURN (temp, ACE_Sig_Adapter (new_sh, ++ACE_Sig_Handlers::sigkey_), 0); handler_set->insert (temp); return *eh; } diff --git a/ace/Signal.h b/ace/Signal.h index d9901345263..dc92c572b80 100644 --- a/ace/Signal.h +++ b/ace/Signal.h @@ -17,10 +17,6 @@ #ifndef ACE_SIGNAL_HANDLER_H #define ACE_SIGNAL_HANDLER_H -#if defined (ACE_DONT_INCLUDE_ACE_SIGNAL_H) -# error ace/Signal.h was #included instead of signal.h by ace/OS.h: fix!!!! -#endif /* ACE_DONT_INCLUDE_ACE_SIGNAL_H */ - #include "ace/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -110,6 +106,7 @@ public: ACE_Sig_Set &sigmask, int flags = 0); ACE_Sig_Action (const ACE_Sig_Action &s); + ACE_Sig_Action (struct sigaction *); ~ACE_Sig_Action (void); // Default dtor. diff --git a/ace/Signal.i b/ace/Signal.i index 26f7295c9af..c8c0cad3049 100644 --- a/ace/Signal.i +++ b/ace/Signal.i @@ -237,28 +237,25 @@ ACE_Sig_Guard::ACE_Sig_Guard (ACE_Sig_Set *mask) // If MASK is 0 then block all signals! if (mask == 0) { +#if 0 + ACE_Sig_Set smask (1); +#endif + + #if defined (ACE_LACKS_PTHREAD_THR_SIGSETMASK) - ACE_OS::sigprocmask (SIG_BLOCK, - (sigset_t *) ACE_Object_Manager::default_mask (), - (sigset_t *) + ACE_OS::sigprocmask (SIG_BLOCK, (sigset_t *) ACE_Object_Manager::default_mask (), (sigset_t *) this->omask_); #else - ACE_OS::thr_sigsetmask (SIG_BLOCK, - (sigset_t *) ACE_Object_Manager::default_mask (), - (sigset_t *) + ACE_OS::thr_sigsetmask (SIG_BLOCK, (sigset_t *) ACE_Object_Manager::default_mask (), (sigset_t *) this->omask_); #endif /* ACE_LACKS_PTHREAD_THR_SIGSETMASK */ } else #if defined (ACE_LACKS_PTHREAD_THR_SIGSETMASK) - ACE_OS::sigprocmask (SIG_BLOCK, - (sigset_t *) *mask, - (sigset_t *) + ACE_OS::sigprocmask (SIG_BLOCK, (sigset_t *) *mask, (sigset_t *) this->omask_); #else - ACE_OS::thr_sigsetmask (SIG_BLOCK, - (sigset_t *) *mask, - (sigset_t *) + ACE_OS::thr_sigsetmask (SIG_BLOCK, (sigset_t *) *mask, (sigset_t *) this->omask_); #endif /* ACE_LACKS_PTHREAD_THR_SIGSETMASK */ } diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp index 6dc4def40c4..3ebca15eed5 100644 --- a/ace/Singleton.cpp +++ b/ace/Singleton.cpp @@ -68,9 +68,8 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance (void) // ACE_Object_Manager: we'll have to leak this instance. #endif /* ACE_MT_SAFE */ - ACE_NEW_RETURN (singleton, - (ACE_Singleton<TYPE, - ACE_LOCK>), 0); + ACE_NEW_RETURN (singleton, (ACE_Singleton<TYPE, ACE_LOCK>), 0); + #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) } else @@ -87,9 +86,8 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance (void) if (singleton == 0) { - ACE_NEW_RETURN (singleton, - (ACE_Singleton<TYPE, ACE_LOCK>), - 0); + ACE_NEW_RETURN (singleton, (ACE_Singleton<TYPE, ACE_LOCK>), 0); + // Register for destruction with ACE_Object_Manager. ACE_Object_Manager::at_exit (singleton); } @@ -161,9 +159,9 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void) // don't register for destruction with the // ACE_Object_Manager: we'll have to leak this instance. #endif /* ACE_MT_SAFE */ - ACE_NEW_RETURN (singleton, - (ACE_TSS_Singleton<TYPE, ACE_LOCK>), - 0); + + ACE_NEW_RETURN (singleton, (ACE_TSS_Singleton<TYPE, ACE_LOCK>), 0); + #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) } else @@ -179,9 +177,9 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void) if (singleton == 0) { - ACE_NEW_RETURN (singleton, - (ACE_TSS_Singleton<TYPE, ACE_LOCK>), + ACE_NEW_RETURN (singleton, (ACE_TSS_Singleton<TYPE, ACE_LOCK>), 0); + // Register for destruction with ACE_Object_Manager. ACE_Object_Manager::at_exit (singleton); } diff --git a/ace/Stats.cpp b/ace/Stats.cpp index 45b7eb8258b..fbd5f7f18c8 100644 --- a/ace/Stats.cpp +++ b/ace/Stats.cpp @@ -153,7 +153,8 @@ ACE_Stats::std_dev (ACE_Stats_Value &std_dev, // works with the Diab compiler the way it is! // // Square using 64-bit arithmetic. - sum_of_squares += difference * ACE_U64_TO_U32 (difference); + sum_of_squares += difference * + ACE_U64_TO_U32 (difference); i.advance (); if (sum_of_squares < original_sum_of_squares) @@ -272,7 +273,7 @@ ACE_Stats::print_summary (const u_int precision, #if !defined (ACE_HAS_WINCE) ACE_OS::fprintf (file, ASYS_TEXT ("ACE_Stats::print_summary: OVERFLOW: %s\n"), - ASYS_WIDE_STRING (strerror (overflow_))); + ASYS_TEXT (strerror (overflow_))); #else // WinCE doesn't have strerror ;( ACE_OS::fprintf (file, @@ -419,222 +420,6 @@ ACE_Stats::square_root (const ACE_UINT64 n, } } -// **************************************************************** - -ACE_Throughput_Stats::ACE_Throughput_Stats (void) - : samples_count_ (0), - latency_min_ (0), - latency_max_ (0), - latency_sum_ (0), - latency_sum2_ (0), - throughput_last_ (0), - throughput_sum_x_ (0), - throughput_sum_x2_ (0), - throughput_sum_y_ (0), - throughput_sum_y2_ (0), - throughput_sum_xy_ (0) -{ -} - -void -ACE_Throughput_Stats::sample (ACE_UINT64 throughput, - ACE_UINT64 latency) -{ - ++this->samples_count_; - - if (this->samples_count_ == 1) - { - this->latency_min_ = latency; - this->latency_max_ = latency; - this->latency_sum_ = latency; -#if defined ACE_LACKS_LONGLONG_T - this->latency_sum2_ = latency * ACE_U64_TO_U32 (latency); -#else /* ! ACE_LACKS_LONGLONG_T */ - this->latency_sum2_ = latency * latency; -#endif /* ! ACE_LACKS_LONGLONG_T */ - - this->throughput_last_ = throughput; -#if 0 - 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_; - - printf ("%f %qu\n", throughput / 400000000.0, this->samples_count_); -#endif /* 0 */ - } - else - { - if (this->latency_min_ > latency) - this->latency_min_ = latency; - if (this->latency_max_ < latency) - this->latency_max_ = latency; - - this->latency_sum_ += latency; -#if defined ACE_LACKS_LONGLONG_T - this->latency_sum2_ += latency * ACE_U64_TO_U32 (latency); -#else /* ! ACE_LACKS_LONGLONG_T */ - this->latency_sum2_ += latency * latency; -#endif /* ! ACE_LACKS_LONGLONG_T */ - - this->throughput_last_ = throughput; - -#if 0 - 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_; - - printf ("%f %qu\n", throughput / 400000000.0, this->samples_count_); -#endif /* 0 */ - } -} - -void -ACE_Throughput_Stats::accumulate (const ACE_Throughput_Stats &rhs) -{ - if (rhs.samples_count_ == 0) - return; - - if (this->samples_count_ == 0) - { - this->samples_count_ = rhs.samples_count_; - - this->latency_min_ = rhs.latency_min_; - this->latency_max_ = rhs.latency_max_; - this->latency_sum_ = rhs.latency_sum_; - this->latency_sum2_ = rhs.latency_sum2_; - - this->throughput_last_ = rhs.throughput_last_; -#if 0 - 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; - } - - this->samples_count_ += rhs.samples_count_; - - if (this->latency_min_ > rhs.latency_min_) - this->latency_min_ = rhs.latency_min_; - if (this->latency_max_ < rhs.latency_max_) - this->latency_max_ = rhs.latency_max_; - - this->latency_sum_ += rhs.latency_sum_; - this->latency_sum2_ += rhs.latency_sum2_; - - if (this->throughput_last_ < rhs.throughput_last_) - this->throughput_last_ = rhs.throughput_last_; - -#if 0 - 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 -ACE_Throughput_Stats::dump_results (const ASYS_TCHAR* msg, - ACE_UINT32 sf) -{ - if (this->samples_count_ == 0) - { - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%s : no data collected\n"))); - return; - } - - ACE_UINT64 latency_avg = this->latency_sum_ / -#if defined ACE_LACKS_LONGLONG_T - ACE_U64_TO_U32 (this->samples_count_); -#else /* ! ACE_LACKS_LONGLONG_T */ - this->samples_count_; -#endif /* ! ACE_LACKS_LONGLONG_T */ - ACE_UINT64 latency_dev = -#if defined ACE_LACKS_LONGLONG_T - ACE_static_cast (ACE_U_LongLong, - this->latency_sum2_ / ACE_U64_TO_U32(this->samples_count_)) - - latency_avg * ACE_U64_TO_U32(latency_avg); -#else /* ! ACE_LACKS_LONGLONG_T */ - this->latency_sum2_ / this->samples_count_ - latency_avg * latency_avg; -#endif /* ! ACE_LACKS_LONGLONG_T */ - - double l_min = ACE_CU64_TO_CU32 (this->latency_min_) / sf; - double l_max = ACE_CU64_TO_CU32 (this->latency_max_) / sf; - double l_avg = ACE_CU64_TO_CU32 (latency_avg) / sf; - double l_dev = ACE_CU64_TO_CU32 (latency_dev) / (sf * sf); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("%s latency: %.2f/%.2f/%.2f/%.2f (min/avg/max/var^2)\n"), - msg, l_min, l_avg, l_max, l_dev)); - - double seconds = -#if defined ACE_LACKS_LONGLONG_T - this->throughput_last_ / sf; -#else /* ! ACE_LACKS_LONGLONG_T */ - ACE_static_cast (double, - ACE_UINT64_DBLCAST_ADAPTER(this->throughput_last_ / sf)); -#endif /* ! ACE_LACKS_LONGLONG_T */ - seconds /= 1000000.0; - double t_avg = ACE_CU64_TO_CU32 (this->samples_count_) / seconds; - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("%s throughput: %.2f (events/second)\n"), - msg, t_avg)); - -#if 0 - 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 -} - -// **************************************************************** - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Node <ACE_INT32>; template class ACE_Unbounded_Queue <ACE_INT32>; diff --git a/ace/Stats.h b/ace/Stats.h index 83feaea3939..7a7214f993b 100644 --- a/ace/Stats.h +++ b/ace/Stats.h @@ -186,55 +186,6 @@ private: // The samples. }; -// **************************************************************** - -class ACE_Export ACE_Throughput_Stats -{ - // = TITLE - // A simple class to make throughput and latency analysis. - // - // = DESCRIPTION - // Keep the relevant information to perform throughput and latency - // analysis, including: - // 1) Minimum, Average and Maximum latency - // 2) Jitter for the latency - // 3) Linear regression for throughput - // 4) Accumulate results from several samples to obtain aggregated - // results, across several threads or experiments. - // -public: - ACE_Throughput_Stats (void); - // Default constructor. - - void sample (ACE_UINT64 throughput, ACE_UINT64 latency); - // Store one sample - - void accumulate (const ACE_Throughput_Stats &throughput); - // Update the values to reflect the stats in <throughput> - - void dump_results (const ASYS_TCHAR* msg, ACE_UINT32 scale_factor); - // Print down the stats - -private: - ACE_UINT64 samples_count_; - // The number of samples - - ACE_UINT64 latency_min_; - ACE_UINT64 latency_max_; - ACE_UINT64 latency_sum_; - ACE_UINT64 latency_sum2_; - // The stadigraphs for latency computation - - ACE_UINT64 throughput_last_; - 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_; - // The stadigraphs for throughput computation -}; - - #if defined (__ACE_INLINE__) # include "ace/Stats.i" #endif /* __ACE_INLINE__ */ diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp index 73b4dfb579b..55898c2ecc8 100644 --- a/ace/Strategies_T.cpp +++ b/ace/Strategies_T.cpp @@ -77,17 +77,18 @@ ACE_DLL_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh) // Create an ACE_Service_Type containing the SVC_Handler and // insert into this->svc_rep_; - ACE_Service_Type_Impl *stp; - ACE_NEW_RETURN (stp, - ACE_Service_Object_Type (svc_handler, - this->svc_name_), - -1); + ACE_Service_Type_Impl *stp = + new ACE_Service_Object_Type (svc_handler, this->svc_name_); + + if (stp == 0) + { + errno = ENOMEM; + return -1; + } ACE_Service_Type *srp = - new ACE_Service_Type (this->svc_name_, - stp, - handle, - 1); + new ACE_Service_Type (this->svc_name_, stp, handle, 1); + if (srp == 0) { delete stp; @@ -206,7 +207,7 @@ ACE_Thread_Strategy<SVC_HANDLER>::open (ACE_Thread_Manager *thr_mgr, // Must have a thread manager! if (this->thr_mgr_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("error: must have a non-NULL thread manager\n")), + "error: must have a non-NULL thread manager\n"), -1); else return 0; diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h index fdb2ad5ca96..703ad95dfa1 100644 --- a/ace/Strategies_T.h +++ b/ace/Strategies_T.h @@ -638,6 +638,47 @@ public: // This is a no-op. }; +template <class ADDR_T> +class ACE_Hash_Addr +{ + // = TITLE + // Internal class to compute hash values on addresses in + // <ACE_Cached_Connect_Strategy>. + // + // = DESCRIPTION + // Intended to be used as a key to an <ACE_Hash_Map_Manager>. + // <ADDR_T> parameter/subclass is typically <ACE_INET_Addr>. It + // is expected to implement operator==(). +public: + // = Initialization methods. + ACE_Hash_Addr (void); + // Default constructor. + + ACE_Hash_Addr (const ADDR_T &a); + // Pre-compute hash value. + + ~ACE_Hash_Addr (void); + // Destructor. + + u_long hash (void) const; + // Computes and returns hash value. This "caches" the hash value to + // improve performance. + + int operator== (const ACE_Hash_Addr<ADDR_T> &rhs) const; + // Compares two hash values. + +private: + u_long hash_i (const ADDR_T &) const; + // This is the method that actually performs the non-cached hash + // computation. It should typically be specialized. + + u_long hash_value_; + // Pre-computed hash-value. + + ADDR_T addr_; + // The underlying address. +}; + template <class T> class ACE_Refcounted_Hash_Recyclable : public ACE_Refcountable, public ACE_Hashable, @@ -680,6 +721,25 @@ class ACE_Cached_Connect_Strategy : public ACE_Connection_Recycling_Strategy, pu // <ACE_Cached_Connect_Strategy> is intended to be used as a // plug-in connection strategy for <ACE_Strategy_Connector>. // It's added value is re-use of established connections. + // + // = USAGE + // In order to use this appropriately, the user must provide + // a template specialization for <ACE_Hash_Addr::compare_i()> and + // <ACE_Hash_Addr::hash_i()> based on the address type and the + // service handler type. For example, a specialization using + // <ACE_INET_Addr> and <My_Service_Handler> might be: + // = BEGIN<NOFILL> + // = BEGIN<CODE> + // size_t + // ACE_Hash_Addr<ACE_INET_Addr, My_Service_Handler>::hash_i(const ACE_INET_Addr &a) + // { + // return ...; + // } + // = END<CODE> + // = END<NOFILL> + // + // = SEE ALSO + // <ACE_Hash_Addr>. public: ACE_Cached_Connect_Strategy (ACE_Creation_Strategy<SVC_HANDLER> *cre_s = 0, @@ -805,7 +865,7 @@ protected: ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry, int &found); - virtual int connect_svc_handler_i (SVC_HANDLER *&sh, + int connect_svc_handler_i (SVC_HANDLER *&sh, const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, diff --git a/ace/Strategies_T.i b/ace/Strategies_T.i index c456700a6f3..d86bfca51cf 100644 --- a/ace/Strategies_T.i +++ b/ace/Strategies_T.i @@ -1,6 +1,11 @@ /* -*- C++ -*- */ // $Id$ +template<class ADDR_T> ASYS_INLINE +ACE_Hash_Addr<ADDR_T>::~ACE_Hash_Addr (void) +{ +} + template<class SVC_HANDLER> ASYS_INLINE ACE_Recycling_Strategy<SVC_HANDLER>::~ACE_Recycling_Strategy (void) { @@ -125,8 +130,8 @@ ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy (ACE_Reactor *reactor, ACE_TRACE ("ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy"); if (this->open (reactor, mask, flags) == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy"))); + ACE_ERROR ((LM_ERROR, "%p\n", + "ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy")); } template <class SVC_HANDLER> ASYS_INLINE @@ -153,9 +158,8 @@ ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy (ACE_Thread_Manager *thr_m ACE_TRACE ("ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy"); if (this->open (thr_mgr, thr_flags, n_threads, flags) == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy"))); + ACE_ERROR ((LM_ERROR, "%p\n", + "ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy")); } template <class SVC_HANDLER> ASYS_INLINE @@ -378,6 +382,48 @@ ACE_Refcounted_Hash_Recyclable<T>::operator== (const T &rhs) const return this->t_ == rhs; } +template<class ADDR_T> ASYS_INLINE +ACE_Hash_Addr<ADDR_T>::ACE_Hash_Addr (void) + : hash_value_ (0) +{ +} + +template<class ADDR_T> ASYS_INLINE +ACE_Hash_Addr<ADDR_T>::ACE_Hash_Addr (const ADDR_T &a) + : hash_value_ (0), + addr_ (a) +{ + this->hash (); +} + +template<class ADDR_T> ASYS_INLINE u_long +ACE_Hash_Addr<ADDR_T>::hash (void) const +{ + // In doing the check below, we take chance of paying a performance + // price when the hash value is zero. But, that will (hopefully) + // happen far less often than a non-zero value, so this caching + // strategy should pay off, esp. if hash computation is expensive + // relative to the simple comparison. + + if (this->hash_value_ == 0) + ((ACE_Hash_Addr<ADDR_T> *) this)->hash_value_ = this->hash_i (addr_); + + return this->hash_value_; +} + +template<class ADDR_T> ASYS_INLINE u_long +ACE_Hash_Addr<ADDR_T>::hash_i (const ADDR_T &b) const +{ + ACE_UNUSED_ARG (b); + return 0; +} + +template<class ADDR_T> ASYS_INLINE int +ACE_Hash_Addr<ADDR_T>::operator== (const ACE_Hash_Addr<ADDR_T> &rhs) const +{ + return this->addr_ == rhs.addr_; +} + template <class SVC_HANDLER> ASYS_INLINE int ACE_NOOP_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&) { diff --git a/ace/Stream.cpp b/ace/Stream.cpp index efdffd1cbb0..f8af657ff6d 100644 --- a/ace/Stream.cpp +++ b/ace/Stream.cpp @@ -231,10 +231,26 @@ ACE_Stream<ACE_SYNCH_USE>::push_module (ACE_Module<ACE_SYNCH_USE> *new_top, return 0; } +#if 0 template <ACE_SYNCH_DECL> int ACE_Stream<ACE_SYNCH_USE>::open (void *a, - ACE_Module<ACE_SYNCH_USE> *head, - ACE_Module<ACE_SYNCH_USE> *tail) + ACE_Multiplexor &muxer, + ACE_Module<ACE_SYNCH_USE> *head) +{ + ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::open"); + this->stream_head_ = head == 0 + ? new ACE_Module<ACE_SYNCH_USE> ("ACE_Stream_Head", + new ACE_Stream_Head<ACE_SYNCH_USE>, + new ACE_Stream_Head<ACE_SYNCH_USE>, a) : head; + this->stream_tail_ = 0; + return muxer.link_from_below (this->stream_head_); +} +#endif + +template <ACE_SYNCH_DECL> int +ACE_Stream<ACE_SYNCH_USE>::open (void *a, + ACE_Module<ACE_SYNCH_USE> *head, + ACE_Module<ACE_SYNCH_USE> *tail) { ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::open"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); @@ -339,12 +355,11 @@ ACE_Stream<ACE_SYNCH_USE>::control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd, ACE_Message_Block *db; // Try to create a data block that contains the user-supplied data. - ACE_NEW_RETURN (db, - ACE_Message_Block (sizeof (int), - ACE_Message_Block::MB_IOCTL, - 0, - (char *) a), - -1); + ACE_NEW_RETURN (db, ACE_Message_Block (sizeof (int), + ACE_Message_Block::MB_IOCTL, + 0, + (char *) a), -1); + // Try to create a control block <cb> that contains the control // field and a pointer to the data block <db> in <cb>'s continuation // field. diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h index 315e5f36063..76da4a83507 100644 --- a/ace/Svc_Conf.h +++ b/ace/Svc_Conf.h @@ -108,3 +108,4 @@ typedef union } ACE_YYSTYPE; extern ACE_YYSTYPE ace_yylval; #endif /* ACE_SVC_CONF_H */ + diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y index 908cbb5d721..a936a9a2047 100644 --- a/ace/Svc_Conf.y +++ b/ace/Svc_Conf.y @@ -12,7 +12,7 @@ ACE_RCSID(ace, Svc_Conf_y, "$Id$") static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec, ACE_Static_Node *svc_type); static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec, - const ASYS_TCHAR *svc_name); + const char *svc_name); #define YYDEBUG_LEXER_TEXT (yytext[yyleng] = '\0', yytext) @@ -69,7 +69,7 @@ dynamic : ACE_DYNAMIC svc_location parameters_opt { if ($2 != 0) - $$ = new ACE_Dynamic_Node ($2, ASYS_WIDE_STRING ($3)); + $$ = new ACE_Dynamic_Node ($2, $3); else $$ = 0; } @@ -78,28 +78,28 @@ dynamic static : ACE_STATIC ACE_IDENT parameters_opt { - $$ = new ACE_Static_Node (ASYS_WIDE_STRING ($2), ASYS_WIDE_STRING ($3)); + $$ = new ACE_Static_Node ($2, $3); } ; suspend : ACE_SUSPEND ACE_IDENT { - $$ = new ACE_Suspend_Node (ASYS_WIDE_STRING ($2)); + $$ = new ACE_Suspend_Node ($2); } ; resume : ACE_RESUME ACE_IDENT { - $$ = new ACE_Resume_Node (ASYS_WIDE_STRING ($2)); + $$ = new ACE_Resume_Node ($2); } ; remove : ACE_REMOVE ACE_IDENT { - $$ = new ACE_Remove_Node (ASYS_WIDE_STRING ($2)); + $$ = new ACE_Remove_Node ($2); } ; @@ -108,7 +108,7 @@ stream { $$ = new ACE_Stream_Node ($2, $3); } - | ACE_USTREAM ACE_IDENT { $<static_node_>$ = new ACE_Static_Node (ASYS_WIDE_STRING ($2)); } stream_modules + | ACE_USTREAM ACE_IDENT { $<static_node_>$ = new ACE_Static_Node ($2); } stream_modules { $$ = new ACE_Dummy_Node ($<static_node_>3, $4); } @@ -157,7 +157,7 @@ module { ACE_Static_Node *module = $<static_node_>-1; - ACE_ARGV args (svc_type->parameters ()); + ACE_ARGV args (ASYS_WIDE_STRING (svc_type->parameters ())); ACE_Module_Type *mt = ace_get_module (module, svc_type); ACE_Stream_Type *st = @@ -170,7 +170,7 @@ module { ACE_ERROR ((LM_ERROR, ASYS_TEXT ("dynamic initialization failed for Module %s\n"), - svc_type->name ())); + ASYS_WIDE_STRING (svc_type->name ()))); yyerrno++; } } @@ -215,8 +215,8 @@ module { ACE_ERROR ((LM_ERROR, ASYS_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"), - module->name (), - stream->name ())); + ASYS_WIDE_STRING (module->name ()), + ASYS_WIDE_STRING (stream->name ()))); yyerrno++; } } @@ -274,15 +274,15 @@ status svc_initializer : pathname ACE_COLON ACE_IDENT { - $$ = new ACE_Object_Node (ASYS_WIDE_STRING ($1), ASYS_WIDE_STRING($3)); + $$ = new ACE_Object_Node ($1, $3); } | pathname ACE_COLON ACE_IDENT ACE_LPAREN ACE_RPAREN { - $$ = new ACE_Function_Node (ASYS_WIDE_STRING ($1), ASYS_WIDE_STRING ($3)); + $$ = new ACE_Function_Node ($1, $3); } | ACE_COLON ACE_IDENT ACE_LPAREN ACE_RPAREN { - $$ = new ACE_Static_Function_Node (ASYS_WIDE_STRING ($2)); + $$ = new ACE_Static_Function_Node ($2); } ; @@ -334,7 +334,7 @@ yyerror (const char *s) static ACE_Module_Type * ace_get_module (ACE_Static_Node *str_rec, - const ASYS_TCHAR *svc_name) + const char *svc_name) { const ACE_Service_Type *sr = str_rec->record (); const ACE_Service_Type_Impl *type = sr->type (); @@ -343,14 +343,14 @@ ace_get_module (ACE_Static_Node *str_rec, : ACE_dynamic_cast (ACE_Stream_Type *, ACE_const_cast (ACE_Service_Type_Impl *, type)); - ACE_Module_Type *mt = st == 0 ? 0 : st->find (svc_name); + ACE_Module_Type *mt = st == 0 ? 0 : st->find (ASYS_WIDE_STRING (svc_name)); if (sr == 0 || st == 0 || mt == 0) { ACE_ERROR ((LM_ERROR, ASYS_TEXT ("cannot locate Module_Type %s in STREAM_Type %s\n"), - svc_name, - str_rec->name ())); + ASYS_WIDE_STRING (svc_name), + ASYS_WIDE_STRING (str_rec->name ()))); yyerrno++; } @@ -367,14 +367,14 @@ ace_get_module (ACE_Static_Node *str_rec, const ACE_Service_Type *sv = svc_type->record (); type = sv->type (); ACE_Module_Type *mt = (ACE_Module_Type *) type; - const ASYS_TCHAR *module_type_name = svc_type->name (); + const char *module_type_name = svc_type->name (); if (sr == 0 || st == 0 || mt == 0) { ACE_ERROR ((LM_ERROR, ASYS_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"), - module_type_name, - str_rec->name ())); + ASYS_WIDE_STRING (module_type_name), + ASYS_WIDE_STRING (str_rec->name ()))); yyerrno++; } @@ -382,13 +382,13 @@ ace_get_module (ACE_Static_Node *str_rec, // Module_Type object from the svc.conf file. ACE_Module<ACE_SYNCH> *mp = (ACE_Module<ACE_SYNCH> *) mt->object (); - if (ACE_OS::strcmp (mp->name (), module_type_name) != 0) + if (ACE_OS::strcmp (mp->name (), ASYS_WIDE_STRING (module_type_name)) != 0) { ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"), - module_type_name, + ASYS_WIDE_STRING (module_type_name), mp->name ())); - mp->name (module_type_name); + mp->name (ASYS_WIDE_STRING (module_type_name)); } return mt; @@ -440,7 +440,7 @@ ace_create_service_type (const ASYS_TCHAR *name, int yylineno = 1; // Name given on the command-line to envoke the program. -ASYS_TCHAR *program_name; +char *program_name; // Main driver program. diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp index a17da8b62ab..9083f7fd7e1 100644 --- a/ace/Svc_Conf_y.cpp +++ b/ace/Svc_Conf_y.cpp @@ -16,7 +16,7 @@ ACE_RCSID(ace, Svc_Conf_y, "$Id$") static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec, ACE_Static_Node *svc_type); static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec, - const ASYS_TCHAR *svc_name); + const char *svc_name); #define ACE_YYDEBUG_LEXER_TEXT (ace_yytext[ace_yyleng] = '\0', ace_yytext) @@ -273,7 +273,7 @@ ace_yyerror (const char *s) static ACE_Module_Type * ace_get_module (ACE_Static_Node *str_rec, - const ASYS_TCHAR *svc_name) + const char *svc_name) { const ACE_Service_Type *sr = str_rec->record (); const ACE_Service_Type_Impl *type = sr->type (); @@ -282,14 +282,14 @@ ace_get_module (ACE_Static_Node *str_rec, : ACE_dynamic_cast (ACE_Stream_Type *, ACE_const_cast (ACE_Service_Type_Impl *, type)); - ACE_Module_Type *mt = st == 0 ? 0 : st->find (svc_name); + ACE_Module_Type *mt = st == 0 ? 0 : st->find (ASYS_WIDE_STRING (svc_name)); if (sr == 0 || st == 0 || mt == 0) { ACE_ERROR ((LM_ERROR, ASYS_TEXT ("cannot locate Module_Type %s in STREAM_Type %s\n"), - svc_name, - str_rec->name ())); + ASYS_WIDE_STRING (svc_name), + ASYS_WIDE_STRING (str_rec->name ()))); ace_yyerrno++; } @@ -306,14 +306,14 @@ ace_get_module (ACE_Static_Node *str_rec, const ACE_Service_Type *sv = svc_type->record (); type = sv->type (); ACE_Module_Type *mt = (ACE_Module_Type *) type; - const ASYS_TCHAR *module_type_name = svc_type->name (); + const char *module_type_name = svc_type->name (); if (sr == 0 || st == 0 || mt == 0) { ACE_ERROR ((LM_ERROR, ASYS_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"), - module_type_name, - str_rec->name ())); + ASYS_WIDE_STRING (module_type_name), + ASYS_WIDE_STRING (str_rec->name ()))); ace_yyerrno++; } @@ -321,13 +321,13 @@ ace_get_module (ACE_Static_Node *str_rec, // Module_Type object from the svc.conf file. ACE_Module<ACE_SYNCH> *mp = (ACE_Module<ACE_SYNCH> *) mt->object (); - if (ACE_OS::strcmp (mp->name (), module_type_name) != 0) + if (ACE_OS::strcmp (mp->name (), ASYS_WIDE_STRING (module_type_name)) != 0) { ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"), - module_type_name, + ASYS_WIDE_STRING (module_type_name), mp->name ())); - mp->name (module_type_name); + mp->name (ASYS_WIDE_STRING (module_type_name)); } return mt; @@ -379,7 +379,7 @@ ace_create_service_type (const ASYS_TCHAR *name, int ace_yylineno = 1; // Name given on the command-line to envoke the program. -ASYS_TCHAR *program_name; +char *program_name; // Main driver program. @@ -722,7 +722,7 @@ case 10: #line 70 "Svc_Conf.y" { if (ace_yyvsp[-1].svc_record_ != 0) - ace_yyval.parse_node_ = new ACE_Dynamic_Node (ace_yyvsp[-1].svc_record_, ASYS_WIDE_STRING (ace_yyvsp[0].ident_)); + ace_yyval.parse_node_ = new ACE_Dynamic_Node (ace_yyvsp[-1].svc_record_, ace_yyvsp[0].ident_); else ace_yyval.parse_node_ = 0; } @@ -730,25 +730,25 @@ break; case 11: #line 80 "Svc_Conf.y" { - ace_yyval.parse_node_ = new ACE_Static_Node (ASYS_WIDE_STRING (ace_yyvsp[-1].ident_), ASYS_WIDE_STRING (ace_yyvsp[0].ident_)); + ace_yyval.parse_node_ = new ACE_Static_Node (ace_yyvsp[-1].ident_, ace_yyvsp[0].ident_); } break; case 12: #line 87 "Svc_Conf.y" { - ace_yyval.parse_node_ = new ACE_Suspend_Node (ASYS_WIDE_STRING (ace_yyvsp[0].ident_)); + ace_yyval.parse_node_ = new ACE_Suspend_Node (ace_yyvsp[0].ident_); } break; case 13: #line 94 "Svc_Conf.y" { - ace_yyval.parse_node_ = new ACE_Resume_Node (ASYS_WIDE_STRING (ace_yyvsp[0].ident_)); + ace_yyval.parse_node_ = new ACE_Resume_Node (ace_yyvsp[0].ident_); } break; case 14: #line 101 "Svc_Conf.y" { - ace_yyval.parse_node_ = new ACE_Remove_Node (ASYS_WIDE_STRING (ace_yyvsp[0].ident_)); + ace_yyval.parse_node_ = new ACE_Remove_Node (ace_yyvsp[0].ident_); } break; case 15: @@ -759,7 +759,7 @@ case 15: break; case 16: #line 111 "Svc_Conf.y" -{ ace_yyval.static_node_ = new ACE_Static_Node (ASYS_WIDE_STRING (ace_yyvsp[0].ident_)); } +{ ace_yyval.static_node_ = new ACE_Static_Node (ace_yyvsp[0].ident_); } break; case 17: #line 112 "Svc_Conf.y" @@ -817,7 +817,7 @@ case 25: { ACE_Static_Node *module = ace_yyvsp[-2].static_node_; - ACE_ARGV args (svc_type->parameters ()); + ACE_ARGV args (ASYS_WIDE_STRING (svc_type->parameters ())); ACE_Module_Type *mt = ace_get_module (module, svc_type); ACE_Stream_Type *st = @@ -830,7 +830,7 @@ case 25: { ACE_ERROR ((LM_ERROR, ASYS_TEXT ("dynamic initialization failed for Module %s\n"), - svc_type->name ())); + ASYS_WIDE_STRING (svc_type->name ()))); ace_yyerrno++; } } @@ -883,8 +883,8 @@ case 29: { ACE_ERROR ((LM_ERROR, ASYS_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"), - module->name (), - stream->name ())); + ASYS_WIDE_STRING (module->name ()), + ASYS_WIDE_STRING (stream->name ()))); ace_yyerrno++; } } @@ -943,19 +943,19 @@ break; case 34: #line 276 "Svc_Conf.y" { - ace_yyval.location_node_ = new ACE_Object_Node (ASYS_WIDE_STRING (ace_yyvsp[-2].ident_), ASYS_WIDE_STRING(ace_yyvsp[0].ident_)); + ace_yyval.location_node_ = new ACE_Object_Node (ace_yyvsp[-2].ident_, ace_yyvsp[0].ident_); } break; case 35: #line 280 "Svc_Conf.y" { - ace_yyval.location_node_ = new ACE_Function_Node (ASYS_WIDE_STRING (ace_yyvsp[-4].ident_), ASYS_WIDE_STRING (ace_yyvsp[-2].ident_)); + ace_yyval.location_node_ = new ACE_Function_Node (ace_yyvsp[-4].ident_, ace_yyvsp[-2].ident_); } break; case 36: #line 284 "Svc_Conf.y" { - ace_yyval.location_node_ = new ACE_Static_Function_Node (ASYS_WIDE_STRING (ace_yyvsp[-2].ident_)); + ace_yyval.location_node_ = new ACE_Static_Function_Node (ace_yyvsp[-2].ident_); } break; case 37: diff --git a/ace/Synch.h b/ace/Synch.h index 5297198ae95..d3d42b7f7af 100644 --- a/ace/Synch.h +++ b/ace/Synch.h @@ -260,13 +260,7 @@ public: // Note that <tv> is assumed to be in "absolute" rather than // "relative" time. The value of <tv> is updated upon return, i.e., // the caller gets the amount of time that has elapsed while waiting - // to acquire the semaphore. - // - // NOTE: Solaris threads do not support timed semaphores. - // Therefore, if you're running on Solaris you might want to - // consider using the ACE POSIX pthreads implementation instead, - // which can be enabled by compiling ACE with - // -D_POSIX_PTHREAD_SEMANTICS. + // to acquire the semaphore. int tryacquire (void); // Conditionally decrement the semaphore if count is greater than 0 diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp index 2c75b420838..5946d443182 100644 --- a/ace/Synch_T.cpp +++ b/ace/Synch_T.cpp @@ -32,8 +32,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter (void) : lock_ (0), delete_lock_ (1) { - ACE_NEW (this->lock_, - ACE_LOCKING_MECHANISM); + ACE_NEW (this->lock_, ACE_LOCKING_MECHANISM); } template <class ACE_LOCKING_MECHANISM> @@ -726,9 +725,7 @@ ACE_TSS_Guard<ACE_LOCK>::ACE_TSS_Guard (ACE_LOCK &lock, int block) this->init_key (); ACE_Guard<ACE_LOCK> *guard; - ACE_NEW (guard, - ACE_Guard<ACE_LOCK> (lock, - block)); + ACE_NEW (guard, ACE_Guard<ACE_LOCK> (lock, block)); #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter; @@ -791,9 +788,7 @@ ACE_TSS_Write_Guard<ACE_LOCK>::ACE_TSS_Write_Guard (ACE_LOCK &lock, this->init_key (); ACE_Guard<ACE_LOCK> *guard; - ACE_NEW (guard, - ACE_Write_Guard<ACE_LOCK> (lock, - block)); + ACE_NEW (guard, ACE_Write_Guard<ACE_LOCK> (lock, block)); #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter; @@ -878,9 +873,8 @@ ACE_TSS_Read_Guard<ACE_LOCK>::ACE_TSS_Read_Guard (ACE_LOCK &lock, int block) this->init_key (); ACE_Guard<ACE_LOCK> *guard; - ACE_NEW (guard, - ACE_Read_Guard<ACE_LOCK> (lock, - block)); + ACE_NEW (guard, ACE_Read_Guard<ACE_LOCK> (lock, block)); + #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter; ACE_NEW (tss_adapter, diff --git a/ace/System_Time.cpp b/ace/System_Time.cpp index 833086650cd..0ad522daca9 100644 --- a/ace/System_Time.cpp +++ b/ace/System_Time.cpp @@ -10,8 +10,7 @@ ACE_System_Time::ACE_System_Time (LPCTSTR poolname) : delta_time_ (0) { ACE_TRACE ("ACE_System_Time::ACE_System_Time"); - ACE_NEW (this->shmem_, - ALLOCATOR (poolname)); + ACE_NEW (this->shmem_, ALLOCATOR (poolname)); } ACE_System_Time::~ACE_System_Time (void) diff --git a/ace/TLI.cpp b/ace/TLI.cpp index 39b17f2a58d..f6d0ec697cc 100644 --- a/ace/TLI.cpp +++ b/ace/TLI.cpp @@ -27,8 +27,7 @@ ACE_TLI::ACE_TLI (void) // (jph@ccrl.nj.nec.com) for the help. this->so_opt_req.opt.maxlen = sizeof (opthdr) + sizeof (long); - ACE_NEW (this->so_opt_req.opt.buf, - char[this->so_opt_req.opt.maxlen]); + ACE_NEW (this->so_opt_req.opt.buf, char[this->so_opt_req.opt.maxlen]); this->so_opt_ret.opt.maxlen = sizeof (opthdr) + sizeof (long); this->so_opt_ret.opt.buf = new char[this->so_opt_ret.opt.maxlen]; diff --git a/ace/Task_T.cpp b/ace/Task_T.cpp index 17c4612e67e..b6425369a05 100644 --- a/ace/Task_T.cpp +++ b/ace/Task_T.cpp @@ -56,8 +56,7 @@ ACE_Task<ACE_SYNCH_USE>::ACE_Task (ACE_Thread_Manager *thr_man, if (mq == 0) { - ACE_NEW (mq, - ACE_Message_Queue<ACE_SYNCH_USE>); + ACE_NEW (mq, ACE_Message_Queue<ACE_SYNCH_USE>); this->delete_msg_queue_ = 1; } diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp index 560cf96f404..b4210955aa6 100644 --- a/ace/Thread_Manager.cpp +++ b/ace/Thread_Manager.cpp @@ -203,11 +203,7 @@ ACE_Thread_Descriptor::at_exit (void *object, else { ACE_At_Thread_Exit* cleanup; - ACE_NEW_RETURN (cleanup, - ACE_At_Thread_Exit_Func (object, - cleanup_hook, - param), - -1); + ACE_NEW_RETURN (cleanup, ACE_At_Thread_Exit_Func (object,cleanup_hook,param), -1); this->at_push (cleanup); } #endif /* ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ @@ -244,8 +240,7 @@ ACE_Thread_Descriptor::ACE_Thread_Descriptor (void) this->cleanup_info_.object_ = 0; this->cleanup_info_.param_ = 0; #endif /* ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - ACE_NEW (this->sync_, - ACE_DEFAULT_THREAD_MANAGER_LOCK); + ACE_NEW (this->sync_, ACE_DEFAULT_THREAD_MANAGER_LOCK); } void @@ -339,9 +334,7 @@ ACE_Thread_Manager::instance (void) if (ACE_Thread_Manager::thr_mgr_ == 0) { - ACE_NEW_RETURN (ACE_Thread_Manager::thr_mgr_, - ACE_Thread_Manager, - 0); + ACE_NEW_RETURN (ACE_Thread_Manager::thr_mgr_, ACE_Thread_Manager, 0); ACE_Thread_Manager::delete_thr_mgr_ = 1; } } @@ -450,19 +443,13 @@ ACE_Thread_Exit::instance (void) if (instance_ == 0) { - ACE_NEW_RETURN (instance_, - ACE_TSS_TYPE (ACE_Thread_Exit), - 0); + ACE_NEW_RETURN (instance_, ACE_TSS_TYPE (ACE_Thread_Exit), 0); // Register for destruction with ACE_Object_Manager. #if defined ACE_HAS_SIG_C_FUNC - ACE_Object_Manager::at_exit (instance_, - ACE_Thread_Exit_cleanup, - 0); + ACE_Object_Manager::at_exit (instance_, ACE_Thread_Exit_cleanup, 0); #else - ACE_Object_Manager::at_exit (instance_, - ACE_Thread_Exit::cleanup, - 0); + ACE_Object_Manager::at_exit (instance_, ACE_Thread_Exit::cleanup, 0); #endif /* ACE_HAS_SIG_C_FUNC */ } } @@ -673,9 +660,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func, if (t_id == 0) { char *thr_id; - ACE_NEW_RETURN (thr_id, - char[16], - -1); + ACE_NEW_RETURN (thr_id, char[16], -1); // Mark the thread ID to show that the ACE_Thread_Manager // allocated it. thr_id[0] = ACE_THR_ID_ALLOCATED; @@ -857,9 +842,7 @@ ACE_Thread_Manager::append_thr (ACE_thread_t t_id, ACE_Thread_Descriptor *thr_desc; if (td == 0) - ACE_NEW_RETURN (thr_desc, - ACE_Thread_Descriptor, - -1); + ACE_NEW_RETURN (thr_desc, ACE_Thread_Descriptor, -1); else thr_desc = td; diff --git a/ace/Timer_Hash_T.cpp b/ace/Timer_Hash_T.cpp index 727afcc0d44..d6d8e2b3921 100644 --- a/ace/Timer_Hash_T.cpp +++ b/ace/Timer_Hash_T.cpp @@ -56,16 +56,14 @@ ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::timeout (ACE_Timer_Queue_T<ACE_E { ACE_UNUSED_ARG (timer_queue); - Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, - ACE_const_cast (void *, - arg)); - int result = - this->timer_hash_->upcall_functor ().timeout (*this->timer_hash_, - handler, - h->act_, - cur_time); + Hash_Token *h = (Hash_Token *)arg; + + int ret = this->timer_hash_->upcall_functor ().timeout (*this->timer_hash_, + handler, + h->act_, + cur_time); delete h; - return result; + return ret; } @@ -73,9 +71,9 @@ ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::timeout (ACE_Timer_Queue_T<ACE_E template <class TYPE, class FUNCTOR, class ACE_LOCK> int ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::cancellation (ACE_Timer_Queue_T<ACE_Event_Handler *, - ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>, - ACE_Null_Mutex> &timer_queue, - ACE_Event_Handler *handler) + ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>, + ACE_Null_Mutex> &timer_queue, + ACE_Event_Handler *handler) { ACE_UNUSED_ARG (timer_queue); return this->timer_hash_->upcall_functor ().cancellation (*this->timer_hash_, @@ -87,22 +85,20 @@ ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::cancellation (ACE_Timer_Queue_T< template <class TYPE, class FUNCTOR, class ACE_LOCK> int ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::deletion (ACE_Timer_Queue_T<ACE_Event_Handler *, - ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>, - ACE_Null_Mutex> &timer_queue, - ACE_Event_Handler *handler, - const void *arg) + ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>, + ACE_Null_Mutex> &timer_queue, + ACE_Event_Handler *handler, + const void *arg) { ACE_UNUSED_ARG (timer_queue); - Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, - ACE_const_cast (void *, - arg)); - int result = - this->timer_hash_->upcall_functor ().deletion (*this->timer_hash_, - handler, - h->act_); + Hash_Token *h = (Hash_Token *)arg; + + int ret = this->timer_hash_->upcall_functor ().deletion (*this->timer_hash_, + handler, + h->act_); delete h; - return result; + return ret; } @@ -111,7 +107,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::ACE_Timer_Hash_Iterator_T (ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET> &hash) : timer_hash_ (hash) { - this->first (); + this->first(); // Nothing } @@ -137,6 +133,7 @@ ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::first (void) this->iter_ = 0; } + // Positions the iterator at the next node in the bucket or goes to the next // bucket @@ -167,6 +164,7 @@ ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::next (void) this->iter_->next (); } + // Returns true when we are at the end (when bucket_item_ == 0) template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int @@ -175,6 +173,7 @@ ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::isdone (void) return this->iter_ == 0; } + // Returns the node at the current position in the sequence template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> ACE_Timer_Node_T<TYPE> * @@ -212,14 +211,11 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::ACE_Timer_Hash_T (size_t tabl for (size_t i = 0; i < table_size; i++) { - ACE_NEW (this->table_[i], - BUCKET (&this->table_functor_, - this->free_list_)); + this->table_[i] = new BUCKET (&this->table_functor_, this->free_list_); this->table_[i]->gettimeofday (ACE_OS::gettimeofday); } - ACE_NEW (iterator_, - HASH_ITERATOR (*this)); + iterator_ = new HASH_ITERATOR(*this); } @@ -239,14 +235,11 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::ACE_Timer_Hash_T (FUNCTOR *up for (size_t i = 0; i < this->table_size_; i++) { - ACE_NEW (this->table_[i], - BUCKET (&this->table_functor_, - this->free_list_)); + this->table_[i] = new BUCKET (&this->table_functor_, this->free_list_); this->table_[i]->gettimeofday (ACE_OS::gettimeofday); } - ACE_NEW (iterator_, - HASH_ITERATOR (*this)); + iterator_ = new HASH_ITERATOR(*this); } @@ -275,6 +268,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::is_empty (void) const return this->table_[this->earliest_position_]->is_empty (); } + // Returns earliest time in a non-empty bucket template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> const ACE_Time_Value & @@ -298,6 +292,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } + // Reschedule a periodic timer. This function must be called with the // mutex lock held. @@ -306,12 +301,9 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::reschedule (ACE_Timer_Node_T< { ACE_TRACE ("ACE_Timer_Hash_T::reschedule"); - size_t position = - expired->get_timer_value ().usec () % this->table_size_; + size_t position = expired->get_timer_value ().usec () % this->table_size_; - Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, - ACE_const_cast (void *, - expired->get_act ())); + Hash_Token *h = (Hash_Token *)expired->get_act (); h->orig_id_ = this->table_[position]->schedule (expired->get_type (), h, @@ -319,11 +311,11 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::reschedule (ACE_Timer_Node_T< expired->get_interval ()); if (this->table_[this->earliest_position_]->is_empty () - || this->table_[position]->earliest_time () - < this->table_[this->earliest_position_]->earliest_time ()) + || this->table_[position]->earliest_time () < this->table_[this->earliest_position_]->earliest_time ()) this->earliest_position_ = position; } + // Insert a new handler that expires at time future_time; if interval // is > 0, the handler will be reinvoked periodically. @@ -338,13 +330,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::schedule (const TYPE &type, size_t position = future_time.usec () % this->table_size_; - Hash_Token *h; - - ACE_NEW_RETURN (h, - Hash_Token (act, - position, - 0), - -1); + Hash_Token *h = new Hash_Token (act, position, 0); h->orig_id_ = this->table_[position]->schedule (type, h, @@ -357,8 +343,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::schedule (const TYPE &type, ++this->size_; - return ACE_reinterpret_cast (long, - h); + return (long) h; } // Locate and remove the single <ACE_Event_Handler> with a value of @@ -366,23 +351,20 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::schedule (const TYPE &type, template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::cancel (long timer_id, - const void **act, - int dont_call) + const void **act, + int dont_call) { ACE_TRACE ("ACE_Timer_Hash_T::cancel"); ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); // Make sure we are getting a valid <timer_id>, not an error - // returned by <schedule>. + // returned by schedule () if (timer_id == -1) return 0; - Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, - timer_id); + Hash_Token *h = (Hash_Token *)timer_id; - int result = this->table_[h->pos_]->cancel (h->orig_id_, - act, - dont_call); + int ret = this->table_[h->pos_]->cancel (h->orig_id_, act, dont_call); if (h->pos_ == this->earliest_position_) this->find_new_earliest (); @@ -394,66 +376,55 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::cancel (long timer_id, --this->size_; - return result; + return ret; } + // Locate and remove all values of <type> from the timer queue. template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::cancel (const TYPE &type, - int dont_call) + int dont_call) { ACE_TRACE ("ACE_Timer_Hash_T::cancel"); ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - size_t i; // loop variable. - - Hash_Token **timer_ids; + size_t i; // loop variable - ACE_NEW_RETURN (timer_ids, - Hash_Token *[this->size_], - -1); + Hash_Token **timer_ids = new Hash_Token *[this->size_]; size_t pos = 0; - for (i = 0; - i < this->table_size_; - i++) + for (i = 0; i < this->table_size_; i++) { - ACE_Timer_Queue_Iterator_T<TYPE, ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>, ACE_Null_Mutex> &iter = - this->table_[i]->iter (); - - for (iter.first (); - !iter.isdone (); - iter.next ()) + ACE_Timer_Queue_Iterator_T<TYPE, ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>, ACE_Null_Mutex> &iter = this->table_[i]->iter (); + for (iter.first (); !iter.isdone (); iter.next ()) if (iter.item ()->get_type () == type) - timer_ids[pos++] = ACE_reinterpret_cast (Hash_Token *, - ACE_const_cast (void *, - iter.item ()->get_act ())); + timer_ids[pos++] = (Hash_Token *)iter.item ()->get_act (); } - if (pos > this->size_) - return -1; + ACE_ASSERT (pos <= this->size_); for (i = 0; i < pos; i++) { - this->table_[timer_ids[i]->pos_]->cancel (timer_ids[i]->orig_id_, - 0, - 1); + this->table_[timer_ids[i]->pos_]->cancel (timer_ids[i]->orig_id_, 0, 1); + delete timer_ids[i]; + --this->size_; } delete [] timer_ids; if (dont_call == 0) - this->upcall_functor ().cancellation (*this, type); + this->upcall_functor ().cancellation (*this, type); this->find_new_earliest (); return pos; } + // Removes the earliest node and finds the new earliest position template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> ACE_Timer_Node_T<TYPE> * @@ -462,8 +433,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::remove_first (void) if (this->is_empty ()) return 0; - ACE_Timer_Node_T<TYPE> *temp = - this->table_[this->earliest_position_]->remove_first (); + ACE_Timer_Node_T<TYPE> *temp = this->table_[this->earliest_position_]->remove_first (); this->find_new_earliest (); @@ -479,12 +449,13 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::find_new_earliest (void) { for (size_t i = 0; i < this->table_size_; i++) if (!this->table_[i]->is_empty ()) - if (this->table_[this->earliest_position_]->is_empty () + if (this->table_[this->earliest_position_]->is_empty() || this->earliest_time () == ACE_Time_Value::zero || this->table_[i]->earliest_time () <= this->earliest_time ()) this->earliest_position_ = i; } + // Returns the earliest node without removing it template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> ACE_Timer_Node_T<TYPE> * @@ -498,6 +469,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::get_first (void) return this->table_[this->earliest_position_]->get_first (); } + // Dummy version of expire to get rid of warnings in Sun CC 4.2 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int @@ -506,6 +478,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::expire () return ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK>::expire(); } + // Specialized expire for Timer Hash template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int @@ -520,12 +493,10 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::expire (const ACE_Time_Value // Go through the table and expire anything that can be expired - for (size_t i = 0; - i < this->table_size_; - i++) + for (size_t i = 0; i < this->table_size_; i++) { - while (!this->table_[i]->is_empty () - && this->table_[i]->earliest_time () <= cur_time) + while (!this->table_[i]->is_empty () && + this->table_[i]->earliest_time () <= cur_time) { expired = this->table_[i]->remove_first (); --this->size_; @@ -539,23 +510,18 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::expire (const ACE_Time_Value // Make sure that we skip past values that have already // "expired". do - expired->set_timer_value (expired->get_timer_value () - + expired->get_interval ()); + expired->set_timer_value (expired->get_timer_value () + expired->get_interval ()); while (expired->get_timer_value () <= cur_time); - // Since this is an interval timer, we need to - // reschedule it. + // Since this is an interval timer, we need to reschedule + // it. this->reschedule (expired); reclaim = 0; } // call the functor - Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, - ACE_const_cast (void *, - act)); - this->upcall (type, - h->act_, - cur_time); + Hash_Token *h = (Hash_Token *)act; + this->upcall (type, h->act_, cur_time); if (reclaim) { diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp index f5e223a5eb0..2630c07b9c1 100644 --- a/ace/Timer_Heap_T.cpp +++ b/ace/Timer_Heap_T.cpp @@ -17,6 +17,7 @@ ACE_RCSID(ace, Timer_Heap_T, "$Id$") #define ACE_HEAP_PARENT(X) (X == 0 ? 0 : (((X) - 1) / 2)) #define ACE_HEAP_LCHILD(X) (((X)+(X))+1) + // Constructor that takes in an <ACE_Timer_Heap_T> to iterate over. template <class TYPE, class FUNCTOR, class ACE_LOCK> @@ -32,6 +33,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Heap_Iterator_T ( { } + // Positions the iterator at the first node in the heap array template <class TYPE, class FUNCTOR, class ACE_LOCK> void @@ -40,6 +42,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::first (void) this->position_ = 0; } + // Positions the iterator at the next node in the heap array template <class TYPE, class FUNCTOR, class ACE_LOCK> void @@ -49,6 +52,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::next (void) this->position_++; } + // Returns true the <position_> is at the end of the heap array template <class TYPE, class FUNCTOR, class ACE_LOCK> int @@ -57,6 +61,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::isdone (void) return this->position_ == this->timer_heap_.cur_size_; } + // Returns the node at the current position in the heap or 0 if at the end template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Node_T<TYPE> * @@ -71,9 +76,9 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::item (void) template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (size_t size, - int preallocate, - FUNCTOR *upcall_functor, - ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist) + int preallocate, + FUNCTOR *upcall_functor, + ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist) : ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK> (upcall_functor, freelist), max_size_ (size), cur_size_ (0), @@ -84,12 +89,10 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (size_t size, ACE_TRACE ("ACE_Timer_Heap_T::ACE_Timer_Heap_T"); // Create the heap array. - ACE_NEW (this->heap_, - ACE_Timer_Node_T<TYPE> *[size]); + ACE_NEW (this->heap_, (ACE_Timer_Node_T<TYPE> *[size])); // Create the parallel - ACE_NEW (this->timer_ids_, - long[size]); + ACE_NEW (this->timer_ids_, long[size]); // Initialize the "freelist," which uses negative values to // distinguish freelist elements from "pointers" into the <heap_> @@ -100,10 +103,10 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (size_t size, if (preallocate) { ACE_NEW (this->preallocated_nodes_, - ACE_Timer_Node_T<TYPE>[size]); + (ACE_Timer_Node_T<TYPE>[size])); - // Add allocated array to set of such arrays for deletion on - // cleanup. + // Add allocated array to set of such arrays for deletion + // on cleanup. this->preallocated_node_set_.insert (this->preallocated_nodes_); // Form the freelist by linking the next_ pointers together. @@ -118,13 +121,12 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (size_t size, &this->preallocated_nodes_[0]; } - ACE_NEW (iterator_, - HEAP_ITERATOR (*this)); + iterator_ = new HEAP_ITERATOR(*this); } template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (FUNCTOR *upcall_functor, - ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist) + ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist) : ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK> (upcall_functor, freelist), max_size_ (ACE_DEFAULT_TIMERS), cur_size_ (0), @@ -135,30 +137,21 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (FUNCTOR *upcall_fun ACE_TRACE ("ACE_Timer_Heap_T::ACE_Timer_Heap_T"); // Create the heap array. -#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) - ACE_NEW (this->heap_, - ACE_Timer_Node_T<TYPE> *[ACE_DEFAULT_TIMERS]); -#else - ACE_NEW (this->heap_, - ACE_Timer_Node_T<TYPE> *[this->max_size_]); -#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */ - - // Create the parallel array. - ACE_NEW (this->timer_ids_, - long[this->max_size_]); + ACE_NEW (this->heap_, (ACE_Timer_Node_T<TYPE> *[this->max_size_])); + + // Create the parallel + ACE_NEW (this->timer_ids_, long[this->max_size_]); // Initialize the "freelist," which uses negative values to // distinguish freelist elements from "pointers" into the <heap_> // array. - for (size_t i = 0; - i < this->max_size_; - i++) + for (size_t i = 0; i < this->max_size_; i++) this->timer_ids_[i] = -((long) (i + 1)); - ACE_NEW (iterator_, - HEAP_ITERATOR (*this)); + iterator_ = new HEAP_ITERATOR(*this); } + template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Heap_T (void) { @@ -175,6 +168,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Heap_T (void) this->free_node (this->heap_[i]); } + delete [] this->heap_; delete [] this->timer_ids_; @@ -191,6 +185,9 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Heap_T (void) } } + + + template <class TYPE, class FUNCTOR, class ACE_LOCK> int ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::pop_freelist (void) { @@ -198,15 +195,13 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::pop_freelist (void) // We need to truncate this to <int> for backwards compatibility. int new_id = (int) this->timer_ids_freelist_; - // The freelist values in the <timer_ids_> are negative, so we need // to negate them to get the next freelist "pointer." - this->timer_ids_freelist_ = - -this->timer_ids_[this->timer_ids_freelist_]; - + this->timer_ids_freelist_ = -this->timer_ids_[this->timer_ids_freelist_]; return new_id; } + template <class TYPE, class FUNCTOR, class ACE_LOCK> void ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::push_freelist (int old_id) { @@ -236,6 +231,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::is_empty (void) const return this->cur_size_ == 0; } + template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> & ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::iter (void) { @@ -245,6 +241,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::iter (void) // Returns earliest time in a non-empty queue. + template <class TYPE, class FUNCTOR, class ACE_LOCK> const ACE_Time_Value & ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::earliest_time (void) const { @@ -252,6 +249,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::earliest_time (void) const return this->heap_[0]->get_timer_value (); } + template <class TYPE, class FUNCTOR, class ACE_LOCK> void ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const { @@ -264,19 +262,14 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const for (size_t i = 0; i < this->cur_size_; i++) { - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("%d\n"), - i)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%d\n"), i)); this->heap_[i]->dump (); } ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ntimer_ids_ = \n"))); for (size_t j = 0; j < this->cur_size_; j++) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("%d\t%d\n"), - j, - this->timer_ids_[j])); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%d\t%d\n"), j, this->timer_ids_[j])); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -296,8 +289,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::copy (int slot, ACE_Timer_Node_T<TYPE template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Node_T<TYPE> * ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::remove (size_t slot) { - ACE_Timer_Node_T<TYPE> *removed_node = - this->heap_[slot]; + ACE_Timer_Node_T<TYPE> *removed_node = this->heap_[slot]; // Return this timer id to the freelist. this->push_freelist (removed_node->get_timer_id ()); @@ -310,8 +302,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::remove (size_t slot) if (slot < this->cur_size_) { - ACE_Timer_Node_T<TYPE> *moved_node = - this->heap_[this->cur_size_]; + ACE_Timer_Node_T<TYPE> *moved_node = this->heap_[this->cur_size_]; // Move the end node to the location being removed and update // the corresponding slot in the parallel <timer_ids> array. @@ -398,6 +389,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::insert (ACE_Timer_Node_T<TYPE> *new_n this->cur_size_++; } + template <class TYPE, class FUNCTOR, class ACE_LOCK> void ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void) { @@ -406,27 +398,18 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void) // First grow the heap itself. - ACE_Timer_Node_T<TYPE> **new_heap = 0; - -#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) - ACE_NEW (new_heap, - ACE_Timer_Node_T<TYPE> *[1024]); -#else - ACE_NEW (new_heap, - ACE_Timer_Node_T<TYPE> *[new_size]); -#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */ - ACE_OS::memcpy (new_heap, - this->heap_, + ACE_Timer_Node_T<TYPE> **new_heap; + ACE_NEW (new_heap, (ACE_Timer_Node_T<TYPE> *[new_size])); + ACE_OS::memcpy (new_heap, this->heap_, max_size_ * sizeof *new_heap); delete [] this->heap_; this->heap_ = new_heap; // Grow the array of timer ids. - long *new_timer_ids = 0; + long *new_timer_ids; - ACE_NEW (new_timer_ids, - long[new_size]); + ACE_NEW (new_timer_ids, long[new_size]); ACE_OS::memcpy (new_timer_ids, this->timer_ids_, @@ -435,7 +418,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void) delete [] timer_ids_; this->timer_ids_ = new_timer_ids; - // And add the new elements to the end of the "freelist". + // and add the new elements to the end of the "freelist" for (size_t i = this->max_size_; i < new_size; i++) this->timer_ids_[i] = -((long) (i + 1)); @@ -444,32 +427,25 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void) { // Create a new array with max_size elements to link in // to existing list. -#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) - ACE_NEW (this->preallocated_nodes_, - ACE_Timer_Node_T<TYPE>[88]); -#else ACE_NEW (this->preallocated_nodes_, - ACE_Timer_Node_T<TYPE>[this->max_size_]); -#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */ + (ACE_Timer_Node_T<TYPE>[this->max_size_])); // Add it to the set for later deletion this->preallocated_node_set_.insert (this->preallocated_nodes_); - // Link new nodes together (as for original list). + // link new nodes together (as for original list). for (size_t k = 1; k < this->max_size_; k++) this->preallocated_nodes_[k - 1].set_next (&this->preallocated_nodes_[k]); // NULL-terminate the new list. this->preallocated_nodes_[this->max_size_ - 1].set_next (0); - // Link new array to the end of the existling list. + // link new array to the end of the existling list if (this->preallocated_nodes_freelist_ == 0) - this->preallocated_nodes_freelist_ = - &preallocated_nodes_[0]; + this->preallocated_nodes_freelist_ = &preallocated_nodes_[0]; else { - ACE_Timer_Node_T<TYPE> *previous = - this->preallocated_nodes_freelist_; + ACE_Timer_Node_T<TYPE> *previous = this->preallocated_nodes_freelist_; for (ACE_Timer_Node_T<TYPE> *current = this->preallocated_nodes_freelist_->get_next (); current != 0; @@ -492,29 +468,30 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::reschedule (ACE_Timer_Node_T<TYPE> *e ACE_TRACE ("ACE_Timer_Heap::reschedule"); // If we are rescheduling then we have freed our timer id so we need - // to reacquire it. NOTE: we rely on the fact that we will get the - // same timer id we just freed. + // to reacquire it. + // NOTE: we rely on the fact that we will get the same timer id we just + // freed. # if !defined (ACE_NDEBUG) int timerId = # endif /* ACE_NDEBUG */ this->timer_id (); - // Just to be safe... - ACE_ASSERT (timerId == expired->get_timer_id ()); + ACE_ASSERT(timerId == expired->get_timer_id ()); // Just to be safe... // Restore the heap property. this->insert (expired); } + template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Node_T<TYPE> * ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::alloc_node (void) { - ACE_Timer_Node_T<TYPE> *temp = 0; + ACE_Timer_Node_T<TYPE> *temp; // Only allocate a node if we are *not* using the preallocated heap. if (this->preallocated_nodes_ == 0) ACE_NEW_RETURN (temp, - ACE_Timer_Node_T<TYPE>, + (ACE_Timer_Node_T<TYPE>), 0); else { @@ -531,6 +508,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::alloc_node (void) return temp; } + template <class TYPE, class FUNCTOR, class ACE_LOCK> void ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::free_node (ACE_Timer_Node_T<TYPE> *node) { @@ -547,11 +525,12 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::free_node (ACE_Timer_Node_T<TYPE> *no // Insert a new timer that expires at time future_time; if interval is // > 0, the handler will be reinvoked periodically. + template <class TYPE, class FUNCTOR, class ACE_LOCK> long ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type, - const void *act, - const ACE_Time_Value &future_time, - const ACE_Time_Value &interval) + const void *act, + const ACE_Time_Value &future_time, + const ACE_Time_Value &interval) { ACE_TRACE ("ACE_Timer_Heap::schedule"); @@ -563,22 +542,24 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type, int timer_id = this->timer_id (); // Obtain the memory to the new node. - ACE_Timer_Node_T<TYPE> *temp = 0; - - ACE_ALLOCATOR_RETURN (temp, - this->alloc_node (), - -1); - temp->set (type, - act, - future_time, - interval, - 0, - timer_id); - this->insert (temp); - return timer_id; + ACE_Timer_Node_T<TYPE> *temp = this->alloc_node (); + + if (temp) + { + temp->set (type, + act, + future_time, + interval, + 0, + timer_id); + + this->insert (temp); + return timer_id; + } } - else - return -1; + // Failure return. + errno = ENOMEM; + return -1; } // Locate and remove the single timer with a value of <timer_id> from @@ -595,7 +576,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id, // Locate the ACE_Timer_Node that corresponds to the timer_id. // Check to see if the timer_id is out of range - if (timer_id < 0 || (size_t) timer_id > this->max_size_) + if (timer_id < 0 || (size_t)timer_id > this->max_size_) return 0; long timer_node_slot = this->timer_ids_[timer_id]; @@ -657,6 +638,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type, return number_of_cancellations; } + // Returns the earliest node or returns 0 if the heap is empty. template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Node_T <TYPE> * @@ -675,7 +657,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::get_first (void) { ACE_TRACE ("ACE_Timer_Heap_T::get_first"); - return this->cur_size_ == 0 ? 0 : this->heap_[0]; + return this->cur_size_ == 0 ? 0 : this->heap_[0]; } #endif /* ACE_TIMER_HEAP_T_C */ diff --git a/ace/Timer_List_T.cpp b/ace/Timer_List_T.cpp index 2b9176d9589..73aba79ea01 100644 --- a/ace/Timer_List_T.cpp +++ b/ace/Timer_List_T.cpp @@ -86,8 +86,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_List_T (FUNCTOR *upcall_fun this->head_->set_next (this->head_); this->head_->set_prev (this->head_); - ACE_NEW (iterator_, - LIST_ITERATOR (*this)); + iterator_ = new LIST_ITERATOR(*this); } @@ -212,6 +211,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type, return (long) temp; } + // Locate and remove the single <ACE_Event_Handler> with a value of // <timer_id> from the timer queue. diff --git a/ace/Timer_Queue.i b/ace/Timer_Queue.i deleted file mode 100644 index 41e4324e61e..00000000000 --- a/ace/Timer_Queue.i +++ /dev/null @@ -1,22 +0,0 @@ -/* -*- C++ -*- */ - -template <class TYPE, class FUNCTOR> ACE_INLINE void -ACE_Timer_Queue_T<TYPE, FUNCTOR>::timer_skew (const ACE_Time_Value &skew) -{ - timer_skew_ = skew; -} - -template <class TYPE, class FUNCTOR> ACE_INLINE const ACE_Time_Value & -ACE_Timer_Queue_T<TYPE, FUNCTOR>::timer_skew (void) const -{ - return timer_skew_; -} - -template <class TYPE, class FUNCTOR> ACE_INLINE int -ACE_Timer_Queue_T<TYPE, FUNCTOR>::expire (void) -{ - if (!this->is_empty ()) - return this->expire (this->gettimeofday () + timer_skew_); - else - return 0; -} diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp index ff1557b2660..c654cd7d616 100644 --- a/ace/Timer_Wheel_T.cpp +++ b/ace/Timer_Wheel_T.cpp @@ -40,11 +40,10 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::first (void) this->pos_++) { // Skip over empty entries - if (this->timer_wheel_.wheel_[this->pos_]->get_next () - != this->timer_wheel_.wheel_[this->pos_]) + if (this->timer_wheel_.wheel_[this->pos_]->get_next () != + this->timer_wheel_.wheel_[this->pos_]) { - this->list_item_ = - this->timer_wheel_.wheel_[this->pos_]->get_next (); + this->list_item_ = this->timer_wheel_.wheel_[this->pos_]->get_next (); return; } } @@ -53,6 +52,7 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::first (void) this->list_item_ = 0; } + // Positions the iterator at the next node in list or goes to the next // list @@ -62,22 +62,18 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::next (void) if (this->isdone ()) return; - this->list_item_ = - this->list_item_->get_next (); + this->list_item_ = this->list_item_->get_next (); // If there is no more in the current list, go to the next if (this->list_item_ == this->timer_wheel_.wheel_[this->pos_]) { - for (this->pos_++; - this->pos_ < this->timer_wheel_.wheel_size_; - this->pos_++) + for (this->pos_++; this->pos_ < this->timer_wheel_.wheel_size_; this->pos_++) { // Check for an empty entry - if (this->timer_wheel_.wheel_[this->pos_]->get_next () - != this->timer_wheel_.wheel_[this->pos_]) + if (this->timer_wheel_.wheel_[this->pos_]->get_next () != + this->timer_wheel_.wheel_[this->pos_]) { - this->list_item_ = - this->timer_wheel_.wheel_[this->pos_]->get_next (); + this->list_item_ = this->timer_wheel_.wheel_[this->pos_]->get_next (); return; } } @@ -86,6 +82,7 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::next (void) } } + // Returns true when we are at the end (when list_item_ == 0) template <class TYPE, class FUNCTOR, class ACE_LOCK> int @@ -94,6 +91,7 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::isdone (void) return this->list_item_ == 0; } + // Returns the node at the current position in the sequence template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Node_T<TYPE> * @@ -105,8 +103,9 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::item (void) return this->list_item_; } -// Constructor that sets up the timing wheel and also may preallocate -// some nodes on the free list + +// Constructor that sets up the timing wheel and also may preallocate some +// nodes on the free list template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Wheel_T (size_t wheelsize, @@ -125,14 +124,13 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Wheel_T (size_t wheelsize, this->gettimeofday (ACE_OS::gettimeofday); // Create the timing wheel - ACE_NEW (this->wheel_, - ACE_Timer_Node_T<TYPE> *[wheelsize]); + ACE_NEW (this->wheel_, (ACE_Timer_Node_T<TYPE> *[wheelsize])); + // Create the dummy nodes for (i = 0; i < wheelsize; i++) { - ACE_Timer_Node_T<TYPE> *tempnode = - this->alloc_node (); + ACE_Timer_Node_T<TYPE> *tempnode = this->alloc_node (); tempnode->set_next (tempnode); tempnode->set_prev (tempnode); this->wheel_[i] = tempnode; @@ -141,13 +139,12 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Wheel_T (size_t wheelsize, // Do the preallocation this->free_list_->resize (prealloc); - ACE_NEW (iterator_, - WHEEL_ITERATOR (*this)); + iterator_ = new WHEEL_ITERATOR(*this); } template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Wheel_T (FUNCTOR *upcall_functor, - ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist) + ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist) : ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK> (upcall_functor, freelist), wheel_size_ (ACE_DEFAULT_TIMER_WHEEL_SIZE), resolution_ (ACE_DEFAULT_TIMER_WHEEL_RESOLUTION), @@ -159,8 +156,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Wheel_T (FUNCTOR *upcall_f this->gettimeofday (ACE_OS::gettimeofday); // Create the timing wheel - ACE_NEW (this->wheel_, - ACE_Timer_Node_T<TYPE> *[this->wheel_size_]); + ACE_NEW (this->wheel_, (ACE_Timer_Node_T<TYPE> *[this->wheel_size_])); // Create the dummy nodes for (i = 0; i < this->wheel_size_; i++) @@ -171,8 +167,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Wheel_T (FUNCTOR *upcall_f this->wheel_[i] = tempnode; } - ACE_NEW (iterator_, - WHEEL_ITERATOR (*this)); + iterator_ = new WHEEL_ITERATOR(*this); } // Destructor just cleans up its memory @@ -184,20 +179,15 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Wheel_T (void) delete iterator_; - for (size_t i = 0; - i < this->wheel_size_; - i++) + for (size_t i = 0; i < this->wheel_size_; i++) { // delete nodes until only the dummy node is left while (this->wheel_[i]->get_next () != this->wheel_[i]) { - ACE_Timer_Node_T<TYPE> *next = - this->wheel_[i]->get_next (); + ACE_Timer_Node_T<TYPE> *next = this->wheel_[i]->get_next (); this->wheel_[i]->set_next (next->get_next ()); next->get_next ()->set_prev (this->wheel_[i]); - this->upcall_functor ().deletion (*this, - next->get_type (), - next->get_act ()); + this->upcall_functor ().deletion (*this, next->get_type (), next->get_act ()); this->free_node (next); } @@ -209,6 +199,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Wheel_T (void) delete [] this->wheel_; } + // Checks to see if <earliest_pos> points to a empty list (then it is empty) template <class TYPE, class FUNCTOR, class ACE_LOCK> int @@ -219,6 +210,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::is_empty (void) const return this->wheel_[this->earliest_pos_]->get_next () == this->wheel_[this->earliest_pos_]; } + // Returns the first (earliest) node in the <wheel_>'s <earliest_pos_> list template <class TYPE, class FUNCTOR, class ACE_LOCK> const ACE_Time_Value & @@ -232,8 +224,8 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::earliest_time (void) const return this->wheel_[this->earliest_pos_]->get_next ()->get_timer_value (); } -// Create the node and pass it to reschedule. Also check to see if -// the <earliest_pos> should be changed. +// Create the node and pass it to reschedule. Also check to see if the +// <earliest_pos> should be changed. template <class TYPE, class FUNCTOR, class ACE_LOCK> long ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type, @@ -270,12 +262,13 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type, return -1; } + // Goes through every list in the wheel and if it finds a node with <type> // then it removes the node and continues on looking for other nodes template <class TYPE, class FUNCTOR, class ACE_LOCK> int ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type, - int dont_call_handle_close) + int dont_call_handle_close) { ACE_TRACE ("ACE_Timer_Wheel_T::cancel"); ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); @@ -306,14 +299,15 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type, this->free_node (tempnode); } else - curr = curr->get_next (); + { + curr = curr->get_next (); + } } } // Look for a new earliest time - // Defaults to zero. - ACE_Time_Value earliest_time; + ACE_Time_Value earliest_time; // defaults to zero // Check every entry in the table for (i = 0; i < this->wheel_size_; i++) @@ -325,37 +319,36 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type, if (earliest_time == ACE_Time_Value::zero || this->wheel_[i]->get_timer_value () < earliest_time) { - earliest_time = - this->wheel_[i]->get_next ()->get_timer_value (); + earliest_time = this->wheel_[i]->get_next ()->get_timer_value (); this->earliest_pos_ = i; } } } if (dont_call_handle_close == 0) - this->upcall_functor ().cancellation (*this, - type); + this->upcall_functor ().cancellation (*this, type); + return number_of_cancellations; } + // Takes the <timer_id> and casts it to a pointer. Then it removes it // from its neighbors template <class TYPE, class FUNCTOR, class ACE_LOCK> int ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id, - const void **act, - int dont_call_handle_close) + const void **act, + int dont_call_handle_close) { ACE_TRACE ("ACE_Timer_Wheel_T::cancel"); ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); // Make sure we are getting a valid <timer_id>, not an error - // returned by <schedule>. + // returned by schedule () if (timer_id == -1) return 0; - ACE_Timer_Node_T<TYPE> *node = - (ACE_Timer_Node_T<TYPE> *) timer_id; + ACE_Timer_Node_T<TYPE> *node = (ACE_Timer_Node_T<TYPE> *) timer_id; // Check to see if the node looks like a true ACE_Timer_Node_T<TYPE> if (timer_id == node->get_timer_id ()) @@ -367,10 +360,9 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id, *act = node->get_act (); if (dont_call_handle_close == 0) - this->upcall_functor ().cancellation (*this, - node->get_type ()); + this->upcall_functor ().cancellation (*this, node->get_type ()); - // Find out what position it is in. + // Find out what position it is in size_t pos = (node->get_timer_value ().usec () / this->resolution_) % this->wheel_size_; this->free_node (node); @@ -391,8 +383,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id, if (earliest_time == ACE_Time_Value::zero || this->wheel_[i]->get_timer_value () < earliest_time) { - earliest_time = - this->wheel_[i]->get_next ()->get_timer_value (); + earliest_time = this->wheel_[i]->get_next ()->get_timer_value (); this->earliest_pos_ = i; } } @@ -406,6 +397,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id, return 0; } + // Dumps out some properties of this object template <class TYPE, class FUNCTOR, class ACE_LOCK> void @@ -432,6 +424,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } + // Removes the earliest node and then find the new <earliest_pos_> template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Node_T<TYPE> * @@ -440,8 +433,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::remove_first (void) ACE_TRACE ("ACE_Timer_Wheel_T::remove_first"); // Remove the item - ACE_Timer_Node_T<TYPE> *temp = - this->wheel_[this->earliest_pos_]->get_next (); + ACE_Timer_Node_T<TYPE> *temp = this->wheel_[this->earliest_pos_]->get_next (); temp->get_prev ()->set_next (temp->get_next ()); temp->get_next ()->set_prev (temp->get_prev ()); @@ -457,16 +449,17 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::remove_first (void) if (earliest_time == ACE_Time_Value::zero || this->wheel_[i]->get_timer_value () < earliest_time) { - earliest_time = - this->wheel_[i]->get_next ()->get_timer_value (); + earliest_time = this->wheel_[i]->get_next ()->get_timer_value (); this->earliest_pos_ = i; } } } + return temp; } + // Returns the earliest node without removing it template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Node_T<TYPE> * @@ -477,26 +470,25 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::get_first (void) return this->wheel_[this->earliest_pos_]->get_next (); } -// Takes an ACE_Timer_Node and inserts it into the correct position in -// the correct list. + +// Takes an ACE_Timer_Node and inserts it into the correct position in the correct +// list template <class TYPE, class FUNCTOR, class ACE_LOCK> void ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::reschedule (ACE_Timer_Node_T<TYPE> *expired) { ACE_TRACE ("ACE_Timer_Wheel_T::reschedule"); - size_t pos = - (expired->get_timer_value ().usec () / this->resolution_) % this->wheel_size_; + size_t pos = (expired->get_timer_value ().usec () / this->resolution_) % this->wheel_size_; // See if we need to update the earliest time if (this->earliest_time () == ACE_Time_Value::zero || expired->get_timer_value () < this->earliest_time ()) this->earliest_pos_ = pos; - // Insert time into dummy node. + // Insert time into dummy node this->wheel_[pos]->set_timer_value (expired->get_timer_value ()); - ACE_Timer_Node_T<TYPE> *cursor = - this->wheel_[pos]->get_next (); + ACE_Timer_Node_T<TYPE> *cursor = this->wheel_[pos]->get_next (); // Find position to insert while (cursor->get_timer_value () < expired->get_timer_value ()) @@ -509,6 +501,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::reschedule (ACE_Timer_Node_T<TYPE> * expired->get_prev ()->set_next (expired); } + // Just return the iterator template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> & @@ -526,11 +519,11 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire () return ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK>::expire (); } -// Specialized expire which expires in total order. It is optimized -// by keeping track of the list with the earliest element and the next -// earliest list. It then goes through the earliest list until it can -// switch to the second list. it keeps going until it finishes with -// everything before the <cur_time> + +// Specialized expire which expires in total order. It is optimized by keeping +// track of the list with the earliest element and the next earliest list. It +// then goes through the earliest list until it can switch to the second list. +// it keeps going until it finishes with everything before the <cur_time> template <class TYPE, class FUNCTOR, class ACE_LOCK> int ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire (const ACE_Time_Value &cur_time) @@ -577,14 +570,11 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire (const ACE_Time_Value &cur_ti } } - while (this->wheel_[earliest]->get_next () - != this->wheel_[earliest] - && this->wheel_[earliest]->get_next ()->get_timer_value () - <= next_earliest_time) + while (this->wheel_[earliest]->get_next () != this->wheel_[earliest] + && this->wheel_[earliest]->get_next ()->get_timer_value () <= next_earliest_time) { // Remove the first node in the earliest position - ACE_Timer_Node_T<TYPE> *expired = - this->wheel_[earliest]->get_next (); + ACE_Timer_Node_T<TYPE> *expired = this->wheel_[earliest]->get_next (); this->wheel_[earliest]->set_next (expired->get_next ()); expired->get_next ()->set_prev (this->wheel_[earliest]); @@ -601,22 +591,22 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire (const ACE_Time_Value &cur_ti expired->set_timer_value (expired->get_timer_value () + expired->get_interval ()); while (expired->get_timer_value () <= cur_time); - // Since this is an interval timer, we need to - // reschedule it. + // Since this is an interval timer, we need to reschedule + // it. this->reschedule (expired); reclaim = 0; } - // Call the functor. + // call the functor this->upcall (type, act, cur_time); if (reclaim) - // Free up the node and the token. + // Free up the node and the token this->free_node (expired); ++number_of_timers_expired; - // Check to see if we are empty. + // Check to see if we are empty if (this->wheel_[earliest]->get_next () == this->wheel_[earliest]) break; } @@ -630,4 +620,5 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire (const ACE_Time_Value &cur_ti return number_of_timers_expired; } + #endif /* ACE_TIMER_WHEEL_T_C */ diff --git a/ace/Token_Collection.cpp b/ace/Token_Collection.cpp index d7317b1f590..e275942ea22 100644 --- a/ace/Token_Collection.cpp +++ b/ace/Token_Collection.cpp @@ -11,20 +11,20 @@ ACE_RCSID(ace, Token_Collection, "$Id$") ACE_Token_Collection::ACE_Token_Collection (int debug, - const ASYS_TCHAR *name) + const char *name) : debug_ (debug) { ACE_TRACE ("ACE_Token_Collection::ACE_Token_Collection"); if (name == 0) - name = ASYS_TEXT ("no name"); + name = "no name"; int n = ACE_OS::strlen (name) + 1; if (n >= ACE_MAXTOKENNAMELEN) n = ACE_MAXTOKENNAMELEN - 1; - ACE_OS::strncpy (this->name_, ACE_const_cast (ASYS_TCHAR*, name), n); + ACE_OS::strncpy (this->name_, (char *) name, n); this->name_[ACE_MAXTOKENNAMELEN - 1] = '\0'; } @@ -44,12 +44,12 @@ ACE_Token_Collection::insert (ACE_Token_Proxy &new_token) ACE_Token_Proxy *temp = new_token.clone (); if (collection_.bind (name, temp) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("bind failed\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, "bind failed\n"), -1); return 0; } int -ACE_Token_Collection::extract (const ASYS_TCHAR *token_name, ACE_Token_Proxy *&proxy) +ACE_Token_Collection::extract (const char *token_name, ACE_Token_Proxy *&proxy) { ACE_TRACE ("ACE_Token_Collection::extract"); TOKEN_NAME name (token_name); @@ -57,7 +57,7 @@ ACE_Token_Collection::extract (const ASYS_TCHAR *token_name, ACE_Token_Proxy *&p } ACE_Token_Proxy * -ACE_Token_Collection::is_member (const ASYS_TCHAR *token_name) +ACE_Token_Collection::is_member (const char *token_name) { ACE_TRACE ("ACE_Token_Collection::is_member"); TOKEN_NAME name (token_name); @@ -106,7 +106,7 @@ ACE_Token_Collection::acquire (int notify, } int -ACE_Token_Collection::acquire (const ASYS_TCHAR *token_name, +ACE_Token_Collection::acquire (const char *token_name, int notify, void (*sleep_hook)(void *), ACE_Synch_Options &options) @@ -125,7 +125,7 @@ ACE_Token_Collection::acquire (const ASYS_TCHAR *token_name, int -ACE_Token_Collection::tryacquire (const ASYS_TCHAR *token_name, +ACE_Token_Collection::tryacquire (const char *token_name, void (*sleep_hook)(void *)) { ACE_TRACE ("ACE_Token_Collection::tryacquire"); @@ -186,7 +186,7 @@ ACE_Token_Collection::renew (int requeue_position, } int -ACE_Token_Collection::renew (const ASYS_TCHAR *token_name, +ACE_Token_Collection::renew (const char *token_name, int requeue_position, ACE_Synch_Options &options) { @@ -199,8 +199,8 @@ ACE_Token_Collection::renew (const ASYS_TCHAR *token_name, // Did we find it? if (result == -1) - ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%p %s\n"), - ASYS_TEXT ("not in collection "), + ACE_ERROR_RETURN ((LM_DEBUG, "%p %s\n", + "not in collection ", token_name), -1); // perform the operation return temp->renew (requeue_position, options); @@ -227,7 +227,7 @@ ACE_Token_Collection::release (ACE_Synch_Options &) } int -ACE_Token_Collection::release (const ASYS_TCHAR *token_name, +ACE_Token_Collection::release (const char *token_name, ACE_Synch_Options &options) { ACE_TRACE ("ACE_Token_Collection::release"); @@ -268,7 +268,7 @@ ACE_Token_Collection::clone (void) const // This method doesn't mean anything for a collection. ACE_Tokens * -ACE_Token_Collection::create_token (const ASYS_TCHAR *) +ACE_Token_Collection::create_token (const char *) { ACE_TRACE ("ACE_Token_Collection::create_token"); return (ACE_Tokens *) 0; @@ -280,7 +280,7 @@ ACE_Token_Collection::dump (void) const ACE_TRACE ("ACE_Token_Collection::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Token_Collection::dump:\n") - ASYS_TEXT (" debug_ = %d\n"), debug_)); + " debug_ = %d\n", debug_)); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("collection_\n"))); collection_.dump (); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n"))); @@ -301,3 +301,4 @@ template class ACE_Map_Entry<ACE_Token_Name, ACE_Token_Proxy *>; #pragma instantiate ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_Token_Proxy *, ACE_Null_Mutex> #pragma instantiate ACE_Map_Entry<ACE_Token_Name, ACE_Token_Proxy *> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h index 075cee8757d..ecc02f2231b 100644 --- a/ace/Token_Collection.h +++ b/ace/Token_Collection.h @@ -59,7 +59,7 @@ class ACE_Export ACE_Token_Collection : public ACE_Token_Proxy // returns zero for now. public: ACE_Token_Collection (int debug = 0, - const ASYS_TCHAR *name = 0); + const char *name = 0); // <debug> print out verbose debugging messages. <name> will give a // name to the collection. Collections don't really need names, but // are sometimes useful for debugging. @@ -79,14 +79,14 @@ public: // thread using the collection will be used. Client ID's can be // changed explicity on each proxy using is_member. - int extract (const ASYS_TCHAR *token_name, ACE_Token_Proxy *&proxy); + int extract (const char *token_name, ACE_Token_Proxy *&proxy); // removes the ACE_Token matching the given token_name from the // collection. On success, extract returns 0. On failure // (token_name was not in the collection,) extract returns -1. On // success, the state of the token found is copied into proxy. // The returned ACE_Token_Proxy* must be deleted by the user. - ACE_Token_Proxy *is_member (const ASYS_TCHAR *token_name); + ACE_Token_Proxy *is_member (const char *token_name); // returns the proxy if true. 0 otherwise. int is_member (const ACE_Token_Proxy &token); @@ -124,7 +124,7 @@ public: // words, once the collection reports deadlock, it is out of our // hands. - virtual int acquire (const ASYS_TCHAR *token_name, + virtual int acquire (const char *token_name, int notify = 0, void (*sleep_hook)(void *) = 0, ACE_Synch_Options &options = @@ -135,7 +135,7 @@ public: virtual int tryacquire (void (*sleep_hook)(void *) = 0); // Try to acquire all tokens in collection. - virtual int tryacquire (const ASYS_TCHAR *token_name, + virtual int tryacquire (const char *token_name, void (*sleep_hook)(void *) = 0); // Try to acquire <token_name>. @@ -149,7 +149,7 @@ public: // problem. - virtual int renew (const ASYS_TCHAR *token_name, + virtual int renew (const char *token_name, int requeue_position = 0, ACE_Synch_Options &options = ACE_Synch_Options::defaults); @@ -165,7 +165,7 @@ public: // problem. - virtual int release (const ASYS_TCHAR *token_name, + virtual int release (const char *token_name, ACE_Synch_Options &options = ACE_Synch_Options::defaults); // Release the token corresponding to <token_name>. The other @@ -176,7 +176,7 @@ public: void dump (void) const; // Dump the state of the class. - virtual const ASYS_TCHAR *name (void) const; + virtual const char *name (void) const; // Return the name of the collection. Not very functionally // important, but sometimes a useful debugging tool. @@ -202,13 +202,13 @@ protected: int debug_; // Whether to print out debug messages or not. - ASYS_TCHAR name_[ACE_MAXTOKENNAMELEN]; + char name_[ACE_MAXTOKENNAMELEN]; // Name of the collection. // = I'm not sure what these mean, but they have to be defined since they're // pure virtual in ACE_Token_Proxy. virtual ACE_Token_Proxy *clone (void) const; - virtual ACE_Tokens *create_token (const ASYS_TCHAR *name); + virtual ACE_Tokens *create_token (const char *name); }; #if defined (__ACE_INLINE__) diff --git a/ace/Token_Collection.i b/ace/Token_Collection.i index b10735660bc..f871206c4d8 100644 --- a/ace/Token_Collection.i +++ b/ace/Token_Collection.i @@ -3,8 +3,9 @@ // Token_Collection.i -ACE_INLINE const ASYS_TCHAR * +ACE_INLINE const char * ACE_Token_Collection::name (void) const { return name_; } + diff --git a/ace/Token_Invariants.cpp b/ace/Token_Invariants.cpp index c9d093664a1..cf98e79c21d 100644 --- a/ace/Token_Invariants.cpp +++ b/ace/Token_Invariants.cpp @@ -28,9 +28,8 @@ ACE_Token_Invariant_Manager::instance (void) if (instance_ == 0) { - ACE_NEW_RETURN (instance_, - ACE_Token_Invariant_Manager, - 0); + ACE_NEW_RETURN (instance_, ACE_Token_Invariant_Manager, 0); + // Register for destruction with ACE_Object_Manager. ACE_Object_Manager::at_exit (instance_); } @@ -45,7 +44,7 @@ ACE_Token_Invariant_Manager::ACE_Token_Invariant_Manager (void) } int -ACE_Token_Invariant_Manager::mutex_acquired (const ASYS_TCHAR *token_name) +ACE_Token_Invariant_Manager::mutex_acquired (const char *token_name) { ACE_TRACE ("ACE_Token_Invariant_Manager::mutex_acquired"); @@ -88,7 +87,7 @@ ACE_Token_Invariant_Manager::releasing (const ACE_Token_Proxy *proxy) } void -ACE_Token_Invariant_Manager::mutex_releasing (const ASYS_TCHAR *token_name) +ACE_Token_Invariant_Manager::mutex_releasing (const char *token_name) { ACE_TRACE ("ACE_Token_Invariant_Manager::mutex_releasing"); ACE_GUARD (ACE_TOKEN_CONST::MUTEX, ace_mon, this->lock_); @@ -99,7 +98,7 @@ ACE_Token_Invariant_Manager::mutex_releasing (const ASYS_TCHAR *token_name) } int -ACE_Token_Invariant_Manager::reader_acquired (const ASYS_TCHAR *token_name) +ACE_Token_Invariant_Manager::reader_acquired (const char *token_name) { ACE_TRACE ("ACE_Token_Invariant_Manager::reader_acquired"); ACE_GUARD_RETURN (ACE_TOKEN_CONST::MUTEX, ace_mon, this->lock_, -1); @@ -112,7 +111,7 @@ ACE_Token_Invariant_Manager::reader_acquired (const ASYS_TCHAR *token_name) } int -ACE_Token_Invariant_Manager::writer_acquired (const ASYS_TCHAR *token_name) +ACE_Token_Invariant_Manager::writer_acquired (const char *token_name) { ACE_TRACE ("ACE_Token_Invariant_Manager::writer_acquired"); @@ -126,7 +125,7 @@ ACE_Token_Invariant_Manager::writer_acquired (const ASYS_TCHAR *token_name) } void -ACE_Token_Invariant_Manager::rwlock_releasing (const ASYS_TCHAR *token_name) +ACE_Token_Invariant_Manager::rwlock_releasing (const char *token_name) { ACE_TRACE ("ACE_Token_Invariant_Manager::rwlock_releasing"); @@ -151,7 +150,7 @@ ACE_Token_Invariant_Manager::dump (void) const int -ACE_Token_Invariant_Manager::get_mutex (const ASYS_TCHAR *token_name, +ACE_Token_Invariant_Manager::get_mutex (const char *token_name, ACE_Mutex_Invariants *&inv) { ACE_TRACE ("ACE_Token_Invariant_Manager::get_mutex"); @@ -161,9 +160,8 @@ ACE_Token_Invariant_Manager::get_mutex (const ASYS_TCHAR *token_name, { ACE_Mutex_Invariants *new_invariant; - ACE_NEW_RETURN (new_invariant, - ACE_Mutex_Invariants, - -1); + ACE_NEW_RETURN (new_invariant, ACE_Mutex_Invariants, -1); + if (mutex_collection_.bind (name, new_invariant) == -1) { delete new_invariant; @@ -179,7 +177,7 @@ ACE_Token_Invariant_Manager::get_mutex (const ASYS_TCHAR *token_name, } int -ACE_Token_Invariant_Manager::get_rwlock (const ASYS_TCHAR *token_name, +ACE_Token_Invariant_Manager::get_rwlock (const char *token_name, ACE_RWLock_Invariants *&inv) { ACE_TRACE ("ACE_Token_Invariant_Manager::get_rwlock"); @@ -189,9 +187,8 @@ ACE_Token_Invariant_Manager::get_rwlock (const ASYS_TCHAR *token_name, { ACE_RWLock_Invariants *new_invariant; - ACE_NEW_RETURN (new_invariant, - ACE_RWLock_Invariants, - -1); + ACE_NEW_RETURN (new_invariant, ACE_RWLock_Invariants, -1); + if (rwlock_collection_.bind (name, new_invariant) == -1) return -1; diff --git a/ace/Token_Invariants.h b/ace/Token_Invariants.h index 1ad9aacf5e4..8dc667a9d47 100644 --- a/ace/Token_Invariants.h +++ b/ace/Token_Invariants.h @@ -138,22 +138,22 @@ public: // = Explicit methods. These to not require actual proxies in order // to test a scenario. - int mutex_acquired (const ASYS_TCHAR *token_name); + int mutex_acquired (const char *token_name); // Returns 1 on success, 0 when an invariant has been violated and // -1 on error. - void mutex_releasing (const ASYS_TCHAR *token_name); + void mutex_releasing (const char *token_name); // Updates internal database. - int reader_acquired (const ASYS_TCHAR *token_name); + int reader_acquired (const char *token_name); // Returns 1 on success, 0 when an invariant has been violated and // -1 on error. - int writer_acquired (const ASYS_TCHAR *token_name); + int writer_acquired (const char *token_name); // Returns 1 on success, 0 when an invariant has been violated and // -1 on error. - void rwlock_releasing (const ASYS_TCHAR *token_name); + void rwlock_releasing (const char *token_name); // Updates internal database. void dump (void) const; @@ -168,11 +168,11 @@ public: // Destruction. protected: - int get_mutex (const ASYS_TCHAR *token_name, + int get_mutex (const char *token_name, ACE_Mutex_Invariants *&inv); // Return or create. - int get_rwlock (const ASYS_TCHAR *token_name, + int get_rwlock (const char *token_name, ACE_RWLock_Invariants *&inv); // Return or create. diff --git a/ace/Token_Manager.cpp b/ace/Token_Manager.cpp index 6d49239debd..d202bae2006 100644 --- a/ace/Token_Manager.cpp +++ b/ace/Token_Manager.cpp @@ -54,9 +54,8 @@ ACE_Token_Manager::instance (void) if (token_manager_ == 0) { - ACE_NEW_RETURN (token_manager_, - ACE_Token_Manager, - 0); + ACE_NEW_RETURN (token_manager_, ACE_Token_Manager, 0); + // Register for destruction with ACE_Object_Manager. ACE_Object_Manager::at_exit (token_manager_); } diff --git a/ace/Token_Request_Reply.cpp b/ace/Token_Request_Reply.cpp index e88f40e6505..a74e0d61348 100644 --- a/ace/Token_Request_Reply.cpp +++ b/ace/Token_Request_Reply.cpp @@ -72,15 +72,11 @@ ACE_Token_Request::decode (void) else // Skip this->tokenName_ + '\0' + ':'. this->client_id_ = &this->token_name_[token_len + 2]; - // Fixed size header - // token_name_ plus '\0' - // ':' - // client_id_ plus '\0' - size_t data_size = ACE_TOKEN_REQUEST_HEADER_SIZE - + ACE_OS::strlen (this->token_name_) + 1 - + ACE_OS::strlen (this->client_id_) + 1 - + 1; - + size_t data_size = ((sizeof this->transfer_ + - sizeof this->transfer_.data_) // Fixed-size header. + + ACE_OS::strlen (this->token_name_) + 1 // this->tokenName_ + '\0' + + ACE_OS::strlen (this->client_id_) + 1 // this->clientId_ + '\0' + + 1); // Space for ':' // Make sure the message was correctly received and framed. return this->length () == data_size ? 0 : -1; } diff --git a/ace/Token_Request_Reply.h b/ace/Token_Request_Reply.h index d08a5a74df5..072842c23cf 100644 --- a/ace/Token_Request_Reply.h +++ b/ace/Token_Request_Reply.h @@ -30,10 +30,6 @@ #include "ace/Time_Value.h" -// Specifies the size of the fixed length portion of -// the Transfer structure in ACE_Token_Request -#define ACE_TOKEN_REQUEST_HEADER_SIZE 40 - class ACE_Export ACE_Token_Request { // = TITLE @@ -156,9 +152,9 @@ private: ACE_UINT32 arg_; // value returned in Token_Reply::arg (); - char data_[ACE_MAXTOKENNAMELEN + ACE_MAXCLIENTIDLEN + 3]; - // The data portion contains the <tokenName_> including a 0 terminator, - // a ':', then the <clientId> including a 0 terminator + char data_[ACE_MAXTOKENNAMELEN + ACE_MAXCLIENTIDLEN + 1]; + // The data portion contains the <tokenName_> followed by a ':' + // followed by the <clientId_>. } transfer_; char *token_name_; diff --git a/ace/Token_Request_Reply.i b/ace/Token_Request_Reply.i index b58f0b89d3a..66428003359 100644 --- a/ace/Token_Request_Reply.i +++ b/ace/Token_Request_Reply.i @@ -129,9 +129,9 @@ ACE_Token_Request::token_name (const char *token_name, const char *client_id) (void) ACE_OS::memcpy (token_name_, token_name, token_name_length); (void) ACE_OS::memcpy (client_id_, client_id, client_id_length); - // Fixed length header size - size_t len = ACE_TOKEN_REQUEST_HEADER_SIZE; - + // Compute size of the fixed portion of the message... + size_t len = sizeof this->transfer_ - sizeof this->transfer_.data_; + // ... then add in the amount of the variable-sized portion. len += token_name_length + client_id_length + 1; diff --git a/ace/UNIX_Addr.cpp b/ace/UNIX_Addr.cpp index 6d6349cba81..91bcaf945d3 100644 --- a/ace/UNIX_Addr.cpp +++ b/ace/UNIX_Addr.cpp @@ -34,13 +34,13 @@ ACE_UNIX_Addr::dump (void) const // Do nothing constructor. ACE_UNIX_Addr::ACE_UNIX_Addr (void) - : ACE_Addr (AF_UNIX, sizeof this->unix_addr_) { (void) ACE_OS::memset ((void *) &this->unix_addr_, 0, sizeof this->unix_addr_); this->unix_addr_.sun_family = AF_UNIX; + this->base_set (AF_UNIX, sizeof this->unix_addr_); } int diff --git a/ace/UPIPE_Acceptor.cpp b/ace/UPIPE_Acceptor.cpp index c102e6d089a..46f932138ea 100644 --- a/ace/UPIPE_Acceptor.cpp +++ b/ace/UPIPE_Acceptor.cpp @@ -22,7 +22,7 @@ ACE_UPIPE_Acceptor::dump (void) const /* Do nothing routine for constructor. */ -ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (void) +ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (void) : mb_ (sizeof (ACE_UPIPE_Stream *)) { ACE_TRACE ("ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor"); @@ -36,7 +36,7 @@ ACE_UPIPE_Acceptor::~ACE_UPIPE_Acceptor (void) // General purpose routine for performing server ACE_UPIPE. int -ACE_UPIPE_Acceptor::open (const ACE_UPIPE_Addr &local_addr, +ACE_UPIPE_Acceptor::open (const ACE_UPIPE_Addr &local_addr, int reuse_addr) { ACE_TRACE ("ACE_UPIPE_Acceptor::open"); @@ -59,15 +59,13 @@ ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_addr, ACE_TRACE ("ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor"); if (this->open (local_addr, reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_UPIPE_Acceptor"))); + ACE_ERROR ( (LM_ERROR, "%p\n", "ACE_UPIPE_Acceptor")); } int ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream, ACE_UPIPE_Addr *remote_addr, - ACE_Time_Value *timeout, + ACE_Time_Value *timeout, int restart, int reset_new_handle) { @@ -76,7 +74,7 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream, ACE_SPIPE_Stream new_io; - if (this->ACE_SPIPE_Acceptor::accept (new_io, remote_addr, + if (this->ACE_SPIPE_Acceptor::accept (new_io, remote_addr, timeout, restart) == -1) return -1; else @@ -85,32 +83,32 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream, ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, new_stream.lock_, -1)); - new_stream.set_handle (new_io.get_handle ()); - new_stream.reference_count_++; + new_stream.set_handle (new_io.get_handle ()); + new_stream.reference_count_++; // Transfer address ownership. new_io.get_local_addr (new_stream.local_addr_); new_io.get_remote_addr (new_stream.remote_addr_); - + // Now that we got the handle, we'll read the address of the // connector-side ACE_UPIPE_Stream out of the pipe and link that // ACE_UPIPE_Stream to our ACE_UPIPE_Stream. - if (ACE_OS::read (new_stream.get_handle (), + if (ACE_OS::read (new_stream.get_handle (), (char *) &remote_stream, sizeof remote_stream) == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("ACE_UPIPE_Acceptor: %p\n"), - ASYS_TEXT ("read stream address failed"))); + ACE_ERROR ((LM_ERROR, + "ACE_UPIPE_Acceptor: %p\n", + "read stream address failed")); else if (new_stream.stream_.link (remote_stream->stream_) == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("ACE_UPIPE_Acceptor: %p\n"), - ASYS_TEXT ("link streams failed"))); + ACE_ERROR ((LM_ERROR, + "ACE_UPIPE_Acceptor: %p\n", + "link streams failed")); // Send a message over the new streampipe to confirm acceptance. else if (new_stream.send (&mb_, 0) == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("ACE_UPIPE_Acceptor: %p\n"), - ASYS_TEXT ("linked stream.put failed"))); + ACE_ERROR ((LM_ERROR, + "ACE_UPIPE_Acceptor: %p\n", + "linked stream.put failed")); // Close down the new_stream at this point in order to conserve // handles. Note that we don't need the SPIPE connection @@ -121,3 +119,9 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream, } #endif /* ACE_HAS_THREADS */ + + + + + + diff --git a/ace/UPIPE_Connector.cpp b/ace/UPIPE_Connector.cpp index 8dee38a6d65..6136583ebee 100644 --- a/ace/UPIPE_Connector.cpp +++ b/ace/UPIPE_Connector.cpp @@ -20,14 +20,14 @@ ACE_UPIPE_Connector::dump (void) const ACE_TRACE ("ACE_UPIPE_Connector::dump"); } -ACE_UPIPE_Connector::ACE_UPIPE_Connector (void) +ACE_UPIPE_Connector::ACE_UPIPE_Connector (void) { ACE_TRACE ("ACE_UPIPE_Connector::ACE_UPIPE_Connector"); } int -ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream, - const ACE_UPIPE_Addr &addr, +ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream, + const ACE_UPIPE_Addr &addr, ACE_Time_Value *timeout, const ACE_Addr & /* local_sap */, int /* reuse_addr */, @@ -36,8 +36,8 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream, { ACE_TRACE ("ACE_UPIPE_Connector::connect"); ACE_ASSERT (new_stream.get_handle () == ACE_INVALID_HANDLE); - - ACE_HANDLE handle = ACE::handle_timed_open (timeout, + + ACE_HANDLE handle = ACE::handle_timed_open (timeout, addr.get_path_name (), flags, perms); @@ -55,18 +55,18 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream, new_stream.set_handle (handle); new_stream.remote_addr_ = addr; // class copy. - new_stream.reference_count_++; + new_stream.reference_count_++; // Now send the address of our ACE_UPIPE_Stream over this pipe // to our corresponding ACE_UPIPE_Acceptor, so he may link the // two streams. - ssize_t result = ACE_OS::write (handle, - (const char *) &ustream, + ssize_t result = ACE_OS::write (handle, + (const char *) &ustream, sizeof ustream); if (result == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("ACE_UPIPE_Connector %p\n"), - ASYS_TEXT ("write to pipe failed"))); + ACE_ERROR ((LM_ERROR, + "ACE_UPIPE_Connector %p\n", + "write to pipe failed")); // Wait for confirmation of stream linking. ACE_Message_Block *mb_p = 0; @@ -77,9 +77,8 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream, // Do *not* coalesce the following two checks for result == -1. // They perform different checks and cannot be merged. if (result == -1) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("ACE_UPIPE_Connector %p\n"), - ASYS_TEXT ("no confirmation from server"))); + ACE_ERROR ((LM_ERROR, "ACE_UPIPE_Connector %p\n", + "no confirmation from server")); else // Close down the new_stream at this point in order to // conserve handles. Note that we don't need the SPIPE @@ -90,3 +89,4 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream, } } #endif /* ACE_HAS_THREADS */ + diff --git a/ace/UPIPE_Connector.i b/ace/UPIPE_Connector.i index 339a0b36f81..c7f32edb985 100644 --- a/ace/UPIPE_Connector.i +++ b/ace/UPIPE_Connector.i @@ -3,10 +3,10 @@ // UPIPE_Connector.i -// Creates a Local ACE_UPIPE. +// Creates a Local ACE_UPIPE. ASYS_INLINE -ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, +ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, const ACE_UPIPE_Addr &addr, ACE_Time_Value *timeout, const ACE_Addr &local_sap, @@ -15,13 +15,11 @@ ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, int perms) { ACE_TRACE ("ACE_UPIPE_Connector::ACE_UPIPE_Connector"); - if (this->connect (new_stream, addr, timeout, local_sap, + if (this->connect (new_stream, addr, timeout, local_sap, reuse_addr, flags, perms) == -1 && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("address %s, %p\n"), - addr.get_path_name (), - ASYS_TEXT ("ACE_UPIPE_Connector"))); + ACE_ERROR ((LM_ERROR, "address %s, %p\n", + addr.get_path_name (), "ACE_UPIPE_Connector")); } ASYS_INLINE int @@ -31,3 +29,4 @@ ACE_UPIPE_Connector::reset_new_handle (ACE_HANDLE handle) // Nothing to do here since the handle is not a socket return 0; } + diff --git a/ace/UPIPE_Stream.cpp b/ace/UPIPE_Stream.cpp index 494b7c179b3..7cc6f94adf0 100644 --- a/ace/UPIPE_Stream.cpp +++ b/ace/UPIPE_Stream.cpp @@ -99,9 +99,8 @@ ACE_UPIPE_Stream::send (const char *buffer, ACE_TRACE ("ACE_UPIPE_Stream::send"); ACE_Message_Block *mb_p; - ACE_NEW_RETURN (mb_p, - ACE_Message_Block (n), - -1); + ACE_NEW_RETURN (mb_p, ACE_Message_Block (n), -1); + mb_p->copy (buffer, n); return this->stream_.put (mb_p, timeout) == -1 ? -1 : (int) n; } diff --git a/ace/Version.h b/ace/Version.h index 5def819a690..dfe2ab09ed9 100644 --- a/ace/Version.h +++ b/ace/Version.h @@ -3,5 +3,5 @@ #define ACE_MAJOR_VERSION 4 #define ACE_MINOR_VERSION 6 -#define ACE_BETA_VERSION 43 -#define ACE_VERSION "4.6.43" +#define ACE_BETA_VERSION 42 +#define ACE_VERSION "4.6.42" diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp index a78e3d6f048..c8a77fd771c 100644 --- a/ace/WFMO_Reactor.cpp +++ b/ace/WFMO_Reactor.cpp @@ -76,14 +76,18 @@ ACE_WFMO_Reactor_Handler_Repository::bit_ops (long &existing_masks, ACE_Reactor_Mask change_masks, int operation) { + // // Find the old reactor masks. This automatically does the work of // the GET_MASK operation. + // ACE_Reactor_Mask old_masks = ACE_Event_Handler::NULL_MASK; - if (ACE_BIT_ENABLED (existing_masks, FD_READ) - || ACE_BIT_ENABLED (existing_masks, FD_CLOSE)) - ACE_SET_BITS (old_masks, ACE_Event_Handler::READ_MASK); + if (ACE_BIT_ENABLED (existing_masks, FD_READ) || + ACE_BIT_ENABLED (existing_masks, FD_CLOSE)) + { + ACE_SET_BITS (old_masks, ACE_Event_Handler::READ_MASK); + } if (ACE_BIT_ENABLED (existing_masks, FD_WRITE)) ACE_SET_BITS (old_masks, ACE_Event_Handler::WRITE_MASK); @@ -106,7 +110,10 @@ ACE_WFMO_Reactor_Handler_Repository::bit_ops (long &existing_masks, switch (operation) { case ACE_Reactor::CLR_MASK: + + // // For the CLR_MASK operation, clear only the specific masks. + // if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::READ_MASK)) { @@ -135,14 +142,20 @@ ACE_WFMO_Reactor_Handler_Repository::bit_ops (long &existing_masks, break; case ACE_Reactor::SET_MASK: + + // // If the operation is a set, first reset any existing masks + // existing_masks = 0; /* FALLTHRU */ case ACE_Reactor::ADD_MASK: + + // // For the ADD_MASK and the SET_MASK operation, add only the // specific masks. + // if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::READ_MASK)) { @@ -172,8 +185,10 @@ ACE_WFMO_Reactor_Handler_Repository::bit_ops (long &existing_masks, case ACE_Reactor::GET_MASK: + // // The work for this operation is done in all cases at the // begining of the function. + // ACE_UNUSED_ARG (change_masks); @@ -204,9 +219,9 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle, for (i = 0; i < this->max_handlep1_ && error == 0; i++) // Since the handle can either be the event or the I/O handle, // we have to check both - if ((this->current_handles_[i] == handle - || this->current_info_[i].io_handle_ == handle) - && // Make sure that it is not already marked for deleted + if ((this->current_handles_[i] == handle || + this->current_info_[i].io_handle_ == handle) && + // Make sure that it is not already marked for deleted !this->current_info_[i].delete_entry_) { result = this->remove_handler_i (i, @@ -217,11 +232,10 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle, // Then check the suspended entries for (i = 0; i < this->suspended_handles_ && error == 0; i++) - // Since the handle can either be the event or the I/O handle, we - // have to check both - if ((this->current_suspended_info_[i].io_handle_ == handle - || this->current_suspended_info_[i].event_handle_ == handle) - && + // Since the handle can either be the event or the I/O handle, + // we have to check both + if ((this->current_suspended_info_[i].io_handle_ == handle || + this->current_suspended_info_[i].event_handle_ == handle) && // Make sure that it is not already marked for deleted !this->current_suspended_info_[i].delete_entry_) { @@ -235,9 +249,8 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle, for (i = 0; i < this->handles_to_be_added_ && error == 0; i++) // Since the handle can either be the event or the I/O handle, // we have to check both - if ((this->to_be_added_info_[i].io_handle_ == handle - || this->to_be_added_info_[i].event_handle_ == handle) - && + if ((this->to_be_added_info_[i].io_handle_ == handle || + this->to_be_added_info_[i].event_handle_ == handle) && // Make sure that it is not already marked for deleted !this->to_be_added_info_[i].delete_entry_) { @@ -278,12 +291,15 @@ ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t slot, this->current_info_[slot].network_events_); } // Normal event entries. - else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL)) - // Preserve DONT_CALL - to_be_removed_masks = ACE_Event_Handler::DONT_CALL; else - // Make sure that the <to_be_removed_masks> is the NULL_MASK - to_be_removed_masks = ACE_Event_Handler::NULL_MASK; + { + if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL)) + // Preserve DONT_CALL + to_be_removed_masks = ACE_Event_Handler::DONT_CALL; + else + // Make sure that the <to_be_removed_masks> is the NULL_MASK + to_be_removed_masks = ACE_Event_Handler::NULL_MASK; + } // If there are no more events that the <Event_Handler> is // interested in, or this is a non-I/O entry, schedule the @@ -297,17 +313,20 @@ ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t slot, // Increment the handle count this->handles_to_be_deleted_++; } - - // Since it is not a complete removal, we'll call handle_close - // for all the masks that were removed. This does not change - // the internal state of the reactor. - // - // Note: this condition only applies to I/O entries - else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0) + else { - ACE_HANDLE handle = this->current_info_[slot].io_handle_; - this->current_info_[slot].event_handler_->handle_close (handle, - to_be_removed_masks); + // Since it is not a complete removal, we'll call handle_close + // for all the masks that were removed. This does not change + // the internal state of the reactor. + // + // Note: this condition only applies to I/O entries + // + if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0) + { + ACE_HANDLE handle = this->current_info_[slot].io_handle_; + this->current_info_[slot].event_handler_->handle_close (handle, + to_be_removed_masks); + } } return 0; @@ -336,12 +355,15 @@ ACE_WFMO_Reactor_Handler_Repository::remove_suspended_handler_i (size_t slot, this->current_suspended_info_[slot].network_events_); } // Normal event entries. - else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL)) - // Preserve DONT_CALL - to_be_removed_masks = ACE_Event_Handler::DONT_CALL; else - // Make sure that the <to_be_removed_masks> is the NULL_MASK - to_be_removed_masks = ACE_Event_Handler::NULL_MASK; + { + if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL)) + // Preserve DONT_CALL + to_be_removed_masks = ACE_Event_Handler::DONT_CALL; + else + // Make sure that the <to_be_removed_masks> is the NULL_MASK + to_be_removed_masks = ACE_Event_Handler::NULL_MASK; + } // If there are no more events that the <Event_Handler> is // interested in, or this is a non-I/O entry, schedule the @@ -355,16 +377,20 @@ ACE_WFMO_Reactor_Handler_Repository::remove_suspended_handler_i (size_t slot, // Increment the handle count this->handles_to_be_deleted_++; } - // Since it is not a complete removal, we'll call handle_close for - // all the masks that were removed. This does not change the - // internal state of the reactor. - // - // Note: this condition only applies to I/O entries - else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0) + else { - ACE_HANDLE handle = this->current_suspended_info_[slot].io_handle_; - this->current_suspended_info_[slot].event_handler_->handle_close (handle, - to_be_removed_masks); + // Since it is not a complete removal, we'll call handle_close + // for all the masks that were removed. This does not change + // the internal state of the reactor. + // + // Note: this condition only applies to I/O entries + // + if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0) + { + ACE_HANDLE handle = this->current_suspended_info_[slot].io_handle_; + this->current_suspended_info_[slot].event_handler_->handle_close (handle, + to_be_removed_masks); + } } return 0; @@ -393,12 +419,15 @@ ACE_WFMO_Reactor_Handler_Repository::remove_to_be_added_handler_i (size_t slot, this->to_be_added_info_[slot].network_events_); } // Normal event entries. - else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL)) - // Preserve DONT_CALL - to_be_removed_masks = ACE_Event_Handler::DONT_CALL; else - // Make sure that the <to_be_removed_masks> is the NULL_MASK - to_be_removed_masks = ACE_Event_Handler::NULL_MASK; + { + if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL)) + // Preserve DONT_CALL + to_be_removed_masks = ACE_Event_Handler::DONT_CALL; + else + // Make sure that the <to_be_removed_masks> is the NULL_MASK + to_be_removed_masks = ACE_Event_Handler::NULL_MASK; + } // If there are no more events that the <Event_Handler> is // interested in, or this is a non-I/O entry, schedule the @@ -412,16 +441,20 @@ ACE_WFMO_Reactor_Handler_Repository::remove_to_be_added_handler_i (size_t slot, // Increment the handle count this->handles_to_be_deleted_++; } - // Since it is not a complete removal, we'll call handle_close - // for all the masks that were removed. This does not change - // the internal state of the reactor. - // - // Note: this condition only applies to I/O entries - else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0) + else { - ACE_HANDLE handle = this->to_be_added_info_[slot].io_handle_; - this->to_be_added_info_[slot].event_handler_->handle_close (handle, - to_be_removed_masks); + // Since it is not a complete removal, we'll call handle_close + // for all the masks that were removed. This does not change + // the internal state of the reactor. + // + // Note: this condition only applies to I/O entries + // + if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0) + { + ACE_HANDLE handle = this->to_be_added_info_[slot].io_handle_; + this->to_be_added_info_[slot].event_handler_->handle_close (handle, + to_be_removed_masks); + } } return 0; @@ -950,12 +983,6 @@ ACE_WFMO_Reactor_Handler_Repository::dump (void) const /************************************************************/ -int -ACE_WFMO_Reactor::work_pending (const ACE_Time_Value &) -{ - ACE_NOTSUP_RETURN (-1); -} - ACE_WFMO_Reactor::ACE_WFMO_Reactor (ACE_Sig_Handler *sh, ACE_Timer_Queue *tq) : signal_handler_ (0), @@ -1042,9 +1069,7 @@ ACE_WFMO_Reactor::open (size_t size, if (tq == 0) { - ACE_NEW_RETURN (this->timer_queue_, - ACE_Timer_Heap, - -1); + ACE_NEW_RETURN (this->timer_queue_, ACE_Timer_Heap, -1); this->delete_timer_queue_ = 1; } else @@ -1059,9 +1084,7 @@ ACE_WFMO_Reactor::open (size_t size, if (sh == 0) { - ACE_NEW_RETURN (this->signal_handler_, - ACE_Sig_Handler, - -1); + ACE_NEW_RETURN (this->signal_handler_, ACE_Sig_Handler, -1); this->delete_signal_handler_ = 1; } else @@ -1214,17 +1237,6 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle, ACE_Event_Handler *event_handler, ACE_Reactor_Mask new_masks) { - // If this is a Winsock 1 system, the underlying event assignment will - // not work, so don't try. Winsock 1 must use ACE_Select_Reactor for - // reacting to socket activity. -#if !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) - ACE_UNUSED_ARG (event_handle); - ACE_UNUSED_ARG (io_handle); - ACE_UNUSED_ARG (event_handler); - ACE_UNUSED_ARG (new_masks); - ACE_NOTSUP_RETURN (-1); -#else - // Make sure that the <handle> is valid if (io_handle == ACE_INVALID_HANDLE) io_handle = event_handler->get_handle (); @@ -1251,10 +1263,7 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle, // need to create one if (event_handle == ACE_INVALID_HANDLE) { - // Note: don't change this since some C++ compilers have - // <auto_ptr>s that don't work properly... - auto_ptr<ACE_Auto_Event> tmp (new ACE_Auto_Event); - event = tmp; + event = auto_ptr<ACE_Auto_Event> (new ACE_Auto_Event); event_handle = event->handle (); delete_event = 1; } @@ -1281,7 +1290,6 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle, } else return -1; -#endif /* ACE_HAS_PHARLAP */ } int @@ -1449,21 +1457,11 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, int result = 0; while (1) { -#if defined (ACE_HAS_PHARLAP) - // PharLap doesn't implement WaitForMultipleObjectsEx, and doesn't - // do async I/O, so it's not needed in this case anyway. - result = ::WaitForMultipleObjects (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE), - this->atomic_wait_array_, - TRUE, - timeout); -#else result = ::WaitForMultipleObjectsEx (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE), this->atomic_wait_array_, TRUE, timeout, alertable); -#endif /* ACE_HAS_PHARLAP */ - if (result != WAIT_IO_COMPLETION) break; } @@ -1475,7 +1473,7 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, return 0; case WAIT_FAILED: case WAIT_ABANDONED_0: - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; default: break; @@ -1492,21 +1490,11 @@ ACE_WFMO_Reactor::wait_for_multiple_events (int timeout, // Wait for any of handles_ to be active, or until timeout expires. // If <alertable> is enabled allow asynchronous completion of // ReadFile and WriteFile operations. -#if defined (ACE_HAS_PHARLAP) - // PharLap doesn't do async I/O and doesn't implement - // WaitForMultipleObjectsEx, so use WaitForMultipleObjects. - ACE_UNUSED_ARG (alertable); - return ::WaitForMultipleObjects (this->handler_rep_.max_handlep1 (), - this->handler_rep_.handles (), - FALSE, - timeout); -#else return ::WaitForMultipleObjectsEx (this->handler_rep_.max_handlep1 (), this->handler_rep_.handles (), FALSE, timeout, alertable); -#endif /* ACE_HAS_PHARLAP */ } DWORD @@ -1558,7 +1546,7 @@ ACE_WFMO_Reactor::dispatch (int wait_status) switch (wait_status) { case WAIT_FAILED: // Failure. - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); return -1; case WAIT_TIMEOUT: // Timeout. @@ -1628,7 +1616,7 @@ ACE_WFMO_Reactor::dispatch_handles (size_t wait_status) switch (wait_status) { case WAIT_FAILED: // Failure. - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); /* FALLTHRU */ case WAIT_TIMEOUT: // There are no more handles ready, we can return. @@ -1645,26 +1633,27 @@ ACE_WFMO_Reactor::dispatch_handler (size_t slot, if (slot == max_handlep1) return this->dispatch_window_messages (); - // Dispatch the handler if it has not been scheduled for deletion. - // Note that this is a very week test if there are multiple threads - // dispatching this slot as no locks are held here. Generally, you - // do not want to do something like deleting the this pointer in - // handle_close() if you have registered multiple times and there is - // more than one thread in WFMO_Reactor->handle_events(). - else if (!this->handler_rep_.scheduled_for_deletion (slot)) - { - ACE_HANDLE event_handle = *(this->handler_rep_.handles () + slot); - - if (this->handler_rep_.current_info ()[slot].io_entry_) - return this->complex_dispatch_handler (slot, - event_handle); - else - return this->simple_dispatch_handler (slot, - event_handle); - } else - // The handle was scheduled for deletion, so we will skip it. - return 0; + { + // Dispatch the handler if it has not been scheduled for deletion. + // Note that this is a very week test if there are multiple threads + // dispatching this slot as no locks are held here. Generally, you + // do not want to do something like deleting the this pointer in + // handle_close() if you have registered multiple times and there is + // more than one thread in WFMO_Reactor->handle_events(). + if (!this->handler_rep_.scheduled_for_deletion (slot)) + { + ACE_HANDLE event_handle = *(this->handler_rep_.handles () + slot); + + if (this->handler_rep_.current_info ()[slot].io_entry_) + return this->complex_dispatch_handler (slot, event_handle); + else + return this->simple_dispatch_handler (slot, event_handle); + } + else + // The handle was scheduled for deletion, so we will skip it. + return 0; + } } int @@ -1676,13 +1665,11 @@ ACE_WFMO_Reactor::simple_dispatch_handler (int slot, // Assign the ``signaled'' HANDLE so that callers can get it. siginfo_t sig (event_handle); - ACE_Event_Handler *eh = - this->handler_rep_.current_info ()[slot].event_handler_; + ACE_Event_Handler *eh = this->handler_rep_.current_info ()[slot].event_handler_; // Upcall if (eh->handle_signal (0, &sig) == -1) - this->handler_rep_.unbind (event_handle, - ACE_Event_Handler::NULL_MASK); + this->handler_rep_.unbind (event_handle, ACE_Event_Handler::NULL_MASK); return 0; } @@ -1691,7 +1678,7 @@ int ACE_WFMO_Reactor::complex_dispatch_handler (int slot, ACE_HANDLE event_handle) { - // This dispatch is used for I/O entires. + // This dispatch is used for I/O entires ACE_WFMO_Reactor_Handler_Repository::Current_Info ¤t_info = this->handler_rep_.current_info ()[slot]; @@ -1701,6 +1688,7 @@ ACE_WFMO_Reactor::complex_dispatch_handler (int slot, current_info.io_handle_, event_handle, current_info.network_events_); + if (problems != ACE_Event_Handler::NULL_MASK) this->handler_rep_.unbind (event_handle, problems); @@ -1727,21 +1715,21 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler, { long actual_events = events.lNetworkEvents; - if ((interested_events & actual_events & FD_READ) - && event_handler->handle_input (io_handle) == -1) + if ((interested_events & actual_events & FD_READ) && + event_handler->handle_input (io_handle) == -1) ACE_SET_BITS (problems, ACE_Event_Handler::READ_MASK); - if ((interested_events & actual_events & FD_CLOSE) - && !ACE_BIT_ENABLED (problems, ACE_Event_Handler::READ_MASK) - && event_handler->handle_input (io_handle) == -1) + if ((interested_events & actual_events & FD_CLOSE) && + !ACE_BIT_ENABLED (problems, ACE_Event_Handler::READ_MASK) && + event_handler->handle_input (io_handle) == -1) ACE_SET_BITS (problems, ACE_Event_Handler::READ_MASK); - if ((interested_events & actual_events & FD_ACCEPT) - && event_handler->handle_input (io_handle) == -1) + if ((interested_events & actual_events & FD_ACCEPT) && + event_handler->handle_input (io_handle) == -1) ACE_SET_BITS (problems, ACE_Event_Handler::ACCEPT_MASK); - if ((interested_events & actual_events & FD_WRITE) - && event_handler->handle_output (io_handle) == -1) + if ((interested_events & actual_events & FD_WRITE) && + event_handler->handle_output (io_handle) == -1) ACE_SET_BITS (problems, ACE_Event_Handler::WRITE_MASK); if (interested_events & actual_events & FD_CONNECT) @@ -1758,8 +1746,8 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler, ACE_SET_BITS (problems, ACE_Event_Handler::CONNECT_MASK); } - if ((interested_events & actual_events & FD_OOB) - && event_handler->handle_exception (io_handle) == -1) + if ((interested_events & actual_events & FD_OOB) && + event_handler->handle_exception (io_handle) == -1) ACE_SET_BITS (problems, ACE_Event_Handler::EXCEPT_MASK); if ((interested_events & actual_events & FD_QOS) @@ -1858,6 +1846,8 @@ ACE_WFMO_Reactor::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +// ************************************************************ + int ACE_WFMO_Reactor_Notify::dispatch_notifications (int &number_of_active_handles, const ACE_Handle_Set &rd_mask) @@ -1999,9 +1989,7 @@ ACE_WFMO_Reactor_Notify::notify (ACE_Event_Handler *eh, if (eh != 0) { ACE_Message_Block *mb = 0; - ACE_NEW_RETURN (mb, - ACE_Message_Block (sizeof (ACE_Notification_Buffer)), - -1); + ACE_NEW_RETURN (mb, ACE_Message_Block (sizeof (ACE_Notification_Buffer)), -1); ACE_Notification_Buffer *buffer = (ACE_Notification_Buffer *) mb->base (); @@ -2049,9 +2037,7 @@ ACE_WFMO_Reactor_Notify::dump (void) const ACE_TRACE ("ACE_WFMO_Reactor_Notify::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->timer_queue_->dump (); - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Max. iteration: %d\n"), - this->max_notify_iterations_)); + ACE_DEBUG ((LM_DEBUG, "Max. iteration: %d\n", this->max_notify_iterations_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h index 74e8c0fd7f0..38ceb25ca24 100644 --- a/ace/WFMO_Reactor.h +++ b/ace/WFMO_Reactor.h @@ -569,11 +569,6 @@ public: // = Event loop drivers. - virtual int work_pending (const ACE_Time_Value &max_wait_time = ACE_Time_Value::zero); - // Returns non-zero if there are I/O events "ready" for dispatching, - // but does not actually dispatch the event handlers. By default, - // don't block while checking this, i.e., "poll". - virtual int handle_events (ACE_Time_Value *max_wait_time = 0); virtual int alertable_handle_events (ACE_Time_Value *max_wait_time = 0); // This event loop driver blocks for up to <max_wait_time> before diff --git a/ace/WIN32_Asynch_IO.cpp b/ace/WIN32_Asynch_IO.cpp index d96db3d62c9..5180bd8ed40 100644 --- a/ace/WIN32_Asynch_IO.cpp +++ b/ace/WIN32_Asynch_IO.cpp @@ -86,9 +86,7 @@ ACE_WIN32_Asynch_Result::post_completion (ACE_Proactor_Impl *proactor) proactor); if (win32_proactor == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("Dynamic cast to WIN32 Proactor failed\n")), - -1); + ACE_ERROR_RETURN ((LM_ERROR, "Dynamic cast to WIN32 Proactor failed\n"), -1); // Post myself. return win32_proactor->post_completion (this); @@ -125,6 +123,8 @@ ACE_WIN32_Asynch_Result::ACE_WIN32_Asynch_Result (ACE_Handler &handler, ACE_UNUSED_ARG (signal_number); } +// **************************************************************** + int ACE_WIN32_Asynch_Operation::open (ACE_Handler &handler, ACE_HANDLE handle, @@ -149,18 +149,16 @@ ACE_WIN32_Asynch_Operation::open (ACE_Handler &handler, int ACE_WIN32_Asynch_Operation::cancel (void) { -#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) \ - && ( (defined (_MSC_VER) && (_MSC_VER > 1020)) \ - || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530))) +#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && (defined (_MSC_VER) && (_MSC_VER > 1020)) // All I/O operations that are canceled will complete with the error // ERROR_OPERATION_ABORTED. All completion notifications for the I/O // operations will occur normally. // @@ This API returns 0 on failure. So, I am returning -1 in that // case. Is that right? (Alex). - + int result = (int) ::CancelIo (this->handle_); - + if (result == 0) // Couldnt cancel the operations. return 2; @@ -169,7 +167,9 @@ ACE_WIN32_Asynch_Operation::cancel (void) return 0; #else /* Not ACE_HAS_WINNT4 && ACE_HAS_WINNT4!=0 && _MSC... */ + ACE_NOTSUP_RETURN (-1); + #endif /* ACE_HAS_AIO_CALLS */ } @@ -324,6 +324,8 @@ ACE_WIN32_Asynch_Read_Stream_Result::post_completion (ACE_Proactor_Impl *proacto return ACE_WIN32_Asynch_Result::post_completion (proactor); } +// ******************************************************************** + ACE_WIN32_Asynch_Read_Stream::ACE_WIN32_Asynch_Read_Stream (ACE_WIN32_Proactor *win32_proactor) : ACE_Asynch_Operation_Impl (), ACE_Asynch_Read_Stream_Impl (), @@ -381,7 +383,7 @@ ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result * return 1; // If initiate failed, check for a bad error. - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); switch (errno) { case ERROR_IO_PENDING: @@ -396,14 +398,8 @@ ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result * // Cleanup dynamically allocated Asynch_Result delete result; - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ReadFile"))); - } - - return -1; + // Return error + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ReadFile")), -1); } } @@ -435,6 +431,9 @@ ACE_WIN32_Asynch_Read_Stream::proactor (void) const return ACE_WIN32_Asynch_Operation::proactor (); } + +// ************************************************************ + u_long ACE_WIN32_Asynch_Write_Stream_Result::bytes_to_write (void) const { @@ -476,7 +475,7 @@ ACE_WIN32_Asynch_Write_Stream_Result::complete (u_long bytes_transferred, const void *completion_key, u_long error) { - // Copy the data which was returned by <GetQueuedCompletionStatus>. + // Copy the data which was returned by GetQueuedCompletionStatus this->bytes_transferred_ = bytes_transferred; this->success_ = success; this->completion_key_ = completion_key; @@ -565,6 +564,8 @@ ACE_WIN32_Asynch_Write_Stream_Result::post_completion (ACE_Proactor_Impl *proact return ACE_WIN32_Asynch_Result::post_completion (proactor); } +// ******************************************************************** + ACE_WIN32_Asynch_Write_Stream::ACE_WIN32_Asynch_Write_Stream (ACE_WIN32_Proactor *win32_proactor) : ACE_Asynch_Operation_Impl (), ACE_Asynch_Write_Stream_Impl (), @@ -621,7 +622,7 @@ ACE_WIN32_Asynch_Write_Stream::shared_write (ACE_WIN32_Asynch_Write_Stream_Resul return 1; // If initiate failed, check for a bad error. - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); switch (errno) { case ERROR_IO_PENDING: @@ -636,13 +637,8 @@ ACE_WIN32_Asynch_Write_Stream::shared_write (ACE_WIN32_Asynch_Write_Stream_Resul // Cleanup dynamically allocated Asynch_Result delete result; - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("WriteFile"))); - } - return -1; + // Return error + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("WriteFile")), -1); } } @@ -674,6 +670,8 @@ ACE_WIN32_Asynch_Write_Stream::proactor (void) const return ACE_WIN32_Asynch_Operation::proactor (); } +// ************************************************************ + ACE_WIN32_Asynch_Read_File_Result::ACE_WIN32_Asynch_Read_File_Result (ACE_Handler &handler, ACE_HANDLE handle, ACE_Message_Block &message_block, @@ -908,6 +906,8 @@ ACE_WIN32_Asynch_Read_File::proactor (void) const return ACE_WIN32_Asynch_Operation::proactor (); } +// ************************************************************ + ACE_WIN32_Asynch_Write_File_Result::ACE_WIN32_Asynch_Write_File_Result (ACE_Handler &handler, ACE_HANDLE handle, ACE_Message_Block &message_block, @@ -1052,6 +1052,8 @@ ACE_WIN32_Asynch_Write_File_Result::post_completion (ACE_Proactor_Impl *proactor return ACE_WIN32_Asynch_Result::post_completion (proactor); } +// ************************************************************ + ACE_WIN32_Asynch_Write_File::ACE_WIN32_Asynch_Write_File (ACE_WIN32_Proactor *win32_proactor) : ACE_Asynch_Operation_Impl (), ACE_Asynch_Write_Stream_Impl (), @@ -1139,6 +1141,8 @@ ACE_WIN32_Asynch_Write_File::proactor (void) const return ACE_WIN32_Asynch_Operation::proactor (); } +// ************************************************************ + u_long ACE_WIN32_Asynch_Accept_Result::bytes_to_read (void) const { @@ -1208,7 +1212,7 @@ ACE_WIN32_Asynch_Accept_Result::~ACE_WIN32_Asynch_Accept_Result (void) { } -// Base class operations. These operations are here to kill dominance +// Base class operations. These operations are here to kill dominance // warnings. These methods call the base class methods. u_long @@ -1277,6 +1281,8 @@ ACE_WIN32_Asynch_Accept_Result::post_completion (ACE_Proactor_Impl *proactor) return ACE_WIN32_Asynch_Result::post_completion (proactor); } +// ************************************************************ + ACE_WIN32_Asynch_Accept::ACE_WIN32_Asynch_Accept (ACE_WIN32_Proactor *win32_proactor) : ACE_Asynch_Operation_Impl (), ACE_Asynch_Accept_Impl (), @@ -1313,15 +1319,9 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, SOCK_STREAM, 0); if (accept_handle == ACE_INVALID_HANDLE) - { - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_OS::socket"))); - } - return -1; - } + ACE_ERROR_RETURN ((LM_ERROR, + ASYS_TEXT ("%p\n"), + ASYS_TEXT ("ACE_OS::socket")), -1); else // Remember to close the socket down if failures occur. close_accept_handle = 1; @@ -1357,7 +1357,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, return 1; // If initiate failed, check for a bad error. - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); switch (errno) { case ERROR_IO_PENDING: @@ -1375,14 +1375,8 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, // Cleanup dynamically allocated Asynch_Result. delete result; - - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ReadFile"))); - } - return -1; + + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ReadFile")), -1); } #else /* ACE_HAS_WINNT4 .......|| ACE_HAS_AIO_CALLS */ ACE_NOTSUP_RETURN (-1); @@ -1421,6 +1415,8 @@ ACE_WIN32_Asynch_Accept::proactor (void) const return ACE_WIN32_Asynch_Operation::proactor (); } +// ********************************************************************* + ACE_HANDLE ACE_WIN32_Asynch_Transmit_File_Result::socket (void) const { @@ -1590,6 +1586,8 @@ ACE_WIN32_Asynch_Transmit_File_Result::post_completion (ACE_Proactor_Impl *proac return ACE_WIN32_Asynch_Result::post_completion (proactor); } +// ************************************************************ + ACE_WIN32_Asynch_Transmit_File::ACE_WIN32_Asynch_Transmit_File (ACE_WIN32_Proactor *win32_proactor) : ACE_Asynch_Operation_Impl (), ACE_Asynch_Transmit_File_Impl (), @@ -1644,7 +1642,7 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, return 1; // If initiate failed, check for a bad error. - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); switch (errno) { case ERROR_IO_PENDING: @@ -1658,14 +1656,8 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, // Cleanup dynamically allocated Asynch_Result delete result; - - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("TransmitFile"))); - } - return -1; + + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("TransmitFile")), -1); } #else /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */ ACE_NOTSUP_RETURN (-1); @@ -1702,6 +1694,6 @@ ACE_Proactor * ACE_WIN32_Asynch_Transmit_File::proactor (void) const { return ACE_WIN32_Asynch_Operation::proactor (); -} +} #endif /* ACE_WIN32 || ACE_HAS_WINCE */ diff --git a/ace/WIN32_Proactor.cpp b/ace/WIN32_Proactor.cpp index 00ca490371c..fc87933c28b 100644 --- a/ace/WIN32_Proactor.cpp +++ b/ace/WIN32_Proactor.cpp @@ -19,10 +19,14 @@ class ACE_Export ACE_WIN32_Wakeup_Completion : public ACE_WIN32_Asynch_Result { // = TITLE - // This is result object is used by the <end_event_loop> of the + // + // This is result object is used by the <end_event_loop> of the // ACE_Proactor interface to wake up all the threads blocking // for completions. - + // + // = DESCRIPTION + // + public: ACE_WIN32_Wakeup_Completion (ACE_Handler &handler, const void *act = 0, @@ -30,11 +34,11 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); // Constructor. - + virtual ~ACE_WIN32_Wakeup_Completion (void); // Destructor. - - + + virtual void complete (u_long bytes_transferred = 0, int success = 1, const void *completion_key = 0, @@ -42,6 +46,8 @@ public: // This method calls the <handler>'s <handle_wakeup> method. }; +// ********************************************************************* + ACE_WIN32_Proactor::ACE_WIN32_Proactor (size_t number_of_threads, int used_with_reactor_event_loop) : completion_port_ (0), @@ -90,19 +96,13 @@ ACE_WIN32_Proactor::register_handle (ACE_HANDLE handle, this->number_of_threads_); if (cp == 0) { - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); // If errno == ERROR_INVALID_PARAMETER, then this handle was // already registered. if (errno != ERROR_INVALID_PARAMETER) - { - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("CreateIoCompletionPort"))); - } - return -1; - } + ACE_ERROR_RETURN ((LM_ERROR, + ASYS_TEXT ("%p\n"), + ASYS_TEXT ("CreateIoCompletionPort")), -1); } return 0; } @@ -177,7 +177,7 @@ ACE_WIN32_Proactor::create_asynch_read_stream_result (ACE_Handler &handler, int priority, int signal_number) { - ACE_Asynch_Read_Stream_Result_Impl *implementation = 0; + ACE_Asynch_Read_Stream_Result_Impl *implementation; ACE_NEW_RETURN (implementation, ACE_WIN32_Asynch_Read_Stream_Result (handler, handle, @@ -201,7 +201,7 @@ ACE_WIN32_Proactor::create_asynch_write_stream_result (ACE_Handler &handler, int priority, int signal_number) { - ACE_Asynch_Write_Stream_Result_Impl *implementation = 0; + ACE_Asynch_Write_Stream_Result_Impl *implementation; ACE_NEW_RETURN (implementation, ACE_WIN32_Asynch_Write_Stream_Result (handler, handle, @@ -227,7 +227,7 @@ ACE_WIN32_Proactor::create_asynch_read_file_result (ACE_Handler &handler, int priority, int signal_number) { - ACE_Asynch_Read_File_Result_Impl *implementation = 0; + ACE_Asynch_Read_File_Result_Impl *implementation; ACE_NEW_RETURN (implementation, ACE_WIN32_Asynch_Read_File_Result (handler, handle, @@ -255,7 +255,7 @@ ACE_WIN32_Proactor::create_asynch_write_file_result (ACE_Handler &handler, int priority, int signal_number) { - ACE_Asynch_Write_File_Result_Impl *implementation = 0; + ACE_Asynch_Write_File_Result_Impl *implementation; ACE_NEW_RETURN (implementation, ACE_WIN32_Asynch_Write_File_Result (handler, handle, @@ -282,7 +282,7 @@ ACE_WIN32_Proactor::create_asynch_accept_result (ACE_Handler &handler, int priority, int signal_number) { - ACE_Asynch_Accept_Result_Impl *implementation = 0; + ACE_Asynch_Accept_Result_Impl *implementation; ACE_NEW_RETURN (implementation, ACE_WIN32_Asynch_Accept_Result (handler, listen_handle, @@ -312,7 +312,7 @@ ACE_WIN32_Proactor::create_asynch_transmit_file_result (ACE_Handler &handler, int priority, int signal_number) { - ACE_Asynch_Transmit_File_Result_Impl *implementation = 0; + ACE_Asynch_Transmit_File_Result_Impl *implementation; ACE_NEW_RETURN (implementation, ACE_WIN32_Asynch_Transmit_File_Result (handler, socket, @@ -339,7 +339,7 @@ ACE_WIN32_Proactor::create_asynch_timer (ACE_Handler &handler, int priority, int signal_number) { - ACE_Asynch_Result_Impl *implementation = 0; + ACE_Asynch_Result_Impl *implementation; ACE_NEW_RETURN (implementation, ACE_WIN32_Asynch_Timer (handler, act, @@ -357,14 +357,12 @@ ACE_WIN32_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 (ACE_Time_Value timeout (0, 0); - ; - ) + while (1) { result = this->handle_events (timeout); - if (result != 0 || errno == ETIME) break; } @@ -422,7 +420,7 @@ ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds) milli_seconds); if (result == FALSE && overlapped == 0) { - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); if (errno == WAIT_TIMEOUT) { @@ -430,15 +428,10 @@ ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds) return 0; } else - { - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("GetQueuedCompletionStatus"))); - } - return -1; - } + ACE_ERROR_RETURN ((LM_ERROR, + ASYS_TEXT ("%p\n"), + ASYS_TEXT ("GetQueuedCompletionStatus")), + -1); } else { @@ -447,7 +440,7 @@ ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds) // If errors happen, grab the error. if (result == FALSE) - ACE_OS::set_errno_to_last_error (); + errno = ::GetLastError (); else errno = 0; @@ -487,7 +480,7 @@ ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result) { // Grab the event associated with the Proactor HANDLE handle = this->get_handle (); - + // If Proactor event is valid, signal it if (handle != ACE_INVALID_HANDLE && handle != 0) @@ -501,14 +494,7 @@ ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result) ) == FALSE) { delete result; - - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("PostQueuedCompletionStatus failed"))); - } - return -1; + ACE_ERROR_RETURN ((LM_ERROR, "PostQueuedCompletionStatus failed\n"), -1); } return 0; @@ -518,19 +504,18 @@ int ACE_WIN32_Proactor::post_wakeup_completions (int how_many) { ACE_WIN32_Wakeup_Completion *wakeup_completion = 0; - for (ssize_t ci = 0; ci < how_many; ci++) { ACE_NEW_RETURN (wakeup_completion, ACE_WIN32_Wakeup_Completion (this->wakeup_handler_), -1); - + if (wakeup_completion->post_completion (this) == -1) return -1; } - + return 0; -} +} int ACE_WIN32_Proactor::wake_up_dispatch_threads (void) @@ -556,6 +541,8 @@ ACE_WIN32_Proactor::number_of_threads (size_t threads) this->number_of_threads_ = threads; } +// ********************************************************************* + ACE_WIN32_Asynch_Timer::ACE_WIN32_Asynch_Timer (ACE_Handler &handler, const void *act, const ACE_Time_Value &tv, @@ -583,6 +570,8 @@ ACE_WIN32_Asynch_Timer::complete (u_long bytes_transferred, this->handler_.handle_time_out (this->time_, this->act ()); } +// ********************************************************************* + ACE_WIN32_Wakeup_Completion::ACE_WIN32_Wakeup_Completion (ACE_Handler &handler, const void *act, ACE_HANDLE event, diff --git a/ace/ace-dll.icc b/ace/ace-dll.icc deleted file mode 100644 index 2a084e896ae..00000000000 --- a/ace/ace-dll.icc +++ /dev/null @@ -1,280 +0,0 @@ -if $__TOS_WIN__ { - option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"), - define ("WIN32","1"), - define ("_WINDOWS","1") - TARG = "aced.dll" -} -if $__TOS_AIX__ { - option PlatformOptions = null - TARG = "aced.shr.a" -} - -option - PlatformOptions, - incl(searchPath,'H:\ACE_wrappers'), - define ("__ACE_INLINE__","0"), - define("ACE_HAS_DLL","0"), - link(exportAll), - link(linkwithsharedlib), - link(linkWithMultiThreadLib,yes) - { - target type (dll) TARG - { - option macros(global) - { - source type(cpp) "ACE.h" - source type(cpp) "OS.h" - } - source type(cpp) "Log_Msg.cpp" - source type(cpp) "ACE.cpp" - source type(cpp) "Activation_Queue.cpp" - source type(cpp) "Active_Map_Manager.cpp" - source type(cpp) "Addr.cpp" - source type(cpp) "Arg_Shifter.cpp" - source type(cpp) "ARGV.cpp" - source type(cpp) "Asynch_IO.cpp" - source type(cpp) "Asynch_IO_Impl.cpp" - source type(cpp) "Basic_Types.cpp" - source type(cpp) "CDR_Stream.cpp" - source type(cpp) "Containers.cpp" - source type(cpp) "CORBA_Handler.cpp" - source type(cpp) "CORBA_Ref.cpp" - source type(cpp) "Date_Time.cpp" - source type(cpp) "DEV.cpp" - source type(cpp) "DEV_Addr.cpp" - source type(cpp) "DEV_Connector.cpp" - source type(cpp) "DEV_IO.cpp" - source type(cpp) "Dirent.cpp" - source type(cpp) "DLL.cpp" - source type(cpp) "Dump.cpp" - source type(cpp) "Dynamic.cpp" - source type(cpp) "Dynamic_Service.cpp" - source type(cpp) "Event_Handler.cpp" - source type(cpp) "Event_Handler_T.cpp" - source type(cpp) "FIFO.cpp" - source type(cpp) "FIFO_Recv.cpp" - source type(cpp) "FIFO_Recv_Msg.cpp" - source type(cpp) "FIFO_Send.cpp" - source type(cpp) "FIFO_Send_Msg.cpp" - source type(cpp) "FILE.cpp" - source type(cpp) "FILE_Addr.cpp" - source type(cpp) "FILE_Connector.cpp" - source type(cpp) "FILE_IO.cpp" - source type(cpp) "Filecache.cpp" - source type(cpp) "Functor.cpp" - source type(cpp) "Future.cpp" - source type(cpp) "Get_Opt.cpp" - source type(cpp) "Handle_Set.cpp" - source type(cpp) "Hash_Map_Manager.cpp" - source type(cpp) "High_Res_Timer.cpp" - source type(cpp) "INET_Addr.cpp" - source type(cpp) "IO_Cntl_Msg.cpp" - source type(cpp) "IO_SAP.cpp" - source type(cpp) "IOStream.cpp" - source type(cpp) "IPC_SAP.cpp" - source type(cpp) "Local_Name_Space.cpp" - source type(cpp) "Local_Tokens.cpp" - source type(cpp) "Log_Record.cpp" - source type(cpp) "LSOCK.cpp" - source type(cpp) "LSOCK_Acceptor.cpp" - source type(cpp) "LSOCK_CODgram.cpp" - source type(cpp) "LSOCK_Connector.cpp" - source type(cpp) "LSOCK_Dgram.cpp" - source type(cpp) "LSOCK_Stream.cpp" - source type(cpp) "Malloc.cpp" - source type(cpp) "Map.cpp" - source type(cpp) "Mem_Map.cpp" - source type(cpp) "Memory_Pool.cpp" - source type(cpp) "Message_Block.cpp" - source type(cpp) "Message_Queue.cpp" - source type(cpp) "Method_Request.cpp" - source type(cpp) "Msg_WFMO_Reactor.cpp" - source type(cpp) "Multiplexor.cpp" - source type(cpp) "Name_Proxy.cpp" - source type(cpp) "Name_Request_Reply.cpp" - source type(cpp) "Name_Space.cpp" - source type(cpp) "Naming_Context.cpp" - source type(cpp) "NT_Service.cpp" - source type(cpp) "Object_Manager.cpp" - source type(cpp) "Obstack.cpp" - source type(cpp) "OS.cpp" - source type(cpp) "Pair.cpp" - source type(cpp) "Parse_Node.cpp" - source type(cpp) "Pipe.cpp" - source type(cpp) "Priority_Reactor.cpp" - source type(cpp) "Proactor.cpp" - source type(cpp) "Process.cpp" - source type(cpp) "Process_Manager.cpp" - source type(cpp) "Profile_Timer.cpp" - source type(cpp) "RB_Tree.cpp" - source type(cpp) "Reactor.cpp" - source type(cpp) "Read_Buffer.cpp" - source type(cpp) "Registry.cpp" - source type(cpp) "Registry_Name_Space.cpp" - source type(cpp) "Remote_Name_Space.cpp" - source type(cpp) "Remote_Tokens.cpp" - source type(cpp) "Sched_Params.cpp" - source type(cpp) "Select_Reactor.cpp" - source type(cpp) "Select_Reactor_Base.cpp" - source type(cpp) "Service_Config.cpp" - source type(cpp) "Service_Manager.cpp" - source type(cpp) "Service_Object.cpp" - source type(cpp) "Service_Repository.cpp" - source type(cpp) "Service_Types.cpp" - source type(cpp) "Shared_Memory.cpp" - source type(cpp) "Shared_Memory_MM.cpp" - source type(cpp) "Shared_Memory_SV.cpp" - source type(cpp) "Shared_Object.cpp" - source type(cpp) "Signal.cpp" - source type(cpp) "SOCK.cpp" - source type(cpp) "SOCK_Acceptor.cpp" - source type(cpp) "SOCK_CODgram.cpp" - source type(cpp) "SOCK_Connector.cpp" - source type(cpp) "SOCK_Dgram.cpp" - source type(cpp) "SOCK_Dgram_Bcast.cpp" - source type(cpp) "SOCK_Dgram_Mcast.cpp" - source type(cpp) "SOCK_IO.cpp" - source type(cpp) "SOCK_Stream.cpp" - source type(cpp) "SPIPE.cpp" - source type(cpp) "SPIPE_Acceptor.cpp" - source type(cpp) "SPIPE_Addr.cpp" - source type(cpp) "SPIPE_Connector.cpp" - source type(cpp) "SPIPE_Stream.cpp" - source type(cpp) "SString.cpp" - source type(cpp) "Stats.cpp" - source type(cpp) "Strategies.cpp" - source type(cpp) "SV_Message.cpp" - source type(cpp) "SV_Message_Queue.cpp" - source type(cpp) "SV_Semaphore_Complex.cpp" - source type(cpp) "SV_Semaphore_Simple.cpp" - source type(cpp) "SV_Shared_Memory.cpp" - source type(cpp) "Svc_Conf_l.cpp" - source type(cpp) "Svc_Conf_y.cpp" - source type(cpp) "Svc_Handler.cpp" - source type(cpp) "Synch.cpp" - source type(cpp) "Synch_Options.cpp" - source type(cpp) "System_Time.cpp" - source type(cpp) "Task.cpp" - source type(cpp) "Thread.cpp" - source type(cpp) "Thread_Manager.cpp" - source type(cpp) "Time_Request_Reply.cpp" - source type(cpp) "Timeprobe.cpp" - source type(cpp) "Timer_Hash.cpp" - source type(cpp) "Timer_Heap.cpp" - source type(cpp) "Timer_List.cpp" - source type(cpp) "Timer_Queue.cpp" - source type(cpp) "Timer_Queue_Adapters.cpp" - source type(cpp) "Timer_Wheel.cpp" - source type(cpp) "TLI.cpp" - source type(cpp) "TLI_Acceptor.cpp" - source type(cpp) "TLI_Connector.cpp" - source type(cpp) "TLI_Stream.cpp" - source type(cpp) "Token.cpp" - source type(cpp) "Token_Collection.cpp" - source type(cpp) "Token_Invariants.cpp" - source type(cpp) "Token_Manager.cpp" - source type(cpp) "Token_Request_Reply.cpp" - source type(cpp) "TP_Reactor.cpp" - source type(cpp) "Trace.cpp" - source type(cpp) "TTY_IO.cpp" - source type(cpp) "Typed_SV_Message.cpp" - source type(cpp) "Typed_SV_Message_Queue.cpp" - source type(cpp) "UNIX_Addr.cpp" - source type(cpp) "UPIPE_Acceptor.cpp" - source type(cpp) "UPIPE_Connector.cpp" - source type(cpp) "UPIPE_Stream.cpp" - source type(cpp) "WFMO_Reactor.cpp" - source type(cpp) "WIN32_Asynch_IO.cpp" - source type(cpp) "WIN32_Proactor.cpp" - source type(cpp) "XtReactor.cpp" - source type(cpp) "Active_Map_Manager_T.cpp" - source type(cpp) "Cache_Hash_T.cpp" - source type(cpp) "Cache_Heap_T.cpp" - source type(cpp) "Cache_Manager_T.cpp" - source type(cpp) "Containers_T.cpp" - source type(cpp) "Dump_T.cpp" - source type(cpp) "Env_Value_T.cpp" - source type(cpp) "Event_Handler_T.cpp" - source type(cpp) "Functor_T.cpp" - source type(cpp) "Hash_Bucket_T.cpp" - source type(cpp) "Hash_Map_Manager_T.cpp" - source type(cpp) "Hash_Purgable_Map_Manager_T.cpp" - source type(cpp) "IOStream_T.cpp" - source type(cpp) "Local_Name_Space_T.cpp" - source type(cpp) "Malloc_T.cpp" - source type(cpp) "Map_T.cpp" - source type(cpp) "Message_Block_T.cpp" - source type(cpp) "Message_Queue_T.cpp" - source type(cpp) "Pair_T.cpp" - source type(cpp) "Select_Reactor_T.cpp" - source type(cpp) "Strategies_T.cpp" - source type(cpp) "Synch_T.cpp" - source type(cpp) "Task_T.cpp" - source type(cpp) "Timeprobe_T.cpp" - source type(cpp) "Timer_Hash_T.cpp" - source type(cpp) "Timer_Heap_T.cpp" - source type(cpp) "Timer_List_T.cpp" - source type(cpp) "Timer_Queue_T.cpp" - source type(cpp) "Timer_Wheel_T.cpp" - // Template implementation files (#pragma implementation) - source type (cpp) "Acceptor.cpp" - source type (cpp) "Active_Map_Manager_T.cpp" - source type (cpp) "Containers.cpp" - source type (cpp) "Asynch_Acceptor.cpp" - source type (cpp) "Auto_Ptr.cpp" - source type (cpp) "CORBA_Ref.cpp" - source type (cpp) "Connector.cpp" - source type (cpp) "Containers_T.cpp" - source type (cpp) "Dump_T.cpp" - source type (cpp) "Env_Value_T.cpp" - source type (cpp) "Event_Handler_T.cpp" - source type (cpp) "Free_List.cpp" - source type (cpp) "Functor_T.cpp" - source type (cpp) "Future.cpp" - source type (cpp) "Hash_Map_Manager_T.cpp" - source type (cpp) "Hash_Purgable_Map_Manager_T.cpp" - source type (cpp) "IOStream_T.cpp" - source type (cpp) "LOCK_SOCK_Acceptor.cpp" - source type (cpp) "Local_Name_Space_T.cpp" - source type (cpp) "Malloc_T.cpp" - source type (cpp) "Managed_Object.cpp" - source type (cpp) "Map_Manager.cpp" - source type (cpp) "Map_T.cpp" - source type (cpp) "Message_Block_T.cpp" - source type (cpp) "Message_Queue_T.cpp" - source type (cpp) "Module.cpp" - source type (cpp) "Pair_T.cpp" - source type (cpp) "RB_Tree.cpp" - source type (cpp) "Select_Reactor_T.cpp" - source type (cpp) "Singleton.cpp" - source type (cpp) "Strategies_T.cpp" - source type (cpp) "Stream.cpp" - source type (cpp) "Stream_Modules.cpp" - source type (cpp) "Svc_Handler.cpp" - source type (cpp) "Synch_T.cpp" - source type (cpp) "Task_T.cpp" - source type (cpp) "Timeprobe_T.cpp" - source type (cpp) "Timer_Hash_T.cpp" - source type (cpp) "Timer_Heap_T.cpp" - source type (cpp) "Timer_List_T.cpp" - source type (cpp) "Timer_Queue_T.cpp" - source type (cpp) "Timer_Wheel_T.cpp" - source type (cpp) "Typed_SV_Message.cpp" - source type (cpp) "Typed_SV_Message_Queue.cpp" - - // Libraries needed during linking - if $__TOS_WIN__ { - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - if $__TOS_AIX__ { - source type (lib) "libtli_r.a" - source type (lib) "libpthreads.a" - source type (lib) "libc_r.a" - source type (lib) "libdl.a" - } - } -} diff --git a/ace/ace-lib.icc b/ace/ace-lib.icc deleted file mode 100644 index 4552416ede5..00000000000 --- a/ace/ace-lib.icc +++ /dev/null @@ -1,279 +0,0 @@ -if $__TOS_WIN__ { - option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"), - define ("WIN32","1"), - define ("_WINDOWS","1") - TARG = "aced.lib" -} -if $__TOS_AIX__ { - option PlatformOptions = null - TARG = "aced.a" -} - -option - PlatformOptions, - incl(searchPath,'H:\ACE_wrappers'), - define ("__ACE_INLINE__","0"), - define("ACE_HAS_DLL","0"), - link(exportAll), - link(linkwithsharedlib), - link(linkWithMultiThreadLib,yes) - { - target type (lib) TARG - { - option macros(global) - { - source type(cpp) "ACE.h" - source type(cpp) "OS.h" - } - source type(cpp) "Log_Msg.cpp" - source type(cpp) "ACE.cpp" - source type(cpp) "Activation_Queue.cpp" - source type(cpp) "Active_Map_Manager.cpp" - source type(cpp) "Addr.cpp" - source type(cpp) "Arg_Shifter.cpp" - source type(cpp) "ARGV.cpp" - source type(cpp) "Asynch_IO.cpp" - source type(cpp) "Asynch_IO_Impl.cpp" - source type(cpp) "Basic_Types.cpp" - source type(cpp) "CDR_Stream.cpp" - source type(cpp) "Containers.cpp" - source type(cpp) "CORBA_Handler.cpp" - source type(cpp) "CORBA_Ref.cpp" - source type(cpp) "Date_Time.cpp" - source type(cpp) "DEV.cpp" - source type(cpp) "DEV_Addr.cpp" - source type(cpp) "DEV_Connector.cpp" - source type(cpp) "DEV_IO.cpp" - source type(cpp) "Dirent.cpp" - source type(cpp) "DLL.cpp" - source type(cpp) "Dump.cpp" - source type(cpp) "Dynamic.cpp" - source type(cpp) "Dynamic_Service.cpp" - source type(cpp) "Event_Handler.cpp" - source type(cpp) "Event_Handler_T.cpp" - source type(cpp) "FIFO.cpp" - source type(cpp) "FIFO_Recv.cpp" - source type(cpp) "FIFO_Recv_Msg.cpp" - source type(cpp) "FIFO_Send.cpp" - source type(cpp) "FIFO_Send_Msg.cpp" - source type(cpp) "FILE.cpp" - source type(cpp) "FILE_Addr.cpp" - source type(cpp) "FILE_Connector.cpp" - source type(cpp) "FILE_IO.cpp" - source type(cpp) "Filecache.cpp" - source type(cpp) "Functor.cpp" - source type(cpp) "Future.cpp" - source type(cpp) "Get_Opt.cpp" - source type(cpp) "Handle_Set.cpp" - source type(cpp) "Hash_Map_Manager.cpp" - source type(cpp) "High_Res_Timer.cpp" - source type(cpp) "INET_Addr.cpp" - source type(cpp) "IO_Cntl_Msg.cpp" - source type(cpp) "IO_SAP.cpp" - source type(cpp) "IOStream.cpp" - source type(cpp) "IPC_SAP.cpp" - source type(cpp) "Local_Name_Space.cpp" - source type(cpp) "Local_Tokens.cpp" - source type(cpp) "Log_Record.cpp" - source type(cpp) "LSOCK.cpp" - source type(cpp) "LSOCK_Acceptor.cpp" - source type(cpp) "LSOCK_CODgram.cpp" - source type(cpp) "LSOCK_Connector.cpp" - source type(cpp) "LSOCK_Dgram.cpp" - source type(cpp) "LSOCK_Stream.cpp" - source type(cpp) "Malloc.cpp" - source type(cpp) "Map.cpp" - source type(cpp) "Mem_Map.cpp" - source type(cpp) "Memory_Pool.cpp" - source type(cpp) "Message_Block.cpp" - source type(cpp) "Message_Queue.cpp" - source type(cpp) "Method_Request.cpp" - source type(cpp) "Msg_WFMO_Reactor.cpp" - source type(cpp) "Multiplexor.cpp" - source type(cpp) "Name_Proxy.cpp" - source type(cpp) "Name_Request_Reply.cpp" - source type(cpp) "Name_Space.cpp" - source type(cpp) "Naming_Context.cpp" - source type(cpp) "NT_Service.cpp" - source type(cpp) "Object_Manager.cpp" - source type(cpp) "Obstack.cpp" - source type(cpp) "OS.cpp" - source type(cpp) "Pair.cpp" - source type(cpp) "Parse_Node.cpp" - source type(cpp) "Pipe.cpp" - source type(cpp) "Priority_Reactor.cpp" - source type(cpp) "Proactor.cpp" - source type(cpp) "Process.cpp" - source type(cpp) "Process_Manager.cpp" - source type(cpp) "Profile_Timer.cpp" - source type(cpp) "RB_Tree.cpp" - source type(cpp) "Reactor.cpp" - source type(cpp) "Read_Buffer.cpp" - source type(cpp) "Registry.cpp" - source type(cpp) "Registry_Name_Space.cpp" - source type(cpp) "Remote_Name_Space.cpp" - source type(cpp) "Remote_Tokens.cpp" - source type(cpp) "Sched_Params.cpp" - source type(cpp) "Select_Reactor.cpp" - source type(cpp) "Select_Reactor_Base.cpp" - source type(cpp) "Service_Config.cpp" - source type(cpp) "Service_Manager.cpp" - source type(cpp) "Service_Object.cpp" - source type(cpp) "Service_Repository.cpp" - source type(cpp) "Service_Types.cpp" - source type(cpp) "Shared_Memory.cpp" - source type(cpp) "Shared_Memory_MM.cpp" - source type(cpp) "Shared_Memory_SV.cpp" - source type(cpp) "Shared_Object.cpp" - source type(cpp) "Signal.cpp" - source type(cpp) "SOCK.cpp" - source type(cpp) "SOCK_Acceptor.cpp" - source type(cpp) "SOCK_CODgram.cpp" - source type(cpp) "SOCK_Connector.cpp" - source type(cpp) "SOCK_Dgram.cpp" - source type(cpp) "SOCK_Dgram_Bcast.cpp" - source type(cpp) "SOCK_Dgram_Mcast.cpp" - source type(cpp) "SOCK_IO.cpp" - source type(cpp) "SOCK_Stream.cpp" - source type(cpp) "SPIPE.cpp" - source type(cpp) "SPIPE_Acceptor.cpp" - source type(cpp) "SPIPE_Addr.cpp" - source type(cpp) "SPIPE_Connector.cpp" - source type(cpp) "SPIPE_Stream.cpp" - source type(cpp) "SString.cpp" - source type(cpp) "Stats.cpp" - source type(cpp) "Strategies.cpp" - source type(cpp) "SV_Message.cpp" - source type(cpp) "SV_Message_Queue.cpp" - source type(cpp) "SV_Semaphore_Complex.cpp" - source type(cpp) "SV_Semaphore_Simple.cpp" - source type(cpp) "SV_Shared_Memory.cpp" - source type(cpp) "Svc_Conf_l.cpp" - source type(cpp) "Svc_Conf_y.cpp" - source type(cpp) "Svc_Handler.cpp" - source type(cpp) "Synch.cpp" - source type(cpp) "Synch_Options.cpp" - source type(cpp) "System_Time.cpp" - source type(cpp) "Task.cpp" - source type(cpp) "Thread.cpp" - source type(cpp) "Thread_Manager.cpp" - source type(cpp) "Time_Request_Reply.cpp" - source type(cpp) "Timeprobe.cpp" - source type(cpp) "Timer_Hash.cpp" - source type(cpp) "Timer_Heap.cpp" - source type(cpp) "Timer_List.cpp" - source type(cpp) "Timer_Queue.cpp" - source type(cpp) "Timer_Queue_Adapters.cpp" - source type(cpp) "Timer_Wheel.cpp" - source type(cpp) "TLI.cpp" - source type(cpp) "TLI_Acceptor.cpp" - source type(cpp) "TLI_Connector.cpp" - source type(cpp) "TLI_Stream.cpp" - source type(cpp) "Token.cpp" - source type(cpp) "Token_Collection.cpp" - source type(cpp) "Token_Invariants.cpp" - source type(cpp) "Token_Manager.cpp" - source type(cpp) "Token_Request_Reply.cpp" - source type(cpp) "TP_Reactor.cpp" - source type(cpp) "Trace.cpp" - source type(cpp) "TTY_IO.cpp" - source type(cpp) "Typed_SV_Message.cpp" - source type(cpp) "Typed_SV_Message_Queue.cpp" - source type(cpp) "UNIX_Addr.cpp" - source type(cpp) "UPIPE_Acceptor.cpp" - source type(cpp) "UPIPE_Connector.cpp" - source type(cpp) "UPIPE_Stream.cpp" - source type(cpp) "WFMO_Reactor.cpp" - source type(cpp) "WIN32_Asynch_IO.cpp" - source type(cpp) "WIN32_Proactor.cpp" - source type(cpp) "XtReactor.cpp" - source type(cpp) "Active_Map_Manager_T.cpp" - source type(cpp) "Cache_Hash_T.cpp" - source type(cpp) "Cache_Heap_T.cpp" - source type(cpp) "Cache_Manager_T.cpp" - source type(cpp) "Containers_T.cpp" - source type(cpp) "Dump_T.cpp" - source type(cpp) "Env_Value_T.cpp" - source type(cpp) "Event_Handler_T.cpp" - source type(cpp) "Functor_T.cpp" - source type(cpp) "Hash_Bucket_T.cpp" - source type(cpp) "Hash_Map_Manager_T.cpp" - source type(cpp) "Hash_Purgable_Map_Manager_T.cpp" - source type(cpp) "IOStream_T.cpp" - source type(cpp) "Local_Name_Space_T.cpp" - source type(cpp) "Malloc_T.cpp" - source type(cpp) "Map_T.cpp" - source type(cpp) "Message_Block_T.cpp" - source type(cpp) "Message_Queue_T.cpp" - source type(cpp) "Pair_T.cpp" - source type(cpp) "Select_Reactor_T.cpp" - source type(cpp) "Strategies_T.cpp" - source type(cpp) "Synch_T.cpp" - source type(cpp) "Task_T.cpp" - source type(cpp) "Timeprobe_T.cpp" - source type(cpp) "Timer_Hash_T.cpp" - source type(cpp) "Timer_Heap_T.cpp" - source type(cpp) "Timer_List_T.cpp" - source type(cpp) "Timer_Queue_T.cpp" - source type(cpp) "Timer_Wheel_T.cpp" - // Template implementation files (#pragma implementation) - source type (cpp) "Acceptor.cpp" - source type (cpp) "Active_Map_Manager_T.cpp" - source type (cpp) "Containers.cpp" - source type (cpp) "Asynch_Acceptor.cpp" - source type (cpp) "Auto_Ptr.cpp" - source type (cpp) "CORBA_Ref.cpp" - source type (cpp) "Connector.cpp" - source type (cpp) "Containers_T.cpp" - source type (cpp) "Dump_T.cpp" - source type (cpp) "Env_Value_T.cpp" - source type (cpp) "Event_Handler_T.cpp" - source type (cpp) "Free_List.cpp" - source type (cpp) "Functor_T.cpp" - source type (cpp) "Future.cpp" - source type (cpp) "Hash_Map_Manager_T.cpp" - source type (cpp) "ace/Hash_Purgable_Map_Manager_T.cpp" - source type (cpp) "IOStream_T.cpp" - source type (cpp) "LOCK_SOCK_Acceptor.cpp" - source type (cpp) "Local_Name_Space_T.cpp" - source type (cpp) "Malloc_T.cpp" - source type (cpp) "Managed_Object.cpp" - source type (cpp) "Map_Manager.cpp" - source type (cpp) "Map_T.cpp" - source type (cpp) "Message_Block_T.cpp" - source type (cpp) "Message_Queue_T.cpp" - source type (cpp) "Module.cpp" - source type (cpp) "Pair_T.cpp" - source type (cpp) "RB_Tree.cpp" - source type (cpp) "Select_Reactor_T.cpp" - source type (cpp) "Singleton.cpp" - source type (cpp) "Strategies_T.cpp" - source type (cpp) "Stream.cpp" - source type (cpp) "Stream_Modules.cpp" - source type (cpp) "Svc_Handler.cpp" - source type (cpp) "Synch_T.cpp" - source type (cpp) "Task_T.cpp" - source type (cpp) "Timeprobe_T.cpp" - source type (cpp) "Timer_Hash_T.cpp" - source type (cpp) "Timer_Heap_T.cpp" - source type (cpp) "Timer_List_T.cpp" - source type (cpp) "Timer_Queue_T.cpp" - source type (cpp) "Timer_Wheel_T.cpp" - source type (cpp) "Typed_SV_Message.cpp" - source type (cpp) "Typed_SV_Message_Queue.cpp" - - // Libraries needed during linking - if $__TOS_WIN__ { - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - if $__TOS_AIX__ { - source type (lib) "libtli_r.a" - source type (lib) "libpthreads.a" - source type (lib) "libc_r.a" - } - } -} diff --git a/ace/ace_bcc.ide b/ace/ace_bcc.ide Binary files differnew file mode 100644 index 00000000000..85de4a2a42d --- /dev/null +++ b/ace/ace_bcc.ide diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp index 9738415c47a..b988958ce0d 100644 --- a/ace/ace_dll.dsp +++ b/ace/ace_dll.dsp @@ -1,43 +1,44 @@ -# Microsoft Developer Studio Project File - Name="ACE DLL" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="ACE dynamic library" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602
-CFG=ACE DLL - Win32 Debug
+CFG=ACE dynamic library - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "ace_dll.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "ace_dll.mak" CFG="ACE DLL - Win32 Debug"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "ace_dll.mak" CFG="ACE dynamic library - Win32 Debug"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "ACE DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ACE DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ACE DLL - Win32 Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ACE DLL - Win32 Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ACE DLL - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
-!MESSAGE "ACE DLL - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
-!MESSAGE "ACE DLL - Win32 Alpha Unicode Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
-!MESSAGE "ACE DLL - Win32 Alpha Unicode Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE
+!MESSAGE "ACE dynamic library - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "ACE dynamic library - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "ACE dynamic library - Win32 Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "ACE dynamic library - Win32 Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "ACE dynamic library - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
+!MESSAGE "ACE dynamic library - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
+!MESSAGE "ACE dynamic library - Win32 Alpha Unicode Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
+!MESSAGE "ACE dynamic library - Win32 Alpha Unicode Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
+!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath "Desktop"
-!IF "$(CFG)" == "ACE DLL - Win32 Debug"
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ".\DLL\Debug"
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
@@ -47,7 +48,7 @@ CFG=ACE DLL - Win32 Debug # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\\" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
# SUBTRACT CPP /YX /Yc /Yu
MTL=midl.exe
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
@@ -63,7 +64,7 @@ LINK32=link.exe # ADD LINK32 advapi32.lib user32.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:I386 /out:"..\bin\aced.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
-!ELSEIF "$(CFG)" == "ACE DLL - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -78,7 +79,7 @@ LINK32=link.exe # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
# SUBTRACT CPP /YX
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
@@ -94,7 +95,7 @@ LINK32=link.exe # ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:I386 /out:"..\bin\ace.dll"
# SUBTRACT LINK32 /pdb:none
-!ELSEIF "$(CFG)" == "ACE DLL - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -109,7 +110,7 @@ LINK32=link.exe # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\\" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c
# SUBTRACT CPP /YX
MTL=midl.exe
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
@@ -125,7 +126,7 @@ LINK32=link.exe # ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\aceu.pdb" /debug /machine:I386 /out:"..\bin\aceud.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
-!ELSEIF "$(CFG)" == "ACE DLL - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -140,7 +141,7 @@ LINK32=link.exe # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c
# SUBTRACT CPP /YX
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
@@ -156,26 +157,26 @@ LINK32=link.exe # ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\aceu-r.pdb" /machine:I386 /out:"..\bin\aceu.dll"
# SUBTRACT LINK32 /pdb:none
-!ELSEIF "$(CFG)" == "ACE DLL - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ".\DLL\Debug"
+# PROP BASE Intermediate_Dir "DLL\Debug"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
-# PROP Intermediate_Dir ".\DLL\Debug"
+# PROP Intermediate_Dir "DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"
CPP=cl.exe
-# ADD BASE CPP /Gt0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "..\\ /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "_DEBUG" /FD /MDd /c
+# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy I "..\\ /D " WIN32" D "_DEBUG" D "_WINDOWS" D ACE_HAS_DLL=1 FD MTd c
+# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "_DEBUG" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -188,7 +189,7 @@ LINK32=link.exe # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:ALPHA /out:"..\bin\aced.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
-!ELSEIF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -206,8 +207,8 @@ MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"
CPP=cl.exe
-# ADD BASE CPP /Gt0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /c
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /Ob2 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /c
+# ADD BASE CPP /Gt0 nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /D " WIN32" D "NDEBUG" D "_WINDOWS" D ACE_HAS_DLL=1 FD c
+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -220,7 +221,7 @@ LINK32=link.exe # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:ALPHA /out:"..\bin\ace.dll"
# SUBTRACT LINK32 /pdb:none
-!ELSEIF "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -238,8 +239,8 @@ MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"
CPP=cl.exe
-# ADD BASE CPP /Gt0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "..\\ /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /MTd /c
+# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy I "..\\ /D " WIN32" D "_DEBUG" D "_WINDOWS" D ACE_HAS_DLL=1 D "UNICODE" FD MTd c
+# ADD CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -252,7 +253,7 @@ LINK32=link.exe # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu.pdb" /debug /machine:ALPHA /out:"..\bin\aceud.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
-!ELSEIF "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -270,8 +271,8 @@ MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"
CPP=cl.exe
-# ADD BASE CPP /Gt0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /c
-# ADD CPP /nologo /MT /Gt0 /W3 /GX /O2 /Ob2 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /c
+# ADD BASE CPP /Gt0 nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /D " WIN32" D "NDEBUG" D "_WINDOWS" D ACE_HAS_DLL=1 D "UNICODE" FD c
+# ADD CPP /nologo /MT /Gt0 /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -284,668 +285,3762 @@ LINK32=link.exe # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu-r.pdb" /machine:ALPHA /out:"..\bin\aceu.dll"
# SUBTRACT LINK32 /pdb:none
-!ENDIF
+!ENDIF
# Begin Target
-# Name "ACE DLL - Win32 Debug"
-# Name "ACE DLL - Win32 Release"
-# Name "ACE DLL - Win32 Unicode Debug"
-# Name "ACE DLL - Win32 Unicode Release"
-# Name "ACE DLL - Win32 Alpha Debug"
-# Name "ACE DLL - Win32 Alpha Release"
-# Name "ACE DLL - Win32 Alpha Unicode Debug"
-# Name "ACE DLL - Win32 Alpha Unicode Release"
+# Name "ACE dynamic library - Win32 Debug"
+# Name "ACE dynamic library - Win32 Release"
+# Name "ACE dynamic library - Win32 Unicode Debug"
+# Name "ACE dynamic library - Win32 Unicode Release"
+# Name "ACE dynamic library - Win32 Alpha Debug"
+# Name "ACE dynamic library - Win32 Alpha Release"
+# Name "ACE dynamic library - Win32 Alpha Unicode Debug"
+# Name "ACE dynamic library - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\ACE.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Activation_Queue.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Active_Map_Manager.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Addr.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Arg_Shifter.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\ARGV.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Asynch_IO.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Asynch_IO_Impl.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Basic_Types.cpp
-# End Source File
-# Begin Source File
-SOURCE=.\Based_Pointer_Repository.cpp
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\CDR_Stream.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Containers.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+# PROP BASE Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+# PROP BASE Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+# PROP BASE Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+# PROP BASE Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\CORBA_Handler.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\CORBA_Ref.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Date_Time.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\DEV.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\DEV_Addr.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\DEV_Connector.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\DEV_IO.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Dirent.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\DLL.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Dump.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Dynamic.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Dynamic_Service.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Event_Handler.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Event_Handler_T.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\FIFO.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\FIFO_Recv.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\FIFO_Recv_Msg.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\FIFO_Send.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\FIFO_Send_Msg.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\FILE.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\FILE_Addr.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\FILE_Connector.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\FILE_IO.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Filecache.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Functor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Future.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Get_Opt.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Handle_Set.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Hash_Map_Manager.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+# PROP BASE Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\High_Res_Timer.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\INET_Addr.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\IO_Cntl_Msg.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\IO_SAP.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\IOStream.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\IPC_SAP.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Local_Name_Space.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Local_Tokens.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Log_Msg.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Log_Record.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\LSOCK.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\LSOCK_Acceptor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\LSOCK_CODgram.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\LSOCK_Connector.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\LSOCK_Dgram.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\LSOCK_Stream.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Malloc.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Map.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Mem_Map.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Memory_Pool.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Message_Block.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Message_Queue.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+# PROP BASE Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+# PROP BASE Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+# PROP BASE Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+# PROP BASE Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Method_Request.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Msg_WFMO_Reactor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Multiplexor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Name_Proxy.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Name_Request_Reply.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Name_Space.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Naming_Context.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\NT_Service.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Object_Manager.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Obstack.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\OS.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Pair.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Parse_Node.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Pipe.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Priority_Reactor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Proactor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Process.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Process_Manager.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Profile_Timer.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Reactor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Read_Buffer.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Registry.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Registry_Name_Space.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Remote_Name_Space.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Remote_Tokens.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Sched_Params.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Select_Reactor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Select_Reactor_Base.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Service_Config.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Service_Manager.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Service_Object.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Service_Repository.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Service_Types.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Shared_Memory.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Shared_Memory_MM.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Shared_Memory_SV.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Shared_Object.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Signal.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SOCK.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SOCK_Acceptor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SOCK_CODgram.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SOCK_Connector.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SOCK_Dgram.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SOCK_Dgram_Bcast.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SOCK_Dgram_Mcast.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SOCK_IO.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SOCK_Stream.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SPIPE.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SPIPE_Acceptor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SPIPE_Addr.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SPIPE_Connector.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SPIPE_Stream.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SString.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Stats.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Strategies.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SV_Message.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SV_Message_Queue.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SV_Semaphore_Complex.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SV_Semaphore_Simple.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\SV_Shared_Memory.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Svc_Conf_l.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Svc_Conf_y.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Svc_Handler.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Synch.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Synch_Options.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\System_Time.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Task.cpp
-# End Source File
-# Begin Source File
-SOURCE=.\Template_Instantiations.cpp
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Thread.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Thread_Manager.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Time_Request_Reply.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Timeprobe.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Timer_Hash.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Timer_Heap.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Timer_List.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Timer_Queue.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Timer_Queue_Adapters.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Timer_Wheel.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\TLI.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\TLI_Acceptor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\TLI_Connector.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\TLI_Stream.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Token.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Token_Collection.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Token_Invariants.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Token_Manager.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Token_Request_Reply.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\TP_Reactor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Trace.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\TTY_IO.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Typed_SV_Message.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Typed_SV_Message_Queue.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\UNIX_Addr.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\UPIPE_Acceptor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\UPIPE_Connector.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\UPIPE_Stream.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\WFMO_Reactor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\WIN32_Asynch_IO.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\WIN32_Proactor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\XtReactor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+!ENDIF
+
# End Source File
# End Group
# Begin Group "Header Files"
@@ -993,10 +4088,6 @@ SOURCE=.\Asynch_IO.h # End Source File
# Begin Source File
-SOURCE=.\Asynch_IO_Impl.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Auto_Ptr.h
# End Source File
# Begin Source File
@@ -1005,50 +4096,14 @@ SOURCE=.\Basic_Types.h # End Source File
# Begin Source File
-SOURCE=.\Based_Pointer_Repository.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Base_Pointer_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Cache_Map_Manager_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Cached_Connect_Strategy_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Caching_Strategies_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Caching_Strategy_Utility_T.h
-# End Source File
-# Begin Source File
-
SOURCE=.\CDR_Stream.h
# End Source File
# Begin Source File
-SOURCE=.\Cleanup_Strategies_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=".\config-win32-borland.h"
-# End Source File
-# Begin Source File
-
SOURCE=".\config-win32-common.h"
# End Source File
# Begin Source File
-SOURCE=".\config-win32.h"
-# End Source File
-# Begin Source File
-
SOURCE=.\config.h
# End Source File
# Begin Source File
@@ -1061,10 +4116,6 @@ SOURCE=.\Containers.h # End Source File
# Begin Source File
-SOURCE=.\Containers_T.h
-# End Source File
-# Begin Source File
-
SOURCE=.\CORBA_Handler.h
# End Source File
# Begin Source File
@@ -1189,10 +4240,6 @@ SOURCE=.\Handle_Set.h # End Source File
# Begin Source File
-SOURCE=.\Hash_Cache_Map_Manager_T.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Hash_Map_Manager.h
# End Source File
# Begin Source File
@@ -1201,10 +4248,6 @@ SOURCE=.\Hash_Map_Manager_T.h # End Source File
# Begin Source File
-SOURCE=.\Hash_Map_With_Allocator_T.h
-# End Source File
-# Begin Source File
-
SOURCE=.\High_Res_Timer.h
# End Source File
# Begin Source File
@@ -1325,10 +4368,6 @@ SOURCE=.\Message_Block.h # End Source File
# Begin Source File
-SOURCE=.\Message_Block_T.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Message_Queue.h
# End Source File
# Begin Source File
@@ -1409,10 +4448,6 @@ SOURCE=.\Proactor.h # End Source File
# Begin Source File
-SOURCE=.\Proactor_Impl.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Process.h
# End Source File
# Begin Source File
@@ -1681,10 +4716,6 @@ SOURCE=.\Time_Value.h # End Source File
# Begin Source File
-SOURCE=.\Timeprobe.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Timer_Hash.h
# End Source File
# Begin Source File
@@ -1765,10 +4796,6 @@ SOURCE=.\Token_Request_Reply.h # End Source File
# Begin Source File
-SOURCE=.\TP_Reactor.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Trace.h
# End Source File
# Begin Source File
@@ -1813,14 +4840,6 @@ SOURCE=.\WFMO_Reactor.h # End Source File
# Begin Source File
-SOURCE=.\WIN32_Asynch_IO.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\WIN32_Proactor.h
-# End Source File
-# Begin Source File
-
SOURCE=.\ws2tcpip.h
# End Source File
# Begin Source File
@@ -1869,10 +4888,6 @@ SOURCE=.\Asynch_IO.i # End Source File
# Begin Source File
-SOURCE=.\Asynch_IO_Impl.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Atomic_Op.i
# End Source File
# Begin Source File
@@ -1885,30 +4900,10 @@ SOURCE=.\Basic_Types.i # End Source File
# Begin Source File
-SOURCE=.\Cache_Map_Manager_T.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Cached_Connect_Strategy_T.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Caching_Strategies_T.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Caching_Strategy_Utility_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\CDR_Stream.i
# End Source File
# Begin Source File
-SOURCE=.\Cleanup_Strategies_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Connector.i
# End Source File
# Begin Source File
@@ -1917,10 +4912,6 @@ SOURCE=.\Containers.i # End Source File
# Begin Source File
-SOURCE=.\Containers_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\CORBA_Handler.i
# End Source File
# Begin Source File
@@ -2001,14 +4992,6 @@ SOURCE=.\Free_List.i # End Source File
# Begin Source File
-SOURCE=.\Functor.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Functor_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Get_Opt.i
# End Source File
# Begin Source File
@@ -2017,10 +5000,6 @@ SOURCE=.\Handle_Set.i # End Source File
# Begin Source File
-SOURCE=.\Hash_Cache_Map_Manager_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Hash_Map_Manager.i
# End Source File
# Begin Source File
@@ -2029,10 +5008,6 @@ SOURCE=.\Hash_Map_Manager_T.i # End Source File
# Begin Source File
-SOURCE=.\Hash_Map_With_Allocator_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\High_Res_Timer.i
# End Source File
# Begin Source File
@@ -2121,10 +5096,6 @@ SOURCE=.\Message_Block.i # End Source File
# Begin Source File
-SOURCE=.\Message_Block_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Message_Queue.i
# End Source File
# Begin Source File
@@ -2445,10 +5416,6 @@ SOURCE=.\Token_Request_Reply.i # End Source File
# Begin Source File
-SOURCE=.\TP_Reactor.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Trace.i
# End Source File
# Begin Source File
@@ -2479,14 +5446,6 @@ SOURCE=.\UPIPE_Stream.i SOURCE=.\WFMO_Reactor.i
# End Source File
-# Begin Source File
-
-SOURCE=.\WIN32_Asynch_IO.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\WIN32_Proactor.i
-# End Source File
# End Group
# Begin Group "Template Files"
@@ -2494,7 +5453,45 @@ SOURCE=.\WIN32_Proactor.i # Begin Source File
SOURCE=.\Acceptor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
@@ -2509,106 +5506,171 @@ SOURCE=.\Asynch_Acceptor.cpp # Begin Source File
SOURCE=.\Auto_Ptr.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
-SOURCE=.\Base_Pointer_T.cpp
+SOURCE=.\Connector.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-SOURCE=.\Cache_Map_Manager_T.cpp
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-SOURCE=.\Cached_Connect_Strategy_T.cpp
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-SOURCE=.\Caching_Strategies_T.cpp
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-SOURCE=.\Caching_Utility_T.cpp
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-SOURCE=.\Cleanup_Strategies_T.cpp
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-SOURCE=.\Connector.cpp
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-SOURCE=.\Containers_T.cpp
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Dump_T.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Free_List.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Functor_T.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-SOURCE=.\Future.cpp
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-SOURCE=.\Hash_Cache_Map_Manager_T.cpp
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-SOURCE=.\Hash_Map_Manager_T.cpp
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
-SOURCE=.\Hash_Map_With_Allocator_T.cpp
+SOURCE=.\Hash_Map_Manager_T.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\IOStream_T.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Local_Name_Space_T.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Malloc_T.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Managed_Object.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Map_Manager.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
@@ -2618,17 +5680,51 @@ SOURCE=.\Map_T.cpp # End Source File
# Begin Source File
-SOURCE=.\Message_Block_T.cpp
+SOURCE=.\Message_Queue_T.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-SOURCE=.\Message_Queue_T.cpp
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Module.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
@@ -2644,61 +5740,110 @@ SOURCE=.\RB_Tree.cpp # Begin Source File
SOURCE=.\Select_Reactor_T.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Singleton.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Strategies_T.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Stream.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Stream_Modules.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Synch_T.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Task_T.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Timer_Hash_T.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Timer_Heap_T.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Timer_List_T.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Timer_Queue_T.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Timer_Wheel_T.cpp
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
# End Source File
# End Group
diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp index f540b6f2e83..7932b4fed75 100644 --- a/ace/ace_lib.dsp +++ b/ace/ace_lib.dsp @@ -1,41 +1,39 @@ -# Microsoft Developer Studio Project File - Name="ACE LIB" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="ACE static library" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (ALPHA) Static Library" 0x0604
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=ACE LIB - Win32 PharLap ETS Debug
+CFG=ACE static library - Win32 Alpha Unicode Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "ace_lib.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "ace_lib.mak" CFG="ACE LIB - Win32 PharLap ETS Debug"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "ace_lib.mak" CFG="ACE static library - Win32 Alpha Unicode Debug"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "ACE LIB - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ACE LIB - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ACE LIB - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ACE LIB - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ACE LIB - Win32 Alpha Debug" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE "ACE LIB - Win32 Alpha Release" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE "ACE LIB - Win32 Alpha Unicode Debug" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE "ACE LIB - Win32 Alpha Unicode Release" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE "ACE LIB - Win32 PharLap ETS Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ACE LIB - Win32 PharLap ETS Release" (based on "Win32 (x86) Static Library")
-!MESSAGE
+!MESSAGE
+!MESSAGE "ACE static library - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "ACE static library - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "ACE static library - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "ACE static library - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "ACE static library - Win32 Alpha Debug" (based on "Win32 (ALPHA) Static Library")
+!MESSAGE "ACE static library - Win32 Alpha Release" (based on "Win32 (ALPHA) Static Library")
+!MESSAGE "ACE static library - Win32 Alpha Unicode Debug" (based on "Win32 (ALPHA) Static Library")
+!MESSAGE "ACE static library - Win32 Alpha Unicode Release" (based on "Win32 (ALPHA) Static Library")
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath "Desktop"
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -48,8 +46,8 @@ CFG=ACE LIB - Win32 PharLap ETS Debug # PROP Intermediate_Dir ".\LIB\Debug"
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c
+# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409
@@ -61,7 +59,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:".\libace.lib"
# ADD LIB32 /nologo /out:".\acesd.lib"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -74,8 +72,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir ".\LIB\Release"
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "..\STL" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /I "..\\" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409
@@ -87,7 +85,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:".\libace-r.lib"
# ADD LIB32 /nologo /out:".\aces.lib"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -100,8 +98,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir ".\LIB\Unicode_Debug"
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "_DEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\\" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "_DEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409
@@ -113,7 +111,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:".\libace.lib"
# ADD LIB32 /nologo /out:".\acesud.lib"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -126,8 +124,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir ".\LIB\Unicode_Release"
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "..\STL" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /I "..\\" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409
@@ -139,7 +137,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:".\libace-r.lib"
# ADD LIB32 /nologo /out:".\acesu.lib"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -152,8 +150,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Lib\Debug"
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /Gt0 /nologo /W3 /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c
-# ADD CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c
+# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy D "_DEBUG" D "_WINDOWS" FD I "..\\ /D " WIN32" c
+# ADD CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\" /D "_DEBUG" /D "_WINDOWS" /D "WIN32" /D ACE_HAS_DLL=0 /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o".\ace.bsc"
# ADD BSC32 /nologo /o".\ace.bsc"
@@ -161,7 +159,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:".\acesd.lib"
# ADD LIB32 /nologo /out:".\acesd.lib"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -174,8 +172,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Lib\Release"
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /Gt0 /nologo /Gt0 /W3 /GX /O1 /D "NDEBUG" /D "_WINDOWS" /FD /I "../" /D "WIN32" /c
-# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "../" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c
+# ADD BASE CPP /Gt0 nologo Gt0 W3 GX O1 D "NDEBUG" D "_WINDOWS" FD I "..\\ /D " WIN32" c
+# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "..\\" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o".\ace.bsc"
# ADD BSC32 /nologo /o".\ace.bsc"
@@ -183,7 +181,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:".\aces.lib"
# ADD LIB32 /nologo /out:".\aces.lib"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -196,8 +194,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Unicode_Debug"
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy D "_DEBUG" D "_WINDOWS" D "UNICODE" FD I "..\\ /D " WIN32" /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D" /D "_WINDOWS" /D "UNICODE" /D "WIN32" /D ACE_HAS_DLL=0 /FD /MTd /c
+# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy D "_DEBUG" D "_WINDOWS" D "UNICODE" FD I "..\\ /D " WIN32" c
+# ADD CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\" /D "_DEBUG" /D "_WINDOWS" /D "UNICODE" /D "WIN32" /D ACE_HAS_DLL=0 /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o".\ace.bsc"
# ADD BSC32 /nologo /o".\ace.bsc"
@@ -205,7 +203,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:".\acesud.lib"
# ADD LIB32 /nologo /out:".\acesud.lib"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -218,8 +216,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Unicode_Release"
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /Gt0 /nologo /Gt0 /W3 /GX /O1 /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /FD /I "../" /D "WIN32" /c
-# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "../" /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /D "WIN32" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c
+# ADD BASE CPP /Gt0 nologo Gt0 W3 GX O1 D "NDEBUG" D "_WINDOWS" D "UNICODE" FD I "..\\ /D " WIN32" c
+# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "..\\" /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /D "WIN32" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o".\ace.bsc"
# ADD BSC32 /nologo /o".\ace.bsc"
@@ -227,4455 +225,3744 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:".\acesu.lib"
# ADD LIB32 /nologo /out:".\acesu.lib"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ACE_LIB___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "ACE_LIB___Win32_PharLap_ETS_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ".\LIB\Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo /o".\ace.bsc"
-# ADD BSC32 /nologo /o".\ace.bsc"
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:".\acesd.lib"
-# ADD LIB32 /nologo /out:".\acesd.lib"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ACE_LIB___Win32_PharLap_ETS_Release"
-# PROP BASE Intermediate_Dir "ACE_LIB___Win32_PharLap_ETS_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ".\LIB\Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O1 /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MT /W3 /GX /O1 /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo /o".\ace.bsc"
-# ADD BSC32 /nologo /o".\ace.bsc"
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:".\aces.lib"
-# ADD LIB32 /nologo /out:".\aces.lib"
-
-!ENDIF
+!ENDIF
# Begin Target
-# Name "ACE LIB - Win32 Debug"
-# Name "ACE LIB - Win32 Release"
-# Name "ACE LIB - Win32 Unicode Debug"
-# Name "ACE LIB - Win32 Unicode Release"
-# Name "ACE LIB - Win32 Alpha Debug"
-# Name "ACE LIB - Win32 Alpha Release"
-# Name "ACE LIB - Win32 Alpha Unicode Debug"
-# Name "ACE LIB - Win32 Alpha Unicode Release"
-# Name "ACE LIB - Win32 PharLap ETS Debug"
-# Name "ACE LIB - Win32 PharLap ETS Release"
+# Name "ACE static library - Win32 Debug"
+# Name "ACE static library - Win32 Release"
+# Name "ACE static library - Win32 Unicode Debug"
+# Name "ACE static library - Win32 Unicode Release"
+# Name "ACE static library - Win32 Alpha Debug"
+# Name "ACE static library - Win32 Alpha Release"
+# Name "ACE static library - Win32 Alpha Unicode Debug"
+# Name "ACE static library - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
-# PROP Default_Filter ""
+# PROP Default_Filter "cpp"
# Begin Source File
SOURCE=.\ACE.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Activation_Queue.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Active_Map_Manager.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Addr.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Arg_Shifter.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\ARGV.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Asynch_IO.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Asynch_IO_Impl.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Basic_Types.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Based_Pointer_Repository.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\CDR_Stream.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Containers.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
+
+# PROP BASE Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+# PROP BASE Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+# PROP BASE Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+# PROP BASE Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\CORBA_Handler.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\CORBA_Ref.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Date_Time.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\DEV.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\DEV_Addr.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\DEV_Connector.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\DEV_IO.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Dirent.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\DLL.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Dump.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Dynamic.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Dynamic_Service.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Event_Handler.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Event_Handler_T.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\FIFO.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\FIFO_Recv.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\FIFO_Recv_Msg.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\FIFO_Send.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\FIFO_Send_Msg.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\FILE.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\FILE_Addr.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\FILE_Connector.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\FILE_IO.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Filecache.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Functor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ENDIF
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+# End Source File
+# Begin Source File
+
+SOURCE=.\Future.cpp
+
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ENDIF
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
+
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
+
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
+
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Get_Opt.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Handle_Set.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Hash_Map_Manager.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\High_Res_Timer.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\INET_Addr.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\IO_Cntl_Msg.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\IO_SAP.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\IOStream.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\IPC_SAP.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Local_Name_Space.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Local_Tokens.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Log_Msg.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Log_Record.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\LSOCK.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\LSOCK_Acceptor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\LSOCK_CODgram.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\LSOCK_Connector.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\LSOCK_Dgram.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\LSOCK_Stream.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Malloc.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Map.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Mem_Map.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Memory_Pool.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Message_Block.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Message_Queue.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+# PROP BASE Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+# PROP BASE Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
+
+# PROP BASE Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+# PROP BASE Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Method_Request.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Msg_WFMO_Reactor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Multiplexor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Name_Proxy.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Name_Request_Reply.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Name_Space.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Naming_Context.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\NT_Service.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Object_Manager.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Obstack.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\OS.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Pair.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Parse_Node.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Pipe.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Priority_Reactor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Proactor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Process.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Process_Manager.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Profile_Timer.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Reactor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Read_Buffer.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Registry.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Registry_Name_Space.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Remote_Name_Space.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Remote_Tokens.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Sched_Params.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Select_Reactor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Select_Reactor_Base.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Service_Config.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Service_Manager.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Service_Object.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Service_Repository.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Service_Types.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Shared_Memory.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Shared_Memory_MM.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Shared_Memory_SV.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Shared_Object.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Signal.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SOCK.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SOCK_Acceptor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SOCK_CODgram.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SOCK_Connector.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SOCK_Dgram.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SOCK_Dgram_Bcast.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SOCK_Dgram_Mcast.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SOCK_IO.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SOCK_Stream.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SPIPE.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SPIPE_Acceptor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SPIPE_Addr.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SPIPE_Connector.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SPIPE_Stream.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SString.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Stats.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Strategies.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SV_Message.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SV_Message_Queue.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SV_Semaphore_Complex.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SV_Semaphore_Simple.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\SV_Shared_Memory.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Svc_Conf_l.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Svc_Conf_y.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Svc_Handler.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Synch.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Synch_Options.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\System_Time.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Task.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Template_Instantiations.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Thread.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Thread_Manager.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Time_Request_Reply.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Timeprobe.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Timer_Hash.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Timer_Heap.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Timer_List.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Timer_Queue.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Timer_Queue_Adapters.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Timer_Wheel.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\TLI.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\TLI_Acceptor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\TLI_Connector.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\TLI_Stream.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Token.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Token_Collection.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Token_Invariants.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Token_Manager.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Token_Request_Reply.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\TP_Reactor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Trace.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\TTY_IO.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Typed_SV_Message.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Typed_SV_Message_Queue.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\UNIX_Addr.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\UPIPE_Acceptor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\UPIPE_Connector.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\UPIPE_Stream.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\WFMO_Reactor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\WIN32_Asynch_IO.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\WIN32_Proactor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\XtReactor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# End Group
# Begin Group "Header Files"
-# PROP Default_Filter ""
+# PROP Default_Filter "h"
# Begin Source File
SOURCE=.\Acceptor.h
@@ -4702,11 +3989,11 @@ SOURCE=.\Addr.h # End Source File
# Begin Source File
-SOURCE=.\Arg_Shifter.h
+SOURCE=.\ARGV.h
# End Source File
# Begin Source File
-SOURCE=.\ARGV.h
+SOURCE=.\Array.h
# End Source File
# Begin Source File
@@ -4730,50 +4017,10 @@ SOURCE=.\Basic_Types.h # End Source File
# Begin Source File
-SOURCE=.\Based_Pointer_Repository.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Base_Pointer_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Cache_Map_Manager_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Cached_Connect_Strategy_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Caching_Strategies_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Caching_Strategy_Utility_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDR_Stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Cleanup_Strategies_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=".\config-win32-borland.h"
-# End Source File
-# Begin Source File
-
SOURCE=".\config-win32-common.h"
# End Source File
# Begin Source File
-SOURCE=".\config-win32.h"
-# End Source File
-# Begin Source File
-
SOURCE=.\config.h
# End Source File
# Begin Source File
@@ -4786,10 +4033,6 @@ SOURCE=.\Containers.h # End Source File
# Begin Source File
-SOURCE=.\Containers_T.h
-# End Source File
-# Begin Source File
-
SOURCE=.\CORBA_Handler.h
# End Source File
# Begin Source File
@@ -4894,14 +4137,6 @@ SOURCE=.\Free_List.h # End Source File
# Begin Source File
-SOURCE=.\Functor.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Functor_T.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Future.h
# End Source File
# Begin Source File
@@ -4914,10 +4149,6 @@ SOURCE=.\Handle_Set.h # End Source File
# Begin Source File
-SOURCE=.\Hash_Cache_Map_Manager_T.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Hash_Map_Manager.h
# End Source File
# Begin Source File
@@ -4926,18 +4157,10 @@ SOURCE=.\Hash_Map_Manager_T.h # End Source File
# Begin Source File
-SOURCE=.\Hash_Map_With_Allocator_T.h
-# End Source File
-# Begin Source File
-
SOURCE=.\High_Res_Timer.h
# End Source File
# Begin Source File
-SOURCE=.\inc_user_config.h
-# End Source File
-# Begin Source File
-
SOURCE=.\INET_Addr.h
# End Source File
# Begin Source File
@@ -5014,18 +4237,10 @@ SOURCE=.\Malloc.h # End Source File
# Begin Source File
-SOURCE=.\Malloc_Base.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Malloc_T.h
# End Source File
# Begin Source File
-SOURCE=.\Managed_Object.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Map.h
# End Source File
# Begin Source File
@@ -5050,19 +4265,11 @@ SOURCE=.\Message_Block.h # End Source File
# Begin Source File
-SOURCE=.\Message_Block_T.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Message_Queue.h
# End Source File
# Begin Source File
-SOURCE=.\Message_Queue_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Method_Request.h
+SOURCE=.\Method_Object.h
# End Source File
# Begin Source File
@@ -5070,10 +4277,6 @@ SOURCE=.\Module.h # End Source File
# Begin Source File
-SOURCE=.\Msg_WFMO_Reactor.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Multiplexor.h
# End Source File
# Begin Source File
@@ -5150,18 +4353,10 @@ SOURCE=.\Profile_Timer.h # End Source File
# Begin Source File
-SOURCE=.\RB_Tree.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Reactor.h
# End Source File
# Begin Source File
-SOURCE=.\Reactor_Impl.h
-# End Source File
-# Begin Source File
-
SOURCE=.\ReactorEx.h
# End Source File
# Begin Source File
@@ -5190,10 +4385,6 @@ SOURCE=.\Sched_Params.h # End Source File
# Begin Source File
-SOURCE=.\Select_Reactor.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Select_Reactor_Base.h
# End Source File
# Begin Source File
@@ -5214,11 +4405,11 @@ SOURCE=.\Service_Object.h # End Source File
# Begin Source File
-SOURCE=.\Service_Repository.h
+SOURCE=.\Service_Record.h
# End Source File
# Begin Source File
-SOURCE=.\Service_Types.h
+SOURCE=.\Service_Repository.h
# End Source File
# Begin Source File
@@ -5306,10 +4497,6 @@ SOURCE=.\SString.h # End Source File
# Begin Source File
-SOURCE=.\Stats.h
-# End Source File
-# Begin Source File
-
SOURCE=.\stdcpp.h
# End Source File
# Begin Source File
@@ -5330,10 +4517,6 @@ SOURCE=.\Stream_Modules.h # End Source File
# Begin Source File
-SOURCE=.\streams.h
-# End Source File
-# Begin Source File
-
SOURCE=.\SV_Message.h
# End Source File
# Begin Source File
@@ -5406,10 +4589,6 @@ SOURCE=.\Time_Value.h # End Source File
# Begin Source File
-SOURCE=.\Timeprobe.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Timer_Hash.h
# End Source File
# Begin Source File
@@ -5438,10 +4617,6 @@ SOURCE=.\Timer_Queue.h # End Source File
# Begin Source File
-SOURCE=.\Timer_Queue_Adapters.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Timer_Queue_T.h
# End Source File
# Begin Source File
@@ -5490,10 +4665,6 @@ SOURCE=.\Token_Request_Reply.h # End Source File
# Begin Source File
-SOURCE=.\TP_Reactor.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Trace.h
# End Source File
# Begin Source File
@@ -5506,10 +4677,6 @@ SOURCE=.\Typed_SV_Message.h # End Source File
# Begin Source File
-SOURCE=.\Typed_SV_Message_Queue.h
-# End Source File
-# Begin Source File
-
SOURCE=.\UNIX_Addr.h
# End Source File
# Begin Source File
@@ -5530,14 +4697,6 @@ SOURCE=.\UPIPE_Stream.h # End Source File
# Begin Source File
-SOURCE=.\Version.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\WFMO_Reactor.h
-# End Source File
-# Begin Source File
-
SOURCE=.\WIN32_Asynch_IO.h
# End Source File
# Begin Source File
@@ -5555,7 +4714,7 @@ SOURCE=.\XtReactor.h # End Group
# Begin Group "Inline Files"
-# PROP Default_Filter ""
+# PROP Default_Filter "i"
# Begin Source File
SOURCE=.\Acceptor.i
@@ -5566,10 +4725,6 @@ SOURCE=.\ACE.i # End Source File
# Begin Source File
-SOURCE=.\Activation_Queue.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Active_Map_Manager.i
# End Source File
# Begin Source File
@@ -5610,30 +4765,6 @@ SOURCE=.\Basic_Types.i # End Source File
# Begin Source File
-SOURCE=.\Cache_Map_Manager_T.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Cached_Connect_Strategy_T.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Caching_Strategies_T.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Caching_Strategy_Utility_T.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDR_Stream.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Cleanup_Strategies_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Connector.i
# End Source File
# Begin Source File
@@ -5642,10 +4773,6 @@ SOURCE=.\Containers.i # End Source File
# Begin Source File
-SOURCE=.\Containers_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\CORBA_Handler.i
# End Source File
# Begin Source File
@@ -5726,14 +4853,6 @@ SOURCE=.\Free_List.i # End Source File
# Begin Source File
-SOURCE=.\Functor.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Functor_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Get_Opt.i
# End Source File
# Begin Source File
@@ -5742,10 +4861,6 @@ SOURCE=.\Handle_Set.i # End Source File
# Begin Source File
-SOURCE=.\Hash_Cache_Map_Manager_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Hash_Map_Manager.i
# End Source File
# Begin Source File
@@ -5754,10 +4869,6 @@ SOURCE=.\Hash_Map_Manager_T.i # End Source File
# Begin Source File
-SOURCE=.\Hash_Map_With_Allocator_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\High_Res_Timer.i
# End Source File
# Begin Source File
@@ -5818,10 +4929,6 @@ SOURCE=.\Malloc_T.i # End Source File
# Begin Source File
-SOURCE=.\Managed_Object.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Map.i
# End Source File
# Begin Source File
@@ -5846,26 +4953,14 @@ SOURCE=.\Message_Block.i # End Source File
# Begin Source File
-SOURCE=.\Message_Block_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Message_Queue.i
# End Source File
# Begin Source File
-SOURCE=.\Message_Queue_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Module.i
# End Source File
# Begin Source File
-SOURCE=.\Msg_WFMO_Reactor.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Multiplexor.i
# End Source File
# Begin Source File
@@ -5878,10 +4973,6 @@ SOURCE=.\Object_Manager.i # End Source File
# Begin Source File
-SOURCE=.\Obstack.i
-# End Source File
-# Begin Source File
-
SOURCE=.\OS.i
# End Source File
# Begin Source File
@@ -5922,10 +5013,6 @@ SOURCE=.\Profile_Timer.i # End Source File
# Begin Source File
-SOURCE=.\RB_Tree.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Reactor.i
# End Source File
# Begin Source File
@@ -5946,10 +5033,6 @@ SOURCE=.\Sched_Params.i # End Source File
# Begin Source File
-SOURCE=.\Select_Reactor.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Select_Reactor_Base.i
# End Source File
# Begin Source File
@@ -5970,11 +5053,11 @@ SOURCE=.\Service_Object.i # End Source File
# Begin Source File
-SOURCE=.\Service_Repository.i
+SOURCE=.\Service_Record.i
# End Source File
# Begin Source File
-SOURCE=.\Service_Types.i
+SOURCE=.\Service_Repository.i
# End Source File
# Begin Source File
@@ -6054,18 +5137,6 @@ SOURCE=.\SString.i # End Source File
# Begin Source File
-SOURCE=.\Stats.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Strategies.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Strategies_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Stream.i
# End Source File
# Begin Source File
@@ -6102,10 +5173,6 @@ SOURCE=.\Synch.i # End Source File
# Begin Source File
-SOURCE=.\Synch_Options.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Synch_T.i
# End Source File
# Begin Source File
@@ -6126,10 +5193,6 @@ SOURCE=.\Thread_Manager.i # End Source File
# Begin Source File
-SOURCE=.\Timer_Queue_Adapters.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Timer_Queue_T.i
# End Source File
# Begin Source File
@@ -6170,10 +5233,6 @@ SOURCE=.\Token_Request_Reply.i # End Source File
# Begin Source File
-SOURCE=.\TP_Reactor.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Trace.i
# End Source File
# Begin Source File
@@ -6202,14 +5261,6 @@ SOURCE=.\UPIPE_Stream.i # End Source File
# Begin Source File
-SOURCE=.\WFMO_Reactor.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\WIN32_Asynch_IO.i
-# End Source File
-# Begin Source File
-
SOURCE=.\WIN32_Proactor.i
# End Source File
# End Group
@@ -6220,2059 +5271,418 @@ SOURCE=.\WIN32_Proactor.i SOURCE=.\Acceptor.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Active_Map_Manager_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Asynch_Acceptor.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Auto_Ptr.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Base_Pointer_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Cache_Map_Manager_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
-SOURCE=.\Cached_Connect_Strategy_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
+SOURCE=.\Active_Map_Manager_T.cpp
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
-SOURCE=.\Caching_Strategies_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
+SOURCE=.\Asynch_Acceptor.cpp
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Caching_Utility_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
-SOURCE=.\Cleanup_Strategies_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
+SOURCE=.\Auto_Ptr.cpp
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Connector.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Containers_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Dump_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Free_List.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Functor_T.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Future.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Hash_Cache_Map_Manager_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Hash_Map_Manager_T.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ENDIF
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-# End Source File
-# Begin Source File
-
-SOURCE=.\Hash_Map_With_Allocator_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\IOStream_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Local_Name_Space_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Malloc_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Managed_Object.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
-# PROP Exclude_From_Build 1
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Map_Manager.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Map_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
-SOURCE=.\Message_Block_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
+SOURCE=.\Message_Queue_T.cpp
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Message_Queue_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Module.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Pair_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\RB_Tree.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Select_Reactor_T.cpp
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
+!IF "$(CFG)" == "ACE static library - Win32 Debug"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Release"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Debug"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Unicode Release"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Debug"
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Release"
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
+!ELSEIF "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
SOURCE=.\Singleton.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Strategies_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Stream.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Stream_Modules.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Synch_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Task_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Timer_Hash_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Timer_Heap_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Timer_List_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Timer_Queue_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\Timer_Wheel_T.cpp
-
-!IF "$(CFG)" == "ACE LIB - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"
-
# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
# End Group
# Begin Group "Documentation"
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h index c3b42d8a7eb..cac8478bca0 100644 --- a/ace/config-aix-4.x.h +++ b/ace/config-aix-4.x.h @@ -8,7 +8,7 @@ #ifndef ACE_CONFIG_H #define ACE_CONFIG_H -#if defined (__xlC__) || (__IBMCPP__) +#if defined (__xlC__) // AIX xlC compiler //******************************************************************** // @@ -19,14 +19,6 @@ // Keep an eye on this as the compiler and standards converge... # define ACE_LACKS_LINEBUFFERED_STREAMBUF -#if defined (__IBMCPP__) - #define ACE_TEMPLATES_REQUIRE_SOURCE -#endif /* __IBMCPP__ */ - -#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) -#undef WIFEXITED -#undef WEXITSTATUS -#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */ # define ACE_TEMPLATES_REQUIRE_PRAGMA @@ -200,25 +192,23 @@ // 4.3 and up has 1003.1c standard; 4.2 has draft 7 #if (ACE_AIX_MINOR_VERS >= 3) # define ACE_HAS_PTHREADS_STD -# define ACE_HAS_PTHREADS_UNIX98_EXT #else # define ACE_HAS_PTHREADS_DRAFT7 -# define ACE_LACKS_RWLOCK_T -# define ACE_LACKS_SETSCHED -# define ACE_LACKS_THREAD_STACK_ADDR -// If ACE doesn't compile due to the lack of these methods, please -// send email to ace-users@cs.wustl.edu reporting this. -// #define ACE_LACKS_CONDATTR_PSHARED -// #define ACE_LACKS_MUTEXATTR_PSHARED #endif /* ACE_AIX_MINOR_VERS >= 3 */ - #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS #define ACE_HAS_REENTRANT_FUNCTIONS #define ACE_HAS_SIGTHREADMASK #define ACE_HAS_SIGWAIT #define ACE_HAS_THREAD_SPECIFIC_STORAGE +// If ACE doesn't compile due to the lack of these methods, please +// send email to ace-users@cs.wustl.edu reporting this. +// #define ACE_LACKS_CONDATTR_PSHARED +// #define ACE_LACKS_MUTEXATTR_PSHARED +#define ACE_LACKS_RWLOCK_T +#define ACE_LACKS_SETSCHED #define ACE_LACKS_THREAD_PROCESS_SCOPING +#define ACE_LACKS_THREAD_STACK_ADDR // By default, tracing code is not compiled. To compile it in, cause // ACE_NTRACE to not be defined, and rebuild ACE. diff --git a/ace/config-cray.h b/ace/config-cray.h index 5ad6d571449..076c5394b41 100644 --- a/ace/config-cray.h +++ b/ace/config-cray.h @@ -24,7 +24,6 @@ _UNICOS (defined if running UNICOS or UNICOS/mk) Tested on UNICOS 10.0.0.2, UNICOS/mk 2.0.3.10 - Compiles on UNICOS 9.0.2.8, but some tests deadlock Contributed by Doug Anderson <doug@clark.net> */ @@ -64,22 +63,9 @@ #define ACE_HAS_PTHREADS -// UNICOS 10 and UNICOS/mk implement a small subset of POSIX Threads, -// but the prototypes follow the POSIX.1c-1995 definitions. Earlier -// UNICOS versions sport Draft 7 threads. - -#if _UNICOS > 9 -# define ACE_HAS_PTHREADS_STD -#else -# define ACE_HAS_PTHREADS_DRAFT7 -# define ACE_LACKS_THREAD_STACK_SIZE -# define ACE_LACKS_THREAD_STACK_ADDR - // UNICOS 9 doesn't have this, nor sched.h -# define SCHED_OTHER 0 -# define SCHED_FIFO 1 -# define SCHED_RR 2 -# define pthread_sigmask sigprocmask -#endif +// UNICOS implements a small subset of POSIX Threads, but the prototypes follow +// the POSIX.1c-1995 definitions +#define ACE_HAS_PTHREADS_STD #define ACE_HAS_THREAD_SPECIFIC_STORAGE diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h index 78f3c24c554..46de4084b34 100644 --- a/ace/config-g++-common.h +++ b/ace/config-g++-common.h @@ -16,11 +16,6 @@ # define ACE_HAS_STDCPP_STL_INCLUDES # define ACE_HAS_TEMPLATE_TYPEDEFS # define ACE_HAS_TYPENAME_KEYWORD -# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_USES_OLD_IOSTREAMS -// For some reason EGCS doesn't define this in its stdlib. -# define ACE_LACKS_AUTO_PTR # if __GNUC__ == 2 && __GNUC_MINOR__ >= 91 # define ACE_HAS_USING_KEYWORD diff --git a/ace/config-ghs-common.h b/ace/config-ghs-common.h index 9e49f971191..a9138e3fe97 100644 --- a/ace/config-ghs-common.h +++ b/ace/config-ghs-common.h @@ -17,7 +17,6 @@ # if defined (__STANDARD_CXX) // Green Hills 1.8.9, but not 1.8.8. # define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_LACKS_AUTO_PTR # define ACE_LACKS_CHAR_RIGHT_SHIFTS # define ACE_LACKS_UNBUFFERED_STREAMBUF # endif /* __STANDARD_CXX */ @@ -28,7 +27,6 @@ # define ACE_LACKS_LONGLONG_T # define ACE_LACKS_SIGNED_CHAR - #else /* ! ghs */ # error ace/config-ghs-common.h can only be used with Green Hills compilers! #endif /* ! ghs */ diff --git a/ace/config-hpux-10.x-hpc++.h b/ace/config-hpux-10.x-hpc++.h index c399a403fa1..f43e757d156 100644 --- a/ace/config-hpux-10.x-hpc++.h +++ b/ace/config-hpux-10.x-hpc++.h @@ -59,8 +59,7 @@ // Compiler enforces the "One Definition Rule" # define ACE_HAS_ONE_DEFINITION_RULE -// Compiler enforces need for 'template<>" when specializing template -// classes. +// Compiler enforces need for 'template<>" when specializing templates # define ACE_HAS_STD_TEMPLATE_SPECIALIZATION // Compiler enforces proper use of 'typename' diff --git a/ace/config-hpux-11.x-hpc++.h b/ace/config-hpux-11.x-hpc++.h index 1913e68c707..f050590a332 100644 --- a/ace/config-hpux-11.x-hpc++.h +++ b/ace/config-hpux-11.x-hpc++.h @@ -70,9 +70,6 @@ // Compiler supports template specialization. # define ACE_HAS_TEMPLATE_SPECIALIZATION -// ... and uses the template<> syntax -# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION -# define ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION // Preprocessor needs some help with data types # if defined (__LP64__) diff --git a/ace/config-hpux11.h b/ace/config-hpux11.h index 3c9e36e8b0f..8f21f48bb87 100644 --- a/ace/config-hpux11.h +++ b/ace/config-hpux11.h @@ -154,6 +154,11 @@ // Platform has XPG4 wide character support #define ACE_HAS_XPG4_MULTIBYTE_CHAR +// Platform lacks readers/writer locks. +// For now... it does have pthread read/write locks but the code in OS.{h i} +// doesn't know how to do pthread read/write locks. +#define ACE_LACKS_RWLOCK_T + // Platform lacks a typedef for timespec_t, but has struct timespec #define ACE_LACKS_TIMESPEC_T @@ -210,30 +215,17 @@ #define ACE_HAS_TLI_PROTOTYPES // HP-UX 11.00 (at least at initial releases) has some busted macro defs #define ACE_HAS_BROKEN_XTI_MACROS -// HP-UX 11 conforms to the XPG4 spec, which ACE calls broken for the -// errmsg not being const... -#define ACE_HAS_BROKEN_T_ERROR ///////////////////////////////////////////////////////////////////////// // // Threads information. // // Use of threads is controlled by the 'threads' argument to make. See -// include/makeinclude/platform_hpux_aCC.GNU for details. If it's not set, -// the default is to enable it, since kernel threads are always available -// on HP-UX 11, as opposed to 10.x where it was optional software. +// include/makeinclude/platform_hpux_aCC.GNU for details. // //////////////////////////////////////////////////////////////////////// #if defined (ACE_HAS_THREADS) -# if (ACE_HAS_THREADS == 0) -# undef ACE_HAS_THREADS -# endif /* ACE_HAS_THREADS == 0 */ -#else -# define ACE_HAS_THREADS -#endif /* ACE_HAS_THREADS */ - -#if defined (ACE_HAS_THREADS) # if !defined (ACE_MT_SAFE) # define ACE_MT_SAFE 1 @@ -241,7 +233,6 @@ # define ACE_HAS_PTHREADS # define ACE_HAS_PTHREADS_STD -# define ACE_HAS_PTHREADS_UNIX98_EXT # define ACE_HAS_THREAD_SPECIFIC_STORAGE #endif /* ACE_HAS_THREADS */ diff --git a/ace/config-irix5.3-g++.h b/ace/config-irix5.3-g++.h index c99ba376c7b..133b862d2c9 100644 --- a/ace/config-irix5.3-g++.h +++ b/ace/config-irix5.3-g++.h @@ -17,7 +17,6 @@ #define ACE_HAS_STRING_CLASS #define IRIX5 #define ACE_HAS_SIGWAIT -#define ACE_HAS_DIRENT // Optimize ACE_Handle_Set for select(). #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT diff --git a/ace/config-linuxppcr5.h b/ace/config-linuxppcr5.h index a4d90ef7f41..3d8e2680dc2 100644 --- a/ace/config-linuxppcr5.h +++ b/ace/config-linuxppcr5.h @@ -12,6 +12,6 @@ #define ACE_HAS_SVR4_DYNAMIC_LINKING #define ACE_HAS_AUTOMATIC_INIT_FINI -// Not needed with glibc 2.1.1: #define __USE_XOPEN +#define __USE_XOPEN #endif /* ACE_CONFIG_H */ diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h index 6fd9462d8a3..825c914c20b 100644 --- a/ace/config-lynxos.h +++ b/ace/config-lynxos.h @@ -1,7 +1,7 @@ // $Id$ -// The following configuration file is designed to work for LynxOS, -// version 2.5.0 and later, using the GNU g++ compiler. +// The following configuration file is designed to work for LynxOS 2.50 +// platforms using the GNU g++ compiler (version 2.7.2 or later). #ifndef ACE_CONFIG_H #define ACE_CONFIG_H @@ -26,126 +26,189 @@ #endif /* __GNUG__ */ #if defined (__x86__) - // PowerPC libraries don't seem to have alloca (), so only use with x86. + // PowerPC libraries don't seem to have alloca () # define ACE_HAS_ALLOCA # define ACE_HAS_ALLOCA_H # define ACE_HAS_PENTIUM #elif defined (__powerpc__) - // fork ()/exec () don't seem to work well on PPC. -# define ACE_LACKS_FORK // This doesn't work on LynxOS 3.0.0, because it resets the TimeBaseRegister. // # define ACE_HAS_POWERPC_TIMER #endif /* __x86__ || __powerpc__ */ +// System include files are not in sys/, this gets rid of warning. +#define __NO_INCLUDE_WARN__ + +// Maximum compensation (10 ms) for early return from timed ::select (). +#if !defined (ACE_TIMER_SKEW) +# define ACE_TIMER_SKEW 10 * 1000 +#endif /* ACE_TIMER_SKEW */ + +#define ACE_LACKS_GETOPT_PROTO +#define ACE_HAS_SHM_OPEN +// LynxOS 2.5.0 does not support MAP_PRIVATE, so map it to MAP_SHARED +#define ACE_MAP_PRIVATE ACE_MAP_SHARED +#define ACE_HAS_STDARG_THR_DEST + +// Platform supports System V IPC (most versions of UNIX, but not Win32) +#define ACE_HAS_SYSV_IPC + +#define ACE_HAS_LYNXOS_SIGNALS + +#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS + +// Platform supports recvmsg and sendmsg. +#define ACE_HAS_MSG + #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG + +// Denotes that GNU has cstring.h as standard, which redefines memchr() +#define ACE_HAS_GNU_CSTRING_H + +// Compiler/platform correctly calls init()/fini() for shared libraries. #define ACE_HAS_AUTOMATIC_INIT_FINI -#define ACE_HAS_BROKEN_READV -#define ACE_HAS_BROKEN_SETRLIMIT -#define ACE_HAS_BROKEN_WRITEV -#define ACE_HAS_CLOCK_GETTIME + +// Platform supports POSIX O_NONBLOCK semantics. +#define ACE_HAS_POSIX_NONBLOCK + +// Compiler/platform has correctly prototyped header files. #define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_DIRENT -#define ACE_HAS_GETRUSAGE -#define ACE_HAS_GNU_CSTRING_H -#define ACE_HAS_GPERF -#define ACE_HAS_IP_MULTICAST -#define ACE_HAS_LYNXOS_SIGNALS -#define ACE_HAS_MSG + +// ACE_HAS_CLOCK_GETTIME requires linking with -lposix4. +#define ACE_HAS_CLOCK_GETTIME + +// Platform passes timezone into gettimeofday call +#define ACE_HAS_TIMEZONE_GETTIMEOFDAY + +// Platform does not have const anything +#define ACE_LACKS_CONST_TIMESPEC_PTR #define ACE_HAS_NONCONST_GETBY #define ACE_HAS_NONCONST_SELECT_TIMEVAL +#define ACE_HAS_BROKEN_WRITEV +#define ACE_HAS_BROKEN_READV +#define ACE_HAS_BROKEN_SETRLIMIT +#define ACE_LACKS_SOME_POSIX_PROTOTYPES + +// Platform supports IP multicast +#define ACE_HAS_IP_MULTICAST + +// Platform has union semun defined +#define ACE_HAS_SEMUN + +// Platform contains <poll.h>. #define ACE_HAS_POLL -#define ACE_HAS_POSIX_NONBLOCK +#define ACE_POLL_IS_BROKEN + +// Platform supports POSIX timers via timestruc_t. #define ACE_HAS_POSIX_TIME -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -#define ACE_HAS_SEMUN -#define ACE_HAS_SHM_OPEN -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIGWAIT +#define ACE_LACKS_TIMESPEC_T + +#define ACE_LACKS_STRCASECMP +#define ACE_LACKS_MADVISE +#define ACE_LACKS_GETPGID + +// in man pages, but no prototype in headers +#define ACE_LACKS_MKTEMP + +// Platform supports the rusage struct. +#define ACE_HAS_GETRUSAGE + +// 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_LACKS_SIGINFO_H +#define ACE_LACKS_UCONTEXT_H +//#define ACE_HAS_UCONTEXT_T +//Platform has si_addr, but its not supported currently +#define ACE_LACKS_SI_ADDR + +// Compiler/platform provides the sockio.h file. #define ACE_HAS_SOCKIO_H + +// Compiler supports the ssize_t typedef. #define ACE_HAS_SSIZE_T -#define ACE_HAS_STDARG_THR_DEST -#define ACE_HAS_STRBUF_T + +// Platform supports STREAMS. #define ACE_HAS_STREAMS + +// Compiler/platform supports strerror (). #define ACE_HAS_STRERROR -#define ACE_HAS_SYSV_IPC + +// Compiler/platform supports struct strbuf. +#define ACE_HAS_STRBUF_T + +// Compiler/platform supports sys_siglist array. #define ACE_HAS_SYS_SIGLIST -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY -#define ACE_LACKS_CONST_TIMESPEC_PTR -#define ACE_LACKS_GETHOSTENT -#define ACE_LACKS_GETOPT_PROTO -#define ACE_LACKS_GETPGID -#define ACE_LACKS_MADVISE -#define ACE_LACKS_MKTEMP -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SIGINFO_H -#define ACE_LACKS_SI_ADDR -#define ACE_LACKS_SOME_POSIX_PROTOTYPES -#define ACE_LACKS_STRCASECMP -#define ACE_LACKS_TIMESPEC_T -#define ACE_LACKS_UCONTEXT_H -#define ACE_MALLOC_ALIGN 8 -// LynxOS, through 3.0.0, does not support MAP_PRIVATE, so map it to -// MAP_SHARED. -#define ACE_MAP_PRIVATE ACE_MAP_SHARED -#define ACE_PAGE_SIZE 4096 -#define ACE_POLL_IS_BROKEN +/* Turn off the following seven defines if you want to disable threading. */ // Compile using multi-thread libraries. #if !defined (ACE_MT_SAFE) # define ACE_MT_SAFE 1 # define _REENTRANT #endif -#if ACE_MT_SAFE == 1 - // Platform supports threads. -# define ACE_HAS_PTHREADS -# define ACE_HAS_PTHREADS_DRAFT4 -# define ACE_HAS_THREADS -# define ACE_HAS_THREAD_SPECIFIC_STORAGE - // Without TSS emulation, you'll only have 3 native TSS keys, on - // LynxOS 3.0.0/ppc. -# define ACE_HAS_TSS_EMULATION -# define ACE_LACKS_NULL_PTHREAD_STATUS -# define ACE_LACKS_SETDETACH -# define ACE_LACKS_THREAD_PROCESS_SCOPING -# define ACE_LACKS_THREAD_STACK_ADDR - // This gets around Lynx broken macro calls resulting in "::0" -# define _POSIX_THREADS_CALLS -#endif /* ACE_MT_SAFE */ +// Platform supports threads. +#define ACE_HAS_THREADS -#define ACE_HAS_AIO_CALLS -#define ACE_POSIX_AIOCB_PROACTOR -// AIOCB Proactor works on Lynx. But it is not -// multi-threaded. -// Lynx OS 3.0.0 lacks POSIX call <pthread_sigmask>. So,we cannot use -// SIG Proactor also, with multiple threads. So, let us use the AIOCB -// Proactor. Once <pthreadd_sigmask> is available on Lynx, we can turn -// on SIG Proactor for this platform. -// #define ACE_POSIX_SIG_PROACTOR +#define ACE_HAS_PTHREADS +#define ACE_HAS_PTHREADS_DRAFT4 +#define ACE_LACKS_NULL_PTHREAD_STATUS +#define ACE_LACKS_THREAD_STACK_ADDR +#define ACE_LACKS_SETDETACH +#define ACE_LACKS_THREAD_PROCESS_SCOPING +// This gets around Lynx broken macro calls resulting in "::0" +#define _POSIX_THREADS_CALLS -// Maximum compensation (10 ms) for early return from timed ::select (). -#if !defined (ACE_TIMER_SKEW) -# define ACE_TIMER_SKEW 10 * 1000 -#endif /* ACE_TIMER_SKEW */ +// Platform lack reader/writer locks +#define ACE_LACKS_RWLOCK_T + +// Compiler/platform has thread-specific storage +#define ACE_HAS_THREAD_SPECIFIC_STORAGE + +// Without TSS emulation, you'll only have 3 native TSS keys, on +// LynxOS 3.0.0/ppc. +#define ACE_HAS_TSS_EMULATION + +#define ACE_HAS_GPERF + +#define ACE_HAS_SIGWAIT +#define ACE_HAS_DIRENT // Turns off the tracing feature. #if !defined (ACE_NTRACE) # define ACE_NTRACE 1 #endif /* ACE_NTRACE */ +#define ACE_MALLOC_ALIGN 8 + +// Defines the page size of the system. +#define ACE_PAGE_SIZE 4096 + +#define ACE_LACKS_GETHOSTENT + // 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 */ -// System include files are not in sys/, this gets rid of warning. -#define __NO_INCLUDE_WARN__ - extern "C" { int getopt (int, char *const *, const char *); int putenv (const char *); } +// = Proactor stuff + +// Aio works on lynx +#define ACE_HAS_AIO_CALLS + +// AIOCB Proactor works on Lynx. But it is not +// multi-threaded. +// Lynx OS 3.0.0 lacks POSIX call <pthread_sigmask>. So,we cannot use +// SIG Proactor also, with multiple threads. So, let us use the AIOCB +// Proactor. Once <pthreadd_sigmask> is available on Lynx, we can turn +// on SIG Proactor for this platform. +// #define ACE_POSIX_SIG_PROACTOR +#define ACE_POSIX_AIOCB_PROACTOR #endif /* ACE_CONFIG_H */ diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h index 32a1ed81b1a..d6dcc6f1207 100644 --- a/ace/config-osf1-4.0.h +++ b/ace/config-osf1-4.0.h @@ -60,39 +60,9 @@ # define ACE_HAS_TEMPLATE_SPECIALIZATION # define ACE_HAS_TEMPLATE_TYPEDEFS # define ACE_HAS_TYPENAME_KEYWORD - -// 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) -// 835: unreferenced_function_param (unrfunprm) -// 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 - -# 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 defined (DIGITAL_UNIX) && DIGITAL_UNIX == 5 - // variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced -# pragma message disable declbutnotref -# endif /* DIGITAL_UNIX 5 */ - -# if defined (ACE_HAS_EXCEPTIONS) -# pragma message disable unrfunprm -# endif /* ACE_HAS_EXCEPTIONS */ - # else /* __DECCXX_VER < 60090010 */ # define ACE_LACKS_PRAGMA_ONCE # endif /* __DECCXX_VER < 60090010 */ - #elif defined (__rational__) # define ACE_HAS_REENTRANT_FUNCTIONS # define ACE_LACKS_LINEBUFFERED_STREAMBUF diff --git a/ace/config-pharlap.h b/ace/config-pharlap.h deleted file mode 100644 index f1e1c883457..00000000000 --- a/ace/config-pharlap.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// This configuration file is for use with the PharLap Realtime ETS Kernel. -// It has been tested with PharLap TNT Embedded ToolSuite version 9.1. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H - -#define ACE_HAS_PHARLAP -// Some features are only available with the Realtime edition of ETS. -// Assume that if using ACE, the realtime version is also being used, but -// allow it to be turned off as well. -#ifndef ACE_HAS_PHARLAP_RT -# define ACE_HAS_PHARLAP_RT -#else -# if (ACE_HAS_PHARLAP_RT == 0) -# undef ACE_HAS_PHARLAP_RT -# endif -#endif - -// Fortunately, PharLap ETS offers much of the Win32 API. But it's still on -// WinNT 3.5, Winsock 1.1 -#define ACE_HAS_WINNT4 0 -#define ACE_HAS_WINSOCK2 0 - -// The TSS implementation doesn't pass muster on the TSS_Test, but it works -// well with ACE's TSS emulation. -#define ACE_HAS_TSS_EMULATION - -#define ACE_LACKS_MMAP -#define ACE_LACKS_MPROTECT -#define ACE_LACKS_MSYNC - -// There's no host table, by default. So using "localhost" won't work. -// If your system does have the ability to use "localhost" and you want to, -// define it before including this file. -#if !defined (ACE_LOCALHOST) -# define ACE_LOCALHOST "127.0.0.1" -#endif /* ACE_LOCALHOST */ - -// Don't know how to get the page size at execution time. This is most likely -// the correct value. -#define ACE_PAGE_SIZE 4096 - -// Maximum compensation (10 ms) for early return from timed ::select (). -#if !defined (ACE_TIMER_SKEW) -# define ACE_TIMER_SKEW 10 * 1000 -#endif /* ACE_TIMER_SKEW */ - -// Let the config-win32.h file do its thing -#undef ACE_CONFIG_H -#include /**/ "ace/config-win32.h" -#include /**/ <embkern.h> -#if defined (ACE_HAS_PHARLAP_RT) -# include /**/ <embtcpip.h> -#endif /* ACE_HAS_PHARLAP_RT */ - -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-psos-tm.h b/ace/config-psos-tm.h index c84025bfb64..f1570285a57 100644 --- a/ace/config-psos-tm.h +++ b/ace/config-psos-tm.h @@ -30,9 +30,7 @@ // #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE #define ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_DONT_INCLUDE_ACE_SIGNAL_H -# include <signal.h> //JINLU -#undef ACE_DONT_INCLUDE_ACE_SIGNAL_H +#include <signal.h> //JINLU #include <pna.h> //JINLU #define NSIG _NSIG //_NSIG = 32 defined in signal.h JINLU #define TCP_NODELAY 1 // this will be defined later by pSOS/TM diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h index 1c5766e8a39..ca9cbe52d16 100644 --- a/ace/config-sunos5.5.h +++ b/ace/config-sunos5.5.h @@ -27,8 +27,6 @@ to work around problems with automatic template instantiation. */ # define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION # define ACE_HAS_STD_TEMPLATE_SPECIALIZATION -// Note that SunC++ 5.0 doesn't yet appear to support -// ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION... # define ACE_TEMPLATES_REQUIRE_SOURCE # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 diff --git a/ace/config-sunos5.6-sunc++-4.x.h b/ace/config-sunos5.6-sunc++-4.x.h deleted file mode 100644 index 7f63838fb78..00000000000 --- a/ace/config-sunos5.6-sunc++-4.x.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for SunOS 5.6 -// platforms using the SunC++ 4.x compiler. - -#if !defined (ACE_CONFIG_H) - -// ACE_CONFIG_H is defined by the following #included header. - -// At this point, there's no difference between our SunOS 5.5 and 5.6 -// configurations. -#if defined (__SUNPRO_CC) -# include "ace/config-sunos5.5-sunc++-4.x.h" -#elif defined (__GNUG__) -# include "ace/config-sunos5.5-g++.h" -#else /* ! __SUNPRO_CC__ && ! __GNUG__ */ -# error unsupported compiler in ace/config-sunos5.6.h -#endif /* ! __SUNPRO_CC__ && ! __GNUG__ */ - -// Additional SunOS 5.6 capabilities . . . -#define ACE_HAS_AIO_CALLS -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos5.7.h b/ace/config-sunos5.7.h index a2aad889217..362f5291195 100644 --- a/ace/config-sunos5.7.h +++ b/ace/config-sunos5.7.h @@ -26,17 +26,11 @@ typedef unsigned long t_uscalar_t; typedef void *timeout_id_t; # endif /* __GNUC__ <= 2 && __GNUC_MINOR__ < 8 */ +#endif /* __GNUG__ */ -#elif defined (ghs) - // SunOS 5.7's /usr/include/sys/procfs_isa.h needs uint64_t, - // but /usr/include/sys/int_types.h doesn't #define it because - // _NO_LONGLONG is # -# undef ACE_HAS_PROC_FS -# undef ACE_HAS_PRUSAGE_T - -#elif defined (__KCC) +#if defined (__KCC) typedef unsigned long long uint64_t; -#endif /* __GNUG__ || ghs || __KCC */ +#endif // Solaris 5.7 supports SCHED_FIFO and SCHED_RR, as well as SCHED_OTHER. #undef ACE_HAS_ONLY_SCHED_OTHER diff --git a/ace/config-visualage.h b/ace/config-visualage.h deleted file mode 100644 index 8fa97f7fa89..00000000000 --- a/ace/config-visualage.h +++ /dev/null @@ -1,13 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// This configuration file automatically includes the proper -// configurations for IBM's VisualAge C++ compiler on Win32 and AIX. - -#ifdef __TOS_WIN__ - #include "ace/config-win32.h" -#elif __TOS_AIX__ - #include "ace/config-aix-4.x.h" -#else - #include "PLATFORM NOT SPECIFIED" -#endif /* __TOS_WIN__ */ diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h index 1a66ffab953..641585f1470 100644 --- a/ace/config-vxworks5.x.h +++ b/ace/config-vxworks5.x.h @@ -151,7 +151,6 @@ #define ACE_HAS_STRDUP_EMULATION #define ACE_LACKS_MKFIFO -#define ACE_HAS_BROKEN_ACCEPT_ADDR // By default, don't include RCS Id strings in object code. #if !defined (ACE_USE_RCSID) diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h index cfd8881314f..d007b40fd2b 100644 --- a/ace/config-win32-borland.h +++ b/ace/config-win32-borland.h @@ -2,152 +2,63 @@ // $Id$ // The following configuration file contains the defines -// common to all Borland compilers. Do not include this file directly -// -- just include config-win32-common.h, which includes this file. +// common to all Borland compilers. #ifndef ACE_WIN32_BORLAND_H #define ACE_WIN32_BORLAND_H -# if defined(__BORLANDC__) +#if defined(__BORLANDC__) -# if defined (ACE_LACKS_MODE_MASKS) -# undef ACE_LACKS_MODE_MASKS -# endif /* defined (ACE_LACKS_MODE_MASKS) */ -# define ACE_LACKS_MODE_MASKS 1 +#if defined (ACE_LACKS_MODE_MASKS) +#undef ACE_LACKS_MODE_MASKS +#endif /* defined (ACE_LACKS_MODE_MASKS) */ -# if defined (ACE_HAS_USER_MODE_MASKS) -# undef ACE_HAS_USER_MODE_MASKS -# endif /* defined (ACE_HAS_USER_MODE_MASKS) */ -# define ACE_HAS_USER_MODE_MASKS 1 - -# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -# undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -# endif /* defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) */ -# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION 1 - -# if defined (ACE_EXPORT_NESTED_CLASSES) -# undef ACE_EXPORT_NESTED_CLASSES -# endif /* defined (ACE_EXPORT_NESTED_CLASSES) */ -# define ACE_EXPORT_NESTED_CLASSES - -# if defined (ACE_HAS_NONCONST_SELECT_TIMEVAL) -# undef ACE_HAS_NONCONST_SELECT_TIMEVAL -# endif /* defined (ACE_HAS_NONCONST_SELECT_TIMEVAL) */ -# define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 - -# if (__BORLANDC__ < 0x540) -# if defined (ACE_HAS_BROKEN_SAP_ANY) -# undef ACE_HAS_BROKEN_SAP_ANY -# endif /* defined (ACE_HAS_BROKEN_SAP_ANY) */ -# define ACE_HAS_BROKEN_SAP_ANY 1 -# endif /* (__BORLANDC__ < 0x540) */ +#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION +#define ACE_HAS_BROKEN_SAP_ANY /* - * Definitions common to Borland C++ 5.x, Borland C++ Builder 3.x, - * and C++ Builder 4.x. + * Definitions common to Borland C++ 5.x and Borland C++ Builder 3.x. */ -# if (__BORLANDC__ >= 0x500) -# if !defined (ACE_HAS_WINCE) -# if defined (ACE_HAS_SIG_ATOMIC_T) -# undef ACE_HAS_SIG_ATOMIC_T -# endif /* defined (ACE_HAS_SIG_ATOMIC_T) */ -# define ACE_HAS_SIG_ATOMIC_T 1 -# endif /* !defined (ACE_HAS_WINCE) */ - -# if defined (ACE_HAS_TYPENAME_KEYWORD) -# undef ACE_HAS_TYPENAME_KEYWORD -# endif /* defined (ACE_HAS_TYPENAME_KEYWORD) */ -# define ACE_HAS_TYPENAME_KEYWORD 1 - -# if defined (ACE_SIZEOF_LONG_DOUBLE) -# undef ACE_SIZEOF_LONG_DOUBLE -# endif /* defined (ACE_SIZEOF_LONG_DOUBLE) */ -# define ACE_SIZEOF_LONG_DOUBLE 10 - -# if defined (ACE_HAS_USING_KEYWORD) -# undef ACE_HAS_USING_KEYWORD -# endif /* defined (ACE_HAS_USING_KEYWORD) */ -# define ACE_HAS_USING_KEYWORD 1 - -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) -# undef ACE_HAS_STANDARD_CPP_LIBRARY -# endif /* defined (ACE_HAS_STANDARD_CPP_LIBRARY) */ -# define ACE_HAS_STANDARD_CPP_LIBRARY 0 -# endif /* (__BORLANDC__ >= 0x500) */ +#if (__BORLANDC__ >= 0x500) + #if !defined (ACE_HAS_WINCE) + #define ACE_HAS_SIG_ATOMIC_T + #endif /* !defined (ACE_HAS_WINCE) */ -/* - * Definitions for Borland C++ Builder 3.x and C++ Builder 4.x. - */ -# if (__BORLANDC__ >= 0x0530) + #define ACE_HAS_TYPENAME_KEYWORD -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) -# undef ACE_HAS_STANDARD_CPP_LIBRARY -# endif /* defined (ACE_HAS_STANDARD_CPP_LIBRARY) */ -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 + #ifdef ACE_SIZEOF_LONG_DOUBLE + #undef ACE_SIZEOF_LONG_DOUBLE + #endif + #define ACE_SIZEOF_LONG_DOUBLE 10 -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# undef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB -# endif /* defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) */ -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 + #ifdef ACE_HAS_USING_KEYWORD + #undef ACE_HAS_USING_KEYWORD + #endif + #define ACE_HAS_USING_KEYWORD 1 -# endif /* (__BORLANDC__ >= 0x0530) */ + #ifdef ACE_HAS_STANDARD_CPP_LIBRARY + #undef ACE_HAS_STANDARD_CPP_LIBRARY + #endif + #define ACE_HAS_STANDARD_CPP_LIBRARY 0 +#endif /* (__BORLANDC__ >= 0x500) */ /* - * Definitions only for Borland C++ Builder 4.x + * Definitions only for Borland C++ Builder 3.x. */ -# if (__BORLANDC__ == 0x0540) - -// Compiler enforces need for 'template<>" when specializing template -// class methods. -# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION - -// Compiler enforces need for 'template<>" when specializing template -// class methods. -# define ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION +#if (__BORLANDC__ >= 0x0530) -# if defined (ACE_HAS_TEMPLATE_TYPEDEFS) -# undef ACE_HAS_TEMPLATE_TYPEDEFS -# endif /* defined (ACE_HAS_TEMPLATE_TYPEDEFS) */ -# define ACE_HAS_TEMPLATE_TYPEDEFS 1 + #ifdef ACE_HAS_STANDARD_CPP_LIBRARY + #undef ACE_HAS_STANDARD_CPP_LIBRARY + #endif + #define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# if defined (ACE_HAS_STRING_CLASS) -# undef ACE_HAS_STRING_CLASS -# endif /* defined (ACE_HAS_STRING_CLASS) */ -# define ACE_HAS_STRING_CLASS 1 + #ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB + #undef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB + #endif + #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# if defined (ACE_HAS_STDCPP_STL_INCLUDES) -# undef ACE_HAS_STDCPP_STL_INCLUDES -# endif /* defined (ACE_HAS_STDCPP_STL_INCLUDES) */ -# define ACE_HAS_STDCPP_STL_INCLUDES 1 +#endif /* (__BORLANDC__ >= 0x0530) */ - /* ACE IOStreams don't work with standard C++ iostreams (yet) */ -# if defined (ACE_LACKS_ACE_IOSTREAM) -# undef ACE_LACKS_ACE_IOSTREAM -# endif /* defined (ACE_LACKS_ACE_IOSTREAM) */ -# define ACE_LACKS_ACE_IOSTREAM 1 - - /* previously defined for MSVC */ -# if defined (ACE_HAS_WCHAR_TYPEDEFS_USHORT) -# undef ACE_HAS_WCHAR_TYPEDEFS_USHORT -# endif /* defined (ACE_HAS_WCHAR_TYPEDEFS_USHORT) */ - - /* previously defined for MSVC */ -# if defined (ACE_HAS_BROKEN_NAMESPACES) -# undef ACE_HAS_BROKEN_NAMESPACES -# endif /* defined (ACE_HAS_BROKEN_NAMESPACES) */ - - /* previously defined for MSVC */ -# if defined (ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR) -# undef ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR -# endif /* defined (ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR) */ - - /* need to ensure these are included before <iomanip> */ -# include <time.h> -# include <stdlib.h> - -# endif /* (__BORLANDC__ == 0x0540) */ - -# endif /* defined(__BORLANDC__) */ +#endif /* defined(__BORLANDC__) */ #endif /* ACE_WIN32_BORLAND_H */ - diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index 907f7ec5b44..ddfc4a3b77b 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -153,7 +153,7 @@ typedef unsigned __int64 ACE_UINT64; // Platform support linebuffered streaming is broken #define ACE_LACKS_LINEBUFFERED_STREAMBUF -// Template specialization is supported. +// Template specialization is supported #define ACE_HAS_TEMPLATE_SPECIALIZATION // No system support for replacing any previous mappings. @@ -256,7 +256,7 @@ typedef unsigned __int64 ACE_UINT64; #endif /* _MT */ #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ -#if !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__) +#if !defined (ACE_HAS_WINCE) #if defined(ACE_HAS_DLL) && (ACE_HAS_DLL != 0) #if !defined(_DLL) // *** DO NOT *** DO NOT *** defeat this error message @@ -264,7 +264,7 @@ typedef unsigned __int64 ACE_UINT64; #error You must link against (Debug) Multithreaded DLL run-time libraries. #endif /* !_DLL */ #endif /* ACE_HAS_DLL && ACE_HAS_DLL != 0 */ -#endif /* !ACE_HAS_WINCE && !__BORLANDC__ */ +#endif /* ACE_HAS_WINCE */ // We are using STL's min and max (in algobase.h). Therefore the // macros in window.h are extra @@ -272,10 +272,6 @@ typedef unsigned __int64 ACE_UINT64; #define NOMINMAX #endif /* NOMINMAX */ -#if defined (ACE_HAS_MOSTLY_UNICODE_APIS) && !defined (UNICODE) -#defined UNICODE -#endif /* ACE_HAS_MOSTLY_UNICODE_APIS && !UNICODE */ - #if defined (_UNICODE) #if !defined (UNICODE) #define UNICODE /* UNICODE is used by Windows headers */ @@ -395,10 +391,7 @@ typedef unsigned __int64 ACE_UINT64; #include /**/ <winsock.h> #endif /* _WINSOCKAPI */ - // PharLap ETS has its own winsock lib, so don't grab the one - // supplied with the OS. - #if defined (_MSC_VER) && !defined (UNDER_CE) && \ - !defined (ACE_HAS_PHARLAP) + #if defined (_MSC_VER) && !defined (UNDER_CE) #pragma comment(lib, "wsock32.lib") #endif /* _MSC_VER */ @@ -431,10 +424,9 @@ typedef unsigned __int64 ACE_UINT64; // At least for Win32 - MSVC compiler (ver. 5) #define ACE_UINT64_FORMAT_SPECIFIER "%I64u" -// Borland C++ compiler. -#include /**/ <ace/config-win32-borland.h> - -// IBM VisualAge C++ compiler. -#include /**/ <ace/config-win32-visualage.h> +/* + * Borland Compilers. + */ +#include <ace/config-win32-borland.h> #endif /* ACE_WIN32_COMMON_H */ diff --git a/ace/config-win32-visualage.h b/ace/config-win32-visualage.h deleted file mode 100644 index 19062e09040..00000000000 --- a/ace/config-win32-visualage.h +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -//Created for IBMCPP -// The following configuration file contains the defines -// common to all VisualAge compilers. - -#ifndef ACE_WIN32_VISUALAGECPP_H -#define ACE_WIN32_VISUALAGECPP_H - -#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) - -//These need to be defined for VisualAgeC++ -#define ERRMAX 256 /* Needed for following define */ -#define ACE_LACKS_SYS_NERR /* Needed for sys_nerr in Log_Msg.cpp */ -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES /* For signal handling */ -#define ACE_HAS_TYPENAME_KEYWORD -#define ACE_LACKS_MKTEMP -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define NSIG 23 /* Maximum no. of signals + 1 */ - -#undef WIFEXITED -#undef WEXITSTATUS - -#define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_BROKEN_NESTED_TEMPLATES - -#define _O_RDWR O_RDWR -#define _O_WRONLY O_WRONLY -#define _O_RDONLY O_RDONLY -#define _O_APPEND O_APPEND -#define _O_BINARY O_BINARY -#define _O_TEXT O_TEXT - -#define _endthreadex _endthread -#define _beginthreadex _beginthread - -//Error codes that are in MS Visual C++ -#define EFAULT 99 /* Error code (should be in errno.h) */ -#define ENODEV 19 -#define EPIPE 32 -#define ENAMETOOLONG 38 - - -#if defined (ACE_HAS_UNICODE) - #undef ACE_HAS_UNICODE -#endif /* ACE_HAS_UNICODE */ - -#if defined (ACE_HAS_WCHAR_TYPEDEFS_USHORT) - #undef ACE_HAS_WCHAR_TYPEDEFS_USHORT -#endif /* ACE_HAS_WCHAR_TYPEDEFS_USHORT */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -// #undef ACE_TEMPLATES_REQUIRE_SOURCE -#endif - -#endif /* defined(__IBMCPP__) */ -#endif /* ACE_WIN32_VISUALAGECPP_H */ |