diff options
Diffstat (limited to 'ACE/examples')
193 files changed, 253 insertions, 253 deletions
diff --git a/ACE/examples/ASX/CCM_App/CCM_App.cpp b/ACE/examples/ASX/CCM_App/CCM_App.cpp index 53cca03e460..85f73c75b60 100644 --- a/ACE/examples/ASX/CCM_App/CCM_App.cpp +++ b/ACE/examples/ASX/CCM_App/CCM_App.cpp @@ -7,7 +7,7 @@ #include "ace/Module.h" #include "ace/svc_export.h" -ACE_RCSID(CCM_App, CCM_App, "$Id$") + typedef ACE_Task<ACE_SYNCH> MT_Task; typedef ACE_Stream<ACE_SYNCH> MT_Stream; diff --git a/ACE/examples/ASX/CCM_App/SC_Client.cpp b/ACE/examples/ASX/CCM_App/SC_Client.cpp index fbd4439784a..6e28de8dfac 100644 --- a/ACE/examples/ASX/CCM_App/SC_Client.cpp +++ b/ACE/examples/ASX/CCM_App/SC_Client.cpp @@ -2,7 +2,7 @@ #include "ace/ACE.h" -ACE_RCSID(CCM_App, SC_Client, "$Id$") + // Pretty simple, eh? ;-) diff --git a/ACE/examples/ASX/CCM_App/SC_Server.cpp b/ACE/examples/ASX/CCM_App/SC_Server.cpp index e133c3db614..305e3ebd015 100644 --- a/ACE/examples/ASX/CCM_App/SC_Server.cpp +++ b/ACE/examples/ASX/CCM_App/SC_Server.cpp @@ -10,7 +10,7 @@ #include "ace/Reactor.h" #include "ace/Sig_Adapter.h" -ACE_RCSID(CCM_App, SC_Server, "$Id$") + class Event_Handler : public ACE_Event_Handler { @@ -82,6 +82,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Perform logging service until we receive SIGINT. ACE_Reactor::instance ()->run_reactor_event_loop (); - handler.remove_stdin_handler (ACE_Reactor::instance (),ACE_Thread_Manager::instance ()); + handler.remove_stdin_handler (ACE_Reactor::instance (),ACE_Thread_Manager::instance ()); return 0; } diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp index cb448367e61..4e29339d716 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp @@ -7,7 +7,7 @@ #include "Consumer_Router.h" #include "Options.h" -ACE_RCSID(Event_Server, Consumer_Router, "$Id$") + Consumer_Router::Consumer_Router (Peer_Router_Context *prc) : Peer_Router (prc) diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp index a70961a9eaa..b89e70f35f0 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp @@ -5,7 +5,7 @@ #include "Options.h" #include "Event_Analyzer.h" -ACE_RCSID(Event_Server, Event_Analyzer, "$Id$") + int Event_Analyzer::open (void *) @@ -77,6 +77,6 @@ Event_Analyzer::info (ACE_TCHAR **strp, size_t length) const return -1; else ACE_OS::strncpy (*strp, mod_name, length); - + return ACE_Utils::truncate_cast<int> (ACE_OS::strlen (mod_name)); } diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp index 16ce65aa5fd..10844f8ae07 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp @@ -10,7 +10,7 @@ #include "Options.h" -ACE_RCSID(Event_Server, Options, "$Id$") + /* static */ Options *Options::instance_ = 0; diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp index 9fced9b8059..8798d82b8ed 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp @@ -8,7 +8,7 @@ #include "Options.h" #include "Peer_Router.h" -ACE_RCSID(Event_Server, Peer_Router, "$Id$") + // Send the <ACE_Message_Block> to all the peers. Note that in a // "real" application this logic would most likely be more selective, diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp index 0e0f45e386f..8504239a615 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp @@ -7,7 +7,7 @@ #include "Supplier_Router.h" #include "Options.h" -ACE_RCSID(Event_Server, Supplier_Router, "$Id$") + // Handle outgoing messages in a separate thread. diff --git a/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp b/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp index 69927a7a59b..c9c4ac359ca 100644 --- a/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp +++ b/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp @@ -10,7 +10,7 @@ #include "ace/OS_NS_time.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Message_Queue, bounded_buffer, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp index a9c528bf409..40c804637c9 100644 --- a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp +++ b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp @@ -19,7 +19,7 @@ #include "ace/Task.h" #include "ace/Truncate.h" -ACE_RCSID(Message_Queue, buffer_stream, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/ASX/Message_Queue/priority_buffer.cpp b/ACE/examples/ASX/Message_Queue/priority_buffer.cpp index 5305e20f132..6d3cefa4b82 100644 --- a/ACE/examples/ASX/Message_Queue/priority_buffer.cpp +++ b/ACE/examples/ASX/Message_Queue/priority_buffer.cpp @@ -12,7 +12,7 @@ #include "ace/Service_Config.h" #include "ace/Truncate.h" -ACE_RCSID(Message_Queue, priority_buffer, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp index 4b0b25ed8fb..daa1e4b04ea 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp @@ -6,7 +6,7 @@ #include "Consumer_Router.h" #include "Options.h" -ACE_RCSID(UPIPE_Event_Server, Consumer_Router, "$Id$") + #if defined (ACE_HAS_THREADS) @@ -133,7 +133,7 @@ Consumer_Router::info (ACE_TCHAR **strp, size_t length) const return -1; else ACE_OS::strncpy (*strp, module_name, length); - + return ACE_Utils::truncate_cast<int> (ACE_OS::strlen (module_name)); } diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp index 915f9e79cce..bd84adc3052 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp @@ -4,7 +4,7 @@ #include "ace/Truncate.h" #include "Event_Analyzer.h" -ACE_RCSID(UPIPE_Event_Server, Event_Analyzer, "$Id$") + #if defined (ACE_HAS_THREADS) @@ -28,7 +28,7 @@ Event_Analyzer::control (ACE_Message_Block *mb) switch (cmd = ioc->cmd ()) { - case ACE_IO_Cntl_Msg::SET_LWM: + case ACE_IO_Cntl_Msg::SET_LWM: case ACE_IO_Cntl_Msg::SET_HWM: this->water_marks (cmd, *(size_t *) mb->cont ()->rd_ptr ()); break; @@ -38,7 +38,7 @@ Event_Analyzer::control (ACE_Message_Block *mb) return 0; } -int +int Event_Analyzer::put (ACE_Message_Block *mb, ACE_Time_Value *) { if (mb->msg_type () == ACE_Message_Block::MB_IOCTL) @@ -47,28 +47,28 @@ Event_Analyzer::put (ACE_Message_Block *mb, ACE_Time_Value *) return this->put_next (mb); } -int +int Event_Analyzer::init (int, ACE_TCHAR *[]) { return 0; } -int +int Event_Analyzer::fini (void) { return 0; } -int +int Event_Analyzer::info (ACE_TCHAR **strp, size_t length) const { const ACE_TCHAR *mod_name = this->name (); - + if (*strp == 0 && (*strp = ACE_OS::strdup (mod_name)) == 0) return -1; else ACE_OS::strncpy (*strp, mod_name, length); - + return ACE_Utils::truncate_cast<int> (ACE_OS::strlen (mod_name)); } diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp index 0f7cccb2365..aa143b24b30 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp @@ -10,7 +10,7 @@ #include "Options.h" -ACE_RCSID(UPIPE_Event_Server, Options, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp index 65eb65a5609..174dbe83f2e 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp @@ -10,7 +10,7 @@ #include "Peer_Router.h" #include "Options.h" -ACE_RCSID(UPIPE_Event_Server, Peer_Router, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp index 50ddc87998a..6030c97a4c3 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp @@ -6,7 +6,7 @@ #include "Options.h" #include "Supplier_Router.h" -ACE_RCSID(UPIPE_Event_Server, Supplier_Router, "$Id$") + #if defined (ACE_HAS_THREADS) @@ -132,7 +132,7 @@ Supplier_Router::info (ACE_TCHAR **strp, size_t length) const return -1; else ACE_OS::strncpy (*strp, module_name, length); - + return ACE_Utils::truncate_cast<int> (ACE_OS::strlen (module_name)); } diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp index dde26ed3ef9..bc6984be3ef 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp @@ -26,7 +26,7 @@ #include "ace/OS_NS_sys_time.h" #include "BPR_Drivers.h" -ACE_RCSID(Bounded_Packet_Relay, BPR_Drivers, "$Id$") + // Constructor. diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp index 6e597dfb9e5..bc80ec0ea8f 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp @@ -32,7 +32,7 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Bounded_Packet_Relay, BPR_Drivers_T, "$Id$") + // Constructor. diff --git a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp index aefff24925c..2b8d2495175 100644 --- a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp +++ b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp @@ -34,7 +34,7 @@ typedef Thread_Bounded_Packet_Relay_Driver::MYCOMMAND DRIVER_CMD; typedef ACE_Command_Callback<BPR_Handler_Base, BPR_Handler_Base::ACTION> HANDLER_CMD; typedef ACE_Command_Callback<Send_Handler, Send_Handler::ACTION> SEND_HANDLER_CMD; -ACE_RCSID(Bounded_Packet_Relay, Thread_Bounded_Packet_Relay, "$Id$") + // Constructor. diff --git a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp index 10b1e8310f2..88e04f5750d 100644 --- a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp +++ b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp @@ -11,7 +11,7 @@ #include "ace/Signal.h" #include "SPIPE-acceptor.h" -ACE_RCSID(blocking, SPIPE_acceptor, "$Id$") + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) diff --git a/ACE/examples/Connection/blocking/SPIPE-connector.cpp b/ACE/examples/Connection/blocking/SPIPE-connector.cpp index bd7c0691b52..b75f51d47e4 100644 --- a/ACE/examples/Connection/blocking/SPIPE-connector.cpp +++ b/ACE/examples/Connection/blocking/SPIPE-connector.cpp @@ -12,7 +12,7 @@ #include "ace/OS_NS_unistd.h" #include "SPIPE-connector.h" -ACE_RCSID(blocking, SPIPE_connector, "$Id$") + Peer_Handler::Peer_Handler (int iterations) : iterations_ (iterations) @@ -32,7 +32,7 @@ Peer_Handler::open (void *) if (iterations_ == 0) { this->display_menu (); - + if (ACE_Event_Handler::register_stdin_handler ( this, ACE_Reactor::instance (), @@ -98,7 +98,7 @@ Peer_Handler::handle_input (ACE_HANDLE) ACE_TEXT ("close")), 1); } - + return -1; } else @@ -106,7 +106,7 @@ Peer_Handler::handle_input (ACE_HANDLE) this->display_menu (); } } - + return 0; } diff --git a/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp b/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp index 023680411c1..98a30edcded 100644 --- a/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp +++ b/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp @@ -4,7 +4,7 @@ #include "SPIPE-acceptor.h" -ACE_RCSID(blocking, test_spipe_acceptor, "$Id$") + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) diff --git a/ACE/examples/Connection/blocking/test_spipe_connector.cpp b/ACE/examples/Connection/blocking/test_spipe_connector.cpp index e10cc023a6f..eb3e0824330 100644 --- a/ACE/examples/Connection/blocking/test_spipe_connector.cpp +++ b/ACE/examples/Connection/blocking/test_spipe_connector.cpp @@ -4,11 +4,11 @@ #include "SPIPE-connector.h" -ACE_RCSID(blocking, test_spipe_connector, "$Id$") -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ + +int +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) +{ // Perform Service_Config initializations ACE_Service_Config daemon (argv[0]); @@ -16,6 +16,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (peer_connector.init (argc, argv) == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("init")), -1); - + return peer_connector.svc (); -} +} diff --git a/ACE/examples/Connection/misc/Connection_Handler.cpp b/ACE/examples/Connection/misc/Connection_Handler.cpp index 23b8457b0ac..402e6a90696 100644 --- a/ACE/examples/Connection/misc/Connection_Handler.cpp +++ b/ACE/examples/Connection/misc/Connection_Handler.cpp @@ -24,7 +24,7 @@ #include "Connection_Handler.h" -ACE_RCSID(misc, Connection_Handler, "$Id$") + int Connection_Handler::open (void *) diff --git a/ACE/examples/Connection/misc/test_upipe.cpp b/ACE/examples/Connection/misc/test_upipe.cpp index bc786f428fe..5a1b893ae4f 100644 --- a/ACE/examples/Connection/misc/test_upipe.cpp +++ b/ACE/examples/Connection/misc/test_upipe.cpp @@ -11,7 +11,7 @@ #include "ace/Connector.h" #include "ace/UPIPE_Addr.h" -ACE_RCSID(misc, test_upipe, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp b/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp index 12c80c1d939..608745d721f 100644 --- a/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp +++ b/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp @@ -9,7 +9,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/Signal.h" -ACE_RCSID(non_blocking, CPP_acceptor, "$Id$") + #define PR_ST_1 ACE_PEER_STREAM_1 #define PR_ST_2 ACE_PEER_STREAM_2 diff --git a/ACE/examples/Connection/non_blocking/CPP-connector.cpp b/ACE/examples/Connection/non_blocking/CPP-connector.cpp index 94ac62fc28f..a856a88f8af 100644 --- a/ACE/examples/Connection/non_blocking/CPP-connector.cpp +++ b/ACE/examples/Connection/non_blocking/CPP-connector.cpp @@ -8,7 +8,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/Signal.h" -ACE_RCSID(non_blocking, CPP_connector, "$Id$") + #define PR_ST_1 ACE_PEER_STREAM_1 #define PR_ST_2 ACE_PEER_STREAM_2 diff --git a/ACE/examples/Connection/non_blocking/test_lsock_connector.cpp b/ACE/examples/Connection/non_blocking/test_lsock_connector.cpp index 486fda797e8..dd40b518e25 100644 --- a/ACE/examples/Connection/non_blocking/test_lsock_connector.cpp +++ b/ACE/examples/Connection/non_blocking/test_lsock_connector.cpp @@ -19,7 +19,7 @@ ACE_TMAIN (int, ACE_TCHAR *argv[]) #include "ace/UNIX_Addr.h" #include "CPP-connector.h" -ACE_RCSID(non_blocking, test_lsock_connector, "$Id$") + typedef Peer_Handler<ACE_LSOCK_STREAM> PEER_HANDLER; typedef IPC_Client<PEER_HANDLER, ACE_LSOCK_CONNECTOR> IPC_CLIENT; diff --git a/ACE/examples/Connection/non_blocking/test_sock_connector.cpp b/ACE/examples/Connection/non_blocking/test_sock_connector.cpp index 66d53e1f0b2..707bd3474c1 100644 --- a/ACE/examples/Connection/non_blocking/test_sock_connector.cpp +++ b/ACE/examples/Connection/non_blocking/test_sock_connector.cpp @@ -6,7 +6,7 @@ #include "ace/WFMO_Reactor.h" #include "CPP-connector.h" -ACE_RCSID(non_blocking, test_sock_connector, "$Id$") + typedef Peer_Handler<ACE_SOCK_STREAM> PEER_HANDLER; typedef IPC_Client<PEER_HANDLER, ACE_SOCK_CONNECTOR> IPC_CLIENT; diff --git a/ACE/examples/Connection/non_blocking/test_spipe_connector.cpp b/ACE/examples/Connection/non_blocking/test_spipe_connector.cpp index fd5641f482d..0709a7cfc04 100644 --- a/ACE/examples/Connection/non_blocking/test_spipe_connector.cpp +++ b/ACE/examples/Connection/non_blocking/test_spipe_connector.cpp @@ -6,7 +6,7 @@ #include "ace/SPIPE_Addr.h" #include "CPP-connector.h" -ACE_RCSID(non_blocking, test_spipe_connector, "$Id$") + #if !defined (ACE_WIN32) typedef Peer_Handler<ACE_SPIPE_STREAM> PEER_HANDLER; diff --git a/ACE/examples/Connection/non_blocking/test_tli_connector.cpp b/ACE/examples/Connection/non_blocking/test_tli_connector.cpp index 0f1a2bd6064..b6b32996cd9 100644 --- a/ACE/examples/Connection/non_blocking/test_tli_connector.cpp +++ b/ACE/examples/Connection/non_blocking/test_tli_connector.cpp @@ -6,7 +6,7 @@ #include "ace/INET_Addr.h" #include "CPP-connector.h" -ACE_RCSID(non_blocking, test_tli_connector, "$Id$") + #if defined (ACE_HAS_TLI) diff --git a/ACE/examples/DLL/test_dll.cpp b/ACE/examples/DLL/test_dll.cpp index 2831592a0ce..fab812ecdac 100644 --- a/ACE/examples/DLL/test_dll.cpp +++ b/ACE/examples/DLL/test_dll.cpp @@ -8,7 +8,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Log_Msg.h" -ACE_RCSID(DLL, test_dll, "$Id$") + typedef Magazine* (*Magazine_Creator) (void); diff --git a/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp b/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp index 9d847d843e4..9faed9fbd4f 100644 --- a/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp +++ b/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp @@ -6,7 +6,7 @@ #include "ace/High_Res_Timer.h" #include "ace/Log_Msg.h" -ACE_RCSID(ATM_SAP, CPP_client, "$Id$") + #if defined (ACE_HAS_ATM) diff --git a/ACE/examples/IPC_SAP/ATM_SAP/CPP-server.cpp b/ACE/examples/IPC_SAP/ATM_SAP/CPP-server.cpp index 81082fea0ef..81c02bb3bd5 100644 --- a/ACE/examples/IPC_SAP/ATM_SAP/CPP-server.cpp +++ b/ACE/examples/IPC_SAP/ATM_SAP/CPP-server.cpp @@ -6,7 +6,7 @@ #include "ace/High_Res_Timer.h" #include "ace/Log_Msg.h" -ACE_RCSID(ATM_SAP, CPP_ATM_server, "$Id$") + #if defined (ACE_HAS_ATM) // ACE_ATM Server diff --git a/ACE/examples/IPC_SAP/DEV_SAP/reader/reader.cpp b/ACE/examples/IPC_SAP/DEV_SAP/reader/reader.cpp index 60bfa446c2f..d3658c424e4 100644 --- a/ACE/examples/IPC_SAP/DEV_SAP/reader/reader.cpp +++ b/ACE/examples/IPC_SAP/DEV_SAP/reader/reader.cpp @@ -4,7 +4,7 @@ #include "ace/DEV_Connector.h" #include "ace/TTY_IO.h" -ACE_RCSID(reader, reader, "$Id$") + int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { @@ -50,7 +50,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) 1); // Read till character 'q'. - for (char readback = 'x'; readback != 'q'; ) + for (char readback = 'x'; readback != 'q'; ) { ssize_t bytes_read = read_dev.recv ((void *) &readback, 1); diff --git a/ACE/examples/IPC_SAP/DEV_SAP/writer/writer.cpp b/ACE/examples/IPC_SAP/DEV_SAP/writer/writer.cpp index 965bd40f500..f011530843f 100644 --- a/ACE/examples/IPC_SAP/DEV_SAP/writer/writer.cpp +++ b/ACE/examples/IPC_SAP/DEV_SAP/writer/writer.cpp @@ -4,7 +4,7 @@ #include "ace/TTY_IO.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(writer, writer, "$Id$") + int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp index 408ac3af4e1..00e982cfa19 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp +++ b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp @@ -7,7 +7,7 @@ #include "ace/OS_NS_time.h" #include "ace/OS_NS_string.h" -ACE_RCSID(FIFO_SAP, FIFO_Msg_client, "$Id$") + #if defined (ACE_HAS_STREAM_PIPES) diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp index de1ace338ff..e268f67eed7 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp +++ b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp @@ -8,7 +8,7 @@ #include "ace/OS_NS_stropts.h" #include "ace/OS_main.h" -ACE_RCSID(FIFO_SAP, FIFO_Msg_server, "$Id$") + #if defined (ACE_HAS_STREAM_PIPES) diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp index 3ca4859e638..f2d5e3bcb82 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp +++ b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp @@ -7,7 +7,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_main.h" -ACE_RCSID(FIFO_SAP, FIFO_client, "$Id$") + int ACE_TMAIN (int, ACE_TCHAR *[]) diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp index 4cd32c03449..a30763bd7d6 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp +++ b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp @@ -6,7 +6,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_main.h" -ACE_RCSID(FIFO_SAP, FIFO_server, "$Id$") + int ACE_TMAIN (int, ACE_TCHAR *[]) diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp index b23def7de34..771997b0cf5 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp +++ b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp @@ -14,7 +14,7 @@ #include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_fcntl.h" -ACE_RCSID(FIFO_SAP, FIFO_test, "$Id$") + #define PERMS 0666 #define EXEC_NAME "more" diff --git a/ACE/examples/IPC_SAP/FILE_SAP/client.cpp b/ACE/examples/IPC_SAP/FILE_SAP/client.cpp index 1bab666057e..ee224beab5f 100644 --- a/ACE/examples/IPC_SAP/FILE_SAP/client.cpp +++ b/ACE/examples/IPC_SAP/FILE_SAP/client.cpp @@ -8,7 +8,7 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(FILE_SAP, client, "$Id$") + int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp index 9db1e0f2d8f..bd6926cd182 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp @@ -9,7 +9,7 @@ #include "ace/OS_NS_netdb.h" #include "ace/Default_Constants.h" -ACE_RCSID(SOCK_SAP, C_inclient, "$Id$") + /* BSD socket client */ diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp index f42dcc82dd1..8effbcf4d96 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp @@ -10,7 +10,7 @@ #include "ace/OS_NS_errno.h" #include "ace/Default_Constants.h" -ACE_RCSID(SOCK_SAP, C_inserver, "$Id$") + /* BSD socket server. */ diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp index 675c86de5e7..dc77a267b17 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp @@ -20,7 +20,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_main.h" -ACE_RCSID(SOCK_SAP, CPP_inclient, "$Id$") + Options::Options (void) : host_ (ACE_DEFAULT_SERVER_HOST), @@ -69,7 +69,7 @@ Options::init (void) // Copy the length into the beginning of the message. ACE_UINT32 length = ACE_NTOHL (ACE_Utils::truncate_cast<ACE_UINT32> (this->message_len_)); - + ACE_OS::memcpy ((void *) this->message_buf_, (void *) &length, sizeof length); diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp index fe0d49d4ce4..6108e378e70 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp @@ -15,7 +15,7 @@ #include "CPP-inserver-fancy.h" -ACE_RCSID(SOCK_SAP, CPP_inserver_fancy, "$Id$") + // Forward declaration. class Handler; diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp index a281d2e380d..049d9fd4978 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp @@ -13,7 +13,7 @@ #include "ace/OS_NS_poll.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(SOCK_SAP, CPP_inserver_poll, "$Id$") + #if defined (ACE_HAS_POLL) diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp index b39d33940fa..2fb30695bbc 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp @@ -13,7 +13,7 @@ #include "ace/OS_NS_sys_select.h" #include "ace/OS_main.h" -ACE_RCSID(SOCK_SAP, CPP_inserver, "$Id$") + // Are we running verbosely? static int verbose = 0; diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp index 3d297f116c0..39c38b1bb03 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp @@ -15,7 +15,7 @@ #include "ace/High_Res_Timer.h" -ACE_RCSID(SOCK_SAP, CPP_inclient, "$Id$") + static int run_client (void) diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp index 4ef76e51b38..d3cce8aac52 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp @@ -10,7 +10,7 @@ #include "ace/Handle_Set.h" #include "ace/Profile_Timer.h" -ACE_RCSID(SOCK_SAP, CPP_inserver, "$Id$") + static int run_event_loop (u_short port) diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp index b9075c683bf..371fbf2d618 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp @@ -8,7 +8,7 @@ #include "ace/OS_main.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(SOCK_SAP, CPP_unclient, "$Id$") + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) int diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp index cddfe787d92..8eb411674f5 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp @@ -9,7 +9,7 @@ #include "ace/OS_main.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(SOCK_SAP, CPP_unserver, "$Id$") + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp index 80c614ca987..5bfe29e205f 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp @@ -6,7 +6,7 @@ #include "ace/Log_Msg.h" #include "ace/OS_main.h" -ACE_RCSID(SOCK_SAP, FD_unclient, "$Id$") + #if defined (ACE_HAS_MSG) && !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) // ACE_LSOCK Client. diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp index b629b9f0dd8..b6476292a09 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp @@ -10,7 +10,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdlib.h" -ACE_RCSID(SOCK_SAP, FD_unserver, "$Id$") + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp index 5b7cb381939..c03c1a7e896 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp @@ -9,7 +9,7 @@ #include "ace/OS_NS_stdlib.h" #include "ace/OS_Memory.h" -ACE_RCSID(SPIPE_SAP, NPClient, "$Id$") + #if defined (ACE_WIN32) #define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\") ACE_TEXT (X) diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp index 2c5a4dfd7c5..b13e9d76462 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp @@ -6,7 +6,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(SPIPE_SAP, NPServer, "$Id$") + #if defined (ACE_WIN32) #define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\") ACE_TEXT (X) diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/client.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/client.cpp index ad0ee029dbd..5f66a37d91e 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/client.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/client.cpp @@ -7,7 +7,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" -ACE_RCSID(SPIPE_SAP, client, "$Id$") + #if defined (ACE_HAS_STREAM_PIPES) diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp index e73533bef44..7eb68d9f57f 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp @@ -8,7 +8,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/Time_Value.h" -ACE_RCSID(SPIPE_SAP, consumer_msg, "$Id$") + #if defined (ACE_HAS_STREAM_PIPES) diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp index d477c52c389..3c0c88dd624 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp @@ -8,7 +8,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/Time_Value.h" -ACE_RCSID(SPIPE_SAP, consumer_read, "$Id$") + #if defined (ACE_HAS_STREAM_PIPES) diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp index 051190c1f0d..ff717c23f80 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp @@ -10,7 +10,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/Time_Value.h" -ACE_RCSID(SPIPE_SAP, producer_msg, "$Id$") + #if defined (ACE_HAS_STREAM_PIPES) diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp index f04f7961818..f950f8cbbc7 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp @@ -7,7 +7,7 @@ #include "ace/OS_NS_stdlib.h" -ACE_RCSID(SPIPE_SAP, producer_read, "$Id$") + #if defined (ACE_HAS_STREAM_PIPES) diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/server.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/server.cpp index bc582f177eb..a568b14e94f 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/server.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/server.cpp @@ -8,7 +8,7 @@ #include "ace/OS_NS_poll.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(SPIPE_SAP, server, "$Id$") + #if defined (ACE_HAS_STREAM_PIPES) diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp index 2f7f5ef1461..f05804781b0 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp @@ -19,7 +19,7 @@ #include "SSL-client.h" -ACE_RCSID(SSL_SAP, SSL_client, "$Id$") + Options::Options (void) : host_ (ACE_DEFAULT_SERVER_HOST), @@ -63,7 +63,7 @@ Options::init (void) // Copy the length into the beginning of the message. ACE_UINT32 length = ntohl (ACE_Utils::truncate_cast<u_long> (this->message_len_)); - + ACE_OS::memcpy ((void *) this->message_buf_, (void *) &length, sizeof length); diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp index 6be3ce47b9e..bfaed70ea9b 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp @@ -10,7 +10,7 @@ #include "ace/SSL/SSL_SOCK_Acceptor.h" -ACE_RCSID(SSL_SAP, SSL_server_simple, "$Id$") + // Are we running verbosely? static int verbose = 1; diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp index d0c512ea554..f5962e266c8 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp @@ -12,7 +12,7 @@ #include "ace/SSL/SSL_SOCK_Acceptor.h" -ACE_RCSID(SSL_SAP, SSL_server, "$Id$") + // Are we running verbosely? static int verbose = 0; diff --git a/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp b/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp index bfd464b2c1f..6445d12e6e7 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp @@ -5,7 +5,7 @@ #include "ace/ATM_Addr.h" #include "ace/Log_Msg.h" -ACE_RCSID(TLI_SAP, CPP_ATM_client, "$Id$") + #if defined (ACE_HAS_FORE_ATM_XTI) diff --git a/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp b/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp index b3ac025d945..8d9ee5f7816 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp @@ -4,7 +4,7 @@ #include "ace/ATM_Addr.h" #include "ace/Log_Msg.h" -ACE_RCSID(TLI_SAP, CPP_ATM_server, "$Id$") + #if defined (ACE_HAS_FORE_ATM_XTI) // ACE_TLI Server diff --git a/ACE/examples/IPC_SAP/TLI_SAP/CPP-client.cpp b/ACE/examples/IPC_SAP/TLI_SAP/CPP-client.cpp index 9cd5ba35453..dd45a2d2e84 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/CPP-client.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/CPP-client.cpp @@ -7,7 +7,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/Time_Value.h" -ACE_RCSID(TLI_SAP, CPP_client, "$Id$") + #if defined (ACE_HAS_TLI) diff --git a/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp b/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp index d1b1e4d4a88..6d96933a6eb 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(TLI_SAP, CPP_server, "$Id$") + #if defined (ACE_HAS_TLI) // ACE_TLI Server diff --git a/ACE/examples/IPC_SAP/TLI_SAP/db-server.cpp b/ACE/examples/IPC_SAP/TLI_SAP/db-server.cpp index 3b547e154a3..28d30aa2399 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/db-server.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/db-server.cpp @@ -6,7 +6,7 @@ #include "ace/TLI_Acceptor.h" #include "ace/Thread_Manager.h" -ACE_RCSID(TLI_SAP, db_server, "$Id$") + #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_TLI) diff --git a/ACE/examples/IPC_SAP/TLI_SAP/ftp-client.cpp b/ACE/examples/IPC_SAP/TLI_SAP/ftp-client.cpp index 28cbf612005..447421a1916 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/ftp-client.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/ftp-client.cpp @@ -7,7 +7,7 @@ #include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(TLI_SAP, ftp_client, "$Id$") + #if defined (ACE_HAS_TLI) diff --git a/ACE/examples/IPC_SAP/TLI_SAP/ftp-server.cpp b/ACE/examples/IPC_SAP/TLI_SAP/ftp-server.cpp index 601a90987ff..c96474ddd45 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/ftp-server.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/ftp-server.cpp @@ -6,7 +6,7 @@ #include "ace/Thread_Manager.h" #include "ace/TLI_Acceptor.h" -ACE_RCSID(TLI_SAP, ftp_server, "$Id$") + #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_TLI) diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp b/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp index 867cd7709ae..66ce3d62ded 100644 --- a/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp +++ b/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp @@ -23,7 +23,7 @@ #include "ace/UPIPE_Acceptor.h" #include "ace/UPIPE_Connector.h" -ACE_RCSID(UPIPE_SAP, ex1, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/ex2.cpp b/ACE/examples/IPC_SAP/UPIPE_SAP/ex2.cpp index e19a83460ce..3b9e8b35d9d 100644 --- a/ACE/examples/IPC_SAP/UPIPE_SAP/ex2.cpp +++ b/ACE/examples/IPC_SAP/UPIPE_SAP/ex2.cpp @@ -23,7 +23,7 @@ #include "ace/Auto_Ptr.h" #include "ace/OS_NS_time.h" -ACE_RCSID(UPIPE_SAP, ex2, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/ex3.cpp b/ACE/examples/IPC_SAP/UPIPE_SAP/ex3.cpp index 57ff4f34d9e..113c79ff839 100644 --- a/ACE/examples/IPC_SAP/UPIPE_SAP/ex3.cpp +++ b/ACE/examples/IPC_SAP/UPIPE_SAP/ex3.cpp @@ -24,7 +24,7 @@ #include "ace/Auto_Ptr.h" #include "ace/OS_NS_time.h" -ACE_RCSID(UPIPE_SAP, ex3, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Log_Msg/test_callback.cpp b/ACE/examples/Log_Msg/test_callback.cpp index e263c9777eb..17bf724fcf3 100644 --- a/ACE/examples/Log_Msg/test_callback.cpp +++ b/ACE/examples/Log_Msg/test_callback.cpp @@ -24,7 +24,7 @@ #include "ace/Log_Record.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Log_Msg, test_callback, "$Id$") + class Logger : public ACE_Log_Msg_Callback // Subclassing from ACE_Log_Msg_Callback means that an instance of diff --git a/ACE/examples/Log_Msg/test_log_msg.cpp b/ACE/examples/Log_Msg/test_log_msg.cpp index a2d40770f56..59e61524700 100644 --- a/ACE/examples/Log_Msg/test_log_msg.cpp +++ b/ACE/examples/Log_Msg/test_log_msg.cpp @@ -26,7 +26,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdlib.h" -ACE_RCSID(Log_Msg, test_log_msg, "$Id$") + static void cleanup (void) diff --git a/ACE/examples/Log_Msg/test_ostream.cpp b/ACE/examples/Log_Msg/test_ostream.cpp index 3492195fe9d..34881811ea5 100644 --- a/ACE/examples/Log_Msg/test_ostream.cpp +++ b/ACE/examples/Log_Msg/test_ostream.cpp @@ -24,7 +24,7 @@ #include "ace/Log_Msg.h" -ACE_RCSID(Log_Msg, test_ostream, "$Id$") + int ACE_TMAIN (int, ACE_TCHAR *[]) @@ -76,7 +76,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) if (infile.bad ()) return 1; - // This loop should print out the contents of file "output", which should + // This loop should print out the contents of file "output", which should // have the strings "fourth\n" and "fifth\n" in them. char line[BUFSIZ]; diff --git a/ACE/examples/Logger/simple-server/Logging_Acceptor.cpp b/ACE/examples/Logger/simple-server/Logging_Acceptor.cpp index 7e5e0d0075c..aebb1622920 100644 --- a/ACE/examples/Logger/simple-server/Logging_Acceptor.cpp +++ b/ACE/examples/Logger/simple-server/Logging_Acceptor.cpp @@ -7,7 +7,7 @@ #include "Logging_Handler.h" #include "Reactor_Singleton.h" -ACE_RCSID(simple_server, Logging_Acceptor, "$Id$") + // Initialize peer_acceptor object. diff --git a/ACE/examples/Logger/simple-server/server_loggerd.cpp b/ACE/examples/Logger/simple-server/server_loggerd.cpp index d5296addaad..76eec6c71a2 100644 --- a/ACE/examples/Logger/simple-server/server_loggerd.cpp +++ b/ACE/examples/Logger/simple-server/server_loggerd.cpp @@ -14,7 +14,7 @@ #include "Logging_Acceptor.h" #include "Reactor_Singleton.h" -ACE_RCSID(simple_server, server_loggerd, "$Id$") + static sig_atomic_t finished = 0; diff --git a/ACE/examples/Map_Manager/test_hash_map_manager.cpp b/ACE/examples/Map_Manager/test_hash_map_manager.cpp index d4fab2aef94..b3324a46238 100644 --- a/ACE/examples/Map_Manager/test_hash_map_manager.cpp +++ b/ACE/examples/Map_Manager/test_hash_map_manager.cpp @@ -9,7 +9,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/os_include/os_assert.h" -ACE_RCSID(Map_Manager, test_hash_map_manager, "$Id$") + const int MAX_KEY_LEN = 1000; diff --git a/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp b/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp index 2628dd2f9de..4e94b4658af 100644 --- a/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp +++ b/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp @@ -9,7 +9,7 @@ #include "ace/Log_Msg.h" #include "IO_Test.h" -ACE_RCSID(IO_tests, IO_Test, "$Id$") + diff --git a/ACE/examples/Mem_Map/IO-tests/test_io.cpp b/ACE/examples/Mem_Map/IO-tests/test_io.cpp index 20dd3da70d1..67e054fc423 100644 --- a/ACE/examples/Mem_Map/IO-tests/test_io.cpp +++ b/ACE/examples/Mem_Map/IO-tests/test_io.cpp @@ -11,7 +11,7 @@ #include "ace/Log_Msg.h" #include "IO_Test.h" -ACE_RCSID(IO_tests, test_io, "$Id$") + #if !defined(_WIN32) diff --git a/ACE/examples/Mem_Map/file-reverse/file-reverse.cpp b/ACE/examples/Mem_Map/file-reverse/file-reverse.cpp index 37418d7d7fc..e439d6f18ff 100644 --- a/ACE/examples/Mem_Map/file-reverse/file-reverse.cpp +++ b/ACE/examples/Mem_Map/file-reverse/file-reverse.cpp @@ -8,7 +8,7 @@ #include "ace/Log_Msg.h" #include "ace/Truncate.h" -ACE_RCSID(file_reverse, file_reverse, "$Id$") + static void putline (const char *s) diff --git a/ACE/examples/Misc/test_dump.cpp b/ACE/examples/Misc/test_dump.cpp index bbffe66a2bf..1c91c35209b 100644 --- a/ACE/examples/Misc/test_dump.cpp +++ b/ACE/examples/Misc/test_dump.cpp @@ -10,7 +10,7 @@ #include "ace/Reactor.h" -ACE_RCSID(Misc, test_dump, "$Id$") + int ACE_TMAIN (int, ACE_TCHAR *[]) diff --git a/ACE/examples/Misc/test_get_opt.cpp b/ACE/examples/Misc/test_get_opt.cpp index 720a0a26bd5..e5d98bf9f04 100644 --- a/ACE/examples/Misc/test_get_opt.cpp +++ b/ACE/examples/Misc/test_get_opt.cpp @@ -6,7 +6,7 @@ #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" -ACE_RCSID(Misc, test_get_opt, "$Id$") + int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/ACE/examples/Misc/test_profile_timer.cpp b/ACE/examples/Misc/test_profile_timer.cpp index a028956ede3..89c9652bc6a 100644 --- a/ACE/examples/Misc/test_profile_timer.cpp +++ b/ACE/examples/Misc/test_profile_timer.cpp @@ -6,7 +6,7 @@ #include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Misc, test_profile_timer, "$Id$") + static const int DEFAULT_ITERATIONS = 100000000; diff --git a/ACE/examples/Misc/test_sstring.cpp b/ACE/examples/Misc/test_sstring.cpp index 75cfe8e1158..487ed8c2b22 100644 --- a/ACE/examples/Misc/test_sstring.cpp +++ b/ACE/examples/Misc/test_sstring.cpp @@ -4,7 +4,7 @@ #include "ace/SString.h" #include "ace/Log_Msg.h" -ACE_RCSID(Misc, test_sstring, "$Id$") + int ACE_TMAIN (int, ACE_TCHAR *[]) diff --git a/ACE/examples/Misc/test_timestamp.cpp b/ACE/examples/Misc/test_timestamp.cpp index e61ddace9b3..8670021d758 100644 --- a/ACE/examples/Misc/test_timestamp.cpp +++ b/ACE/examples/Misc/test_timestamp.cpp @@ -6,7 +6,7 @@ #include "ace/ACE.h" #include "ace/Log_Msg.h" -ACE_RCSID(Misc, test_timestamp, "$Id$") + int ACE_TMAIN (int, ACE_TCHAR *[]) diff --git a/ACE/examples/Misc/test_trace.cpp b/ACE/examples/Misc/test_trace.cpp index b2d3167d290..8f684d237b7 100644 --- a/ACE/examples/Misc/test_trace.cpp +++ b/ACE/examples/Misc/test_trace.cpp @@ -11,14 +11,14 @@ // = DESCRIPTION // This example illustrates how to use the ACE tracing feature and // the ACE_TRACE macro. It also shows the use of the ACE_Task_Base -// class running as an "active object". -// +// class running as an "active object". +// // When adding ACE tracing to an application one option is to add -// +// // #define ACE_NTRACE 0 -// +// // in the line above #include "ace/Log_Msg.h". That's the approach shown below. -// +// // Another option is to add this line in $ACE_ROOT/ace/config.h. // Note, however, that if you add the line in config.h, you need to // add it *after* you've built ACE, i.e., don't build ACE with it @@ -43,7 +43,7 @@ #include "ace/Signal.h" #include "ace/Task.h" -ACE_RCSID(Misc, test_trace, "$Id$") + class My_Task : public ACE_Task_Base { diff --git a/ACE/examples/Naming/test_non_existent.cpp b/ACE/examples/Naming/test_non_existent.cpp index 448594bd969..4af32ac9a90 100644 --- a/ACE/examples/Naming/test_non_existent.cpp +++ b/ACE/examples/Naming/test_non_existent.cpp @@ -4,7 +4,7 @@ #include "ace/Naming_Context.h" #include "ace/Log_Msg.h" -ACE_RCSID(Naming, test_non_existent, "$Id$") + int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/OS/Process/imore.cpp b/ACE/examples/OS/Process/imore.cpp index 04b6cbfb392..d35e8ddaecc 100644 --- a/ACE/examples/OS/Process/imore.cpp +++ b/ACE/examples/OS/Process/imore.cpp @@ -34,7 +34,7 @@ #include "ace/Process.h" #include "ace/Signal.h" -ACE_RCSID(Process, imore, "$Id$") + #if defined (ACE_WIN32) static const ACE_TCHAR *executable = ACE_TEXT("MORE.COM"); diff --git a/ACE/examples/OS/Process/process.cpp b/ACE/examples/OS/Process/process.cpp index 7187338dd5d..0f80664aebc 100644 --- a/ACE/examples/OS/Process/process.cpp +++ b/ACE/examples/OS/Process/process.cpp @@ -31,7 +31,7 @@ #include "ace/Truncate.h" #include "ace/Tokenizer_T.h" -ACE_RCSID(Process, process, "$Id$") + #if defined (ACE_WIN32) #define EXEC_NAME ACE_TEXT ("MORE.COM") diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp index 20c03f40fa6..c04e0952dfa 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp @@ -3,7 +3,7 @@ #include "Fill_ACE_QoS.h" -ACE_RCSID(QOS, Fill_ACE_QoS,"$Id$") + const iovec Fill_ACE_QoS::iov_ = {0,0}; diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp index 9f07ad5b378..5a5422eac08 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp @@ -4,7 +4,7 @@ #include "ace/Log_Msg.h" #include "QoS_Signal_Handler.h" -ACE_RCSID(QOS, QoS_Signal_Handler,"$Id$") + // constructor. QoS_Signal_Handler::QoS_Signal_Handler (ACE_QoS_Session *qos_session) diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp index 0ef3b353248..80655925ac8 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp @@ -8,7 +8,7 @@ #include "QoS_Util.h" #include "ace/OS_NS_strings.h" -ACE_RCSID(QOS, QoS_Util,"$Id$") + // constructor. QoS_Util::QoS_Util (int argc, diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp index 20c03f40fa6..c04e0952dfa 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp @@ -3,7 +3,7 @@ #include "Fill_ACE_QoS.h" -ACE_RCSID(QOS, Fill_ACE_QoS,"$Id$") + const iovec Fill_ACE_QoS::iov_ = {0,0}; diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp index 9f07ad5b378..5a5422eac08 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp @@ -4,7 +4,7 @@ #include "ace/Log_Msg.h" #include "QoS_Signal_Handler.h" -ACE_RCSID(QOS, QoS_Signal_Handler,"$Id$") + // constructor. QoS_Signal_Handler::QoS_Signal_Handler (ACE_QoS_Session *qos_session) diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp index 0ef3b353248..80655925ac8 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp @@ -8,7 +8,7 @@ #include "QoS_Util.h" #include "ace/OS_NS_strings.h" -ACE_RCSID(QOS, QoS_Util,"$Id$") + // constructor. QoS_Util::QoS_Util (int argc, diff --git a/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp b/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp index 20c03f40fa6..c04e0952dfa 100644 --- a/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp +++ b/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp @@ -3,7 +3,7 @@ #include "Fill_ACE_QoS.h" -ACE_RCSID(QOS, Fill_ACE_QoS,"$Id$") + const iovec Fill_ACE_QoS::iov_ = {0,0}; diff --git a/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp b/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp index a0533bacdbc..f01577f730e 100644 --- a/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp +++ b/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp @@ -4,7 +4,7 @@ #include "ace/Log_Msg.h" #include "QoS_Signal_Handler.h" -ACE_RCSID(QOS, QoS_Signal_Handler,"$Id$") + // constructor. QoS_Signal_Handler::QoS_Signal_Handler (ACE_QoS_Session *qos_session) diff --git a/ACE/examples/QOS/Simple/QoS_Util.cpp b/ACE/examples/QOS/Simple/QoS_Util.cpp index 0ef3b353248..80655925ac8 100644 --- a/ACE/examples/QOS/Simple/QoS_Util.cpp +++ b/ACE/examples/QOS/Simple/QoS_Util.cpp @@ -8,7 +8,7 @@ #include "QoS_Util.h" #include "ace/OS_NS_strings.h" -ACE_RCSID(QOS, QoS_Util,"$Id$") + // constructor. QoS_Util::QoS_Util (int argc, diff --git a/ACE/examples/Reactor/Dgram/CODgram.cpp b/ACE/examples/Reactor/Dgram/CODgram.cpp index 7baafdcdba0..0b58d56b12f 100644 --- a/ACE/examples/Reactor/Dgram/CODgram.cpp +++ b/ACE/examples/Reactor/Dgram/CODgram.cpp @@ -34,7 +34,7 @@ #include "ace/Process.h" #include "ace/Log_Msg.h" -ACE_RCSID(Dgram, CODgram, "$Id$") + // Port used to receive for dgrams. static u_short port1; diff --git a/ACE/examples/Reactor/Dgram/Dgram.cpp b/ACE/examples/Reactor/Dgram/Dgram.cpp index 156132028df..b287a9f7f56 100644 --- a/ACE/examples/Reactor/Dgram/Dgram.cpp +++ b/ACE/examples/Reactor/Dgram/Dgram.cpp @@ -33,7 +33,7 @@ #include "ace/INET_Addr.h" #include "ace/Log_Msg.h" -ACE_RCSID(Dgram, Dgram, "$Id$") + // Port used to receive for dgrams. static u_short port1; diff --git a/ACE/examples/Reactor/FIFO/client.cpp b/ACE/examples/Reactor/FIFO/client.cpp index 27e7ab45f37..99809e0e58f 100644 --- a/ACE/examples/Reactor/FIFO/client.cpp +++ b/ACE/examples/Reactor/FIFO/client.cpp @@ -4,7 +4,7 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_stropts.h" -ACE_RCSID(FIFO, client, "$Id$") + int ACE_TMAIN (int, ACE_TCHAR *[]) diff --git a/ACE/examples/Reactor/FIFO/server.cpp b/ACE/examples/Reactor/FIFO/server.cpp index 3897aa3566e..bbcb8b9dc12 100644 --- a/ACE/examples/Reactor/FIFO/server.cpp +++ b/ACE/examples/Reactor/FIFO/server.cpp @@ -8,7 +8,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stropts.h" -ACE_RCSID(FIFO, server, "$Id$") + class FIFO_Recv_Handler : public ACE_Event_Handler { diff --git a/ACE/examples/Reactor/Misc/notification.cpp b/ACE/examples/Reactor/Misc/notification.cpp index 0b02e2e553c..639ce5e1b21 100644 --- a/ACE/examples/Reactor/Misc/notification.cpp +++ b/ACE/examples/Reactor/Misc/notification.cpp @@ -8,7 +8,7 @@ #include "ace/Signal.h" #include "ace/Truncate.h" -ACE_RCSID(Misc, notification, "$Id$") + #if defined (ACE_HAS_THREADS) #if defined (CHORUS) diff --git a/ACE/examples/Reactor/Misc/pingpong.cpp b/ACE/examples/Reactor/Misc/pingpong.cpp index bf36caf99b0..5d17495b21e 100644 --- a/ACE/examples/Reactor/Misc/pingpong.cpp +++ b/ACE/examples/Reactor/Misc/pingpong.cpp @@ -48,7 +48,7 @@ # include "ace/Thread.h" #endif -ACE_RCSID(Misc, pingpong, "$Id$") + class Ping_Pong : public ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t> { diff --git a/ACE/examples/Reactor/Misc/test_demuxing.cpp b/ACE/examples/Reactor/Misc/test_demuxing.cpp index 71ead8cb68b..fceb54f22ee 100644 --- a/ACE/examples/Reactor/Misc/test_demuxing.cpp +++ b/ACE/examples/Reactor/Misc/test_demuxing.cpp @@ -17,7 +17,7 @@ #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Misc, test_demuxing, "$Id$") + // Default is to have a 2 second timeout. static int timeout = 2; diff --git a/ACE/examples/Reactor/Misc/test_early_timeouts.cpp b/ACE/examples/Reactor/Misc/test_early_timeouts.cpp index b539bdf7655..52666e63c82 100644 --- a/ACE/examples/Reactor/Misc/test_early_timeouts.cpp +++ b/ACE/examples/Reactor/Misc/test_early_timeouts.cpp @@ -25,7 +25,7 @@ #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_sys_select.h" -ACE_RCSID(Misc, test_early_timeouts, "$Id$") + int ACE_TMAIN (int, ACE_TCHAR *[]) diff --git a/ACE/examples/Reactor/Misc/test_event_handler_t.cpp b/ACE/examples/Reactor/Misc/test_event_handler_t.cpp index 021110739b6..8ba50e46932 100644 --- a/ACE/examples/Reactor/Misc/test_event_handler_t.cpp +++ b/ACE/examples/Reactor/Misc/test_event_handler_t.cpp @@ -3,7 +3,7 @@ #include "ace/Event_Handler_T.h" #include "ace/Log_Msg.h" -ACE_RCSID(Misc, test_event_handler_t, "$Id$") + #if defined (ACE_HAS_TEMPLATE_TYPEDEFS) diff --git a/ACE/examples/Reactor/Misc/test_reactors.cpp b/ACE/examples/Reactor/Misc/test_reactors.cpp index 1c77f5e8c2f..2d94fa80d00 100644 --- a/ACE/examples/Reactor/Misc/test_reactors.cpp +++ b/ACE/examples/Reactor/Misc/test_reactors.cpp @@ -8,7 +8,7 @@ #include "ace/Task.h" #include "ace/Atomic_Op.h" -ACE_RCSID(Misc, test_reactors, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Reactor/Misc/test_signals_1.cpp b/ACE/examples/Reactor/Misc/test_signals_1.cpp index aef83ae9428..2c66af34ccb 100644 --- a/ACE/examples/Reactor/Misc/test_signals_1.cpp +++ b/ACE/examples/Reactor/Misc/test_signals_1.cpp @@ -10,7 +10,7 @@ #include "ace/Log_Msg.h" #include "ace/Signal.h" -ACE_RCSID(Misc, test_signals_1, "$Id$") + // Number of times to allow signal to execute until we quit. static size_t signal_count = 10; diff --git a/ACE/examples/Reactor/Misc/test_signals_2.cpp b/ACE/examples/Reactor/Misc/test_signals_2.cpp index ebfc89fc7ee..5664952290b 100644 --- a/ACE/examples/Reactor/Misc/test_signals_2.cpp +++ b/ACE/examples/Reactor/Misc/test_signals_2.cpp @@ -103,7 +103,7 @@ #include "ace/Log_Msg.h" #include "ace/Signal.h" -ACE_RCSID(Misc, test_signals_2, "$Id$") + class Sig_Handler_1 : public ACE_Event_Handler { diff --git a/ACE/examples/Reactor/Misc/test_time_value.cpp b/ACE/examples/Reactor/Misc/test_time_value.cpp index 6557a0716de..275bd9aebfa 100644 --- a/ACE/examples/Reactor/Misc/test_time_value.cpp +++ b/ACE/examples/Reactor/Misc/test_time_value.cpp @@ -6,7 +6,7 @@ #include "ace/Log_Msg.h" #include "ace/Time_Value.h" -ACE_RCSID(Misc, test_time_value, "$Id$") + inline int my_abs (int d) { return d > 0 ? d : -d; } diff --git a/ACE/examples/Reactor/Misc/test_timer_queue.cpp b/ACE/examples/Reactor/Misc/test_timer_queue.cpp index 64138e13daf..87190f43c7d 100644 --- a/ACE/examples/Reactor/Misc/test_timer_queue.cpp +++ b/ACE/examples/Reactor/Misc/test_timer_queue.cpp @@ -8,7 +8,7 @@ #include "ace/Recursive_Thread_Mutex.h" #include "ace/Null_Mutex.h" -ACE_RCSID(Misc, test_timer_queue, "$Id$") + class Example_Handler : public ACE_Event_Handler { diff --git a/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp b/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp index 64d137c7b83..1b8bc436926 100644 --- a/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp +++ b/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp @@ -12,7 +12,7 @@ #include "ace/OS_NS_time.h" #include "ace/OS_NS_stdlib.h" -ACE_RCSID(Multicast, Log_Wrapper, "$Id$") + Log_Wrapper::Log_Wrapper (void) { diff --git a/ACE/examples/Reactor/Multicast/client.cpp b/ACE/examples/Reactor/Multicast/client.cpp index 88f1ef04262..519bcace00b 100644 --- a/ACE/examples/Reactor/Multicast/client.cpp +++ b/ACE/examples/Reactor/Multicast/client.cpp @@ -12,7 +12,7 @@ #include "ace/Log_Msg.h" #include "Log_Wrapper.h" -ACE_RCSID(Multicast, client, "$Id$") + // Multi-cast address. static const char *MCAST_ADDR = ACE_DEFAULT_MULTICAST_ADDR; @@ -105,7 +105,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (nbytes <= 0) break; // End of file or error. - + buf[nbytes - 1] = '\0'; // Quitting? @@ -120,10 +120,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Send the message to the logger. if (log.log_message (Log_Wrapper::LM_DEBUG, buf) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n" "log_message"), -1); - + ACE_DEBUG ((LM_DEBUG, "finished sending message %d\n", count++)); } - } + } ACE_DEBUG ((LM_DEBUG, "Client done.\n")); return 0; diff --git a/ACE/examples/Reactor/Multicast/server.cpp b/ACE/examples/Reactor/Multicast/server.cpp index 64e54fc06a5..8df4859b517 100644 --- a/ACE/examples/Reactor/Multicast/server.cpp +++ b/ACE/examples/Reactor/Multicast/server.cpp @@ -16,7 +16,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" -ACE_RCSID(Multicast, server, "$Id$") + #if defined (ACE_HAS_IP_MULTICAST) class Server_Events : public ACE_Event_Handler diff --git a/ACE/examples/Reactor/Ntalker/ntalker.cpp b/ACE/examples/Reactor/Ntalker/ntalker.cpp index 5bf538b06eb..be7fd659c54 100644 --- a/ACE/examples/Reactor/Ntalker/ntalker.cpp +++ b/ACE/examples/Reactor/Ntalker/ntalker.cpp @@ -12,7 +12,7 @@ #include "ace/Thread_Manager.h" #include "ace/Service_Config.h" -ACE_RCSID(Ntalker, ntalker, "$Id$") + #if defined (ACE_HAS_IP_MULTICAST) // Network interface to subscribe to. This is hardware specific. use diff --git a/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp index 147bc2773b5..3804050a608 100644 --- a/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp +++ b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp @@ -24,7 +24,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_main.h" -ACE_RCSID(Proactor, test_proactor, "simple_test_proactor.cpp,v 1.1 1999/05/18 22:15:30 alex Exp") + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting diff --git a/ACE/examples/Reactor/Proactor/test_cancel.cpp b/ACE/examples/Reactor/Proactor/test_cancel.cpp index 803fb61fd48..1d22d322b0c 100644 --- a/ACE/examples/Reactor/Proactor/test_cancel.cpp +++ b/ACE/examples/Reactor/Proactor/test_cancel.cpp @@ -50,7 +50,7 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_sys_socket.h" -ACE_RCSID (Proactor, test_proactor, "$Id$") + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting diff --git a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp index 61301aaf50b..22ed834d8e8 100644 --- a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp +++ b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp @@ -25,7 +25,7 @@ #include "ace/Atomic_Op.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Proactor, test_multiple_loops, "$Id$") + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) diff --git a/ACE/examples/Reactor/Proactor/test_proactor.cpp b/ACE/examples/Reactor/Proactor/test_proactor.cpp index fca820893dc..3fdfe61f6c2 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor.cpp @@ -38,7 +38,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_fcntl.h" -ACE_RCSID(Proactor, test_proactor, "$Id$") + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting @@ -537,7 +537,7 @@ Sender::handle_read_file (const ACE_Asynch_Read_File::Result &result) this->file_offset_ += ACE_Utils::truncate_cast<u_long> (result.bytes_transferred ()); - + if (this->ws_.write (result.message_block (), result.bytes_transferred ()) == -1) { @@ -584,7 +584,7 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) int unsent_data = ACE_Utils::truncate_cast<int> ( result.bytes_to_write () - result.bytes_transferred ()); - + if (unsent_data != 0) { // Reset pointers diff --git a/ACE/examples/Reactor/Proactor/test_proactor2.cpp b/ACE/examples/Reactor/Proactor/test_proactor2.cpp index 1617c648325..9c7a12bf3ba 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor2.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor2.cpp @@ -40,7 +40,7 @@ #include "ace/Task.h" #include "ace/OS_main.h" -ACE_RCSID(Proactor, test_proactor2, "test_proactor2.cpp,v 1.27 2000/03/07 17:15:56 schmidt Exp") + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting diff --git a/ACE/examples/Reactor/Proactor/test_proactor3.cpp b/ACE/examples/Reactor/Proactor/test_proactor3.cpp index bc0c4403365..45b8b92fef0 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor3.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor3.cpp @@ -39,7 +39,7 @@ #include "ace/Task.h" -ACE_RCSID(Proactor, test_proactor, "test_proactor.cpp,v 1.27 2000/03/07 17:15:56 schmidt Exp") + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms diff --git a/ACE/examples/Reactor/Proactor/test_timeout.cpp b/ACE/examples/Reactor/Proactor/test_timeout.cpp index 258756ef772..c70b043d076 100644 --- a/ACE/examples/Reactor/Proactor/test_timeout.cpp +++ b/ACE/examples/Reactor/Proactor/test_timeout.cpp @@ -28,7 +28,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_main.h" -ACE_RCSID(Proactor, test_timeout, "$Id$") + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting diff --git a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp index 045f3607375..1660a711ce2 100644 --- a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp +++ b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp @@ -22,7 +22,7 @@ #include "ace/Proactor.h" #include "ace/OS_main.h" -ACE_RCSID(Proactor, test_timeout, "$Id$") + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting diff --git a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp index 1ff800afb04..c0d4a7a6171 100644 --- a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp +++ b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp @@ -29,7 +29,7 @@ #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" -ACE_RCSID(Proactor, test_udp_proactor, "test_proactor.cpp,v 1.29 2001/02/02 23:41:16 shuston Exp") + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on asynch I/O-capable platforms. diff --git a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp index c9e36381fac..68addd47a51 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp @@ -27,7 +27,7 @@ #include "ace/Auto_Event.h" #include "ace/Log_Msg.h" -ACE_RCSID(WFMO_Reactor, APC, "$Id$") + class Event_Handler : public ACE_Event_Handler { diff --git a/ACE/examples/Reactor/WFMO_Reactor/Abandoned.cpp b/ACE/examples/Reactor/WFMO_Reactor/Abandoned.cpp index c860fc2810c..c03110098a2 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Abandoned.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Abandoned.cpp @@ -27,7 +27,7 @@ #include "ace/Process_Mutex.h" #include "ace/Auto_Event.h" -ACE_RCSID(WFMO_Reactor, Abandoned, "$Id$") + class Event_Handler : public ACE_Event_Handler { diff --git a/ACE/examples/Reactor/WFMO_Reactor/Console_Input.cpp b/ACE/examples/Reactor/WFMO_Reactor/Console_Input.cpp index 4d9b3efc479..4d903f1a983 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Console_Input.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Console_Input.cpp @@ -24,7 +24,7 @@ #include "ace/OS_main.h" #include "ace/Log_Msg.h" -ACE_RCSID(WFMO_Reactor, Console_Input, "$Id$") + class Event_Handler : public ACE_Event_Handler { diff --git a/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp index 6a52694492b..620de253b3d 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp @@ -27,7 +27,7 @@ #include "ace/OS_NS_fcntl.h" #include "ace/Log_Msg.h" -ACE_RCSID(WFMO_Reactor, Directory_Changes, "$Id$") + static int stop_test = 0; static const ACE_TCHAR *directory = ACE_TEXT ("."); diff --git a/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp b/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp index 5bbf0b4e4f3..f859362f2a8 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp @@ -29,7 +29,7 @@ #include "ace/WFMO_Reactor.h" -ACE_RCSID(WFMO_Reactor, Exceptions, "$Id$") + class Event_Handler : public ACE_Event_Handler { diff --git a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp index c90e1f5bcb8..2bde1ef9cd9 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp @@ -28,7 +28,7 @@ #include "ace/Pipe.h" #include "ace/OS_main.h" -ACE_RCSID(WFMO_Reactor, Handle_Close, "$Id: ") + // Use the WFMO_Reactor static int opt_wfmo_reactor = 0; diff --git a/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp b/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp index 911c3ee9c2e..ad939e0261c 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp @@ -32,7 +32,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_time.h" -ACE_RCSID(WFMO_Reactor, Multithreading, "$Id$") + static int concurrent_threads = 1; static int number_of_handles = static_cast<int> (ACE_Reactor::instance ()->size ()); diff --git a/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp b/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp index 9935679a60f..eca99573870 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp @@ -38,7 +38,7 @@ #include "ace/SOCK_Acceptor.h" #include "ace/OS_main.h" -ACE_RCSID(WFMO_Reactor, Network_Events, "$Id$") + class Network_Handler : public ACE_Event_Handler { diff --git a/ACE/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.cpp index 48c25cb03b9..90d382c6349 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.cpp @@ -24,7 +24,7 @@ #include "ace/OS_NS_sys_socket.h" #include "ace/Log_Msg.h" -ACE_RCSID(WFMO_Reactor, Prerun_State_Changes, "$Id$") + class Event_Handler : public ACE_Event_Handler // = TITLE diff --git a/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp b/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp index 5d9bcc2b27b..e36da0713ca 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp @@ -42,7 +42,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/Log_Msg.h" -ACE_RCSID(WFMO_Reactor, Registration, "$Id$") + // Globals for this test int stop_test = 0; diff --git a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp index a215c45acfb..d5f4c9357d7 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp @@ -27,7 +27,7 @@ #include "ace/Auto_Event.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(WFMO_Reactor, Registry_Changes, "$Id$") + static int stop_test = 0; static HKEY context_to_monitor = HKEY_CURRENT_USER; diff --git a/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp b/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp index 238115e05eb..8f2e38c6cab 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp @@ -28,7 +28,7 @@ #include "ace/Service_Config.h" #include "ace/Event.h" -ACE_RCSID(WFMO_Reactor, Removals, "$Id$") + class Event_Handler : public ACE_Event_Handler // = TITLE diff --git a/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp b/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp index a2a781a0c55..4bb8fcceb28 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp @@ -25,7 +25,7 @@ #include "ace/Reactor.h" #include "ace/WFMO_Reactor.h" -ACE_RCSID(WFMO_Reactor, Suspended_Removals, "$Id$") + class Event_Handler : public ACE_Event_Handler { diff --git a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp index 8f05fcbe3aa..d62dda16f51 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp @@ -147,7 +147,7 @@ #include "ace/Task.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(WFMO_Reactor, Talker, "$Id$") + typedef ACE_Task<ACE_MT_SYNCH> MT_TASK; diff --git a/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp b/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp index 8cc37a940bc..5c6e7eaee60 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp @@ -28,7 +28,7 @@ #include "ace/Service_Config.h" #include "ace/OS_main.h" -ACE_RCSID(WFMO_Reactor, Timeouts, "$Id$") + class Timeout_Handler : public ACE_Event_Handler // = TITLE diff --git a/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp b/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp index f455e3ad7b3..07982353a1d 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp @@ -28,7 +28,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Auto_Event.h" -ACE_RCSID(WFMO_Reactor, Window_Messages, "$Id$") + class Event_Handler : public ACE_Event_Handler { @@ -81,13 +81,13 @@ ACE_TMAIN (int, ACE_TCHAR*[]) ACE_ASSERT (result == 0); ACE_Time_Value timeout (1); - result = + result = ACE_Utils::truncate_cast<int> ( ::SetTimer (0, // handle of window for timer messages 0, // timer identifier timeout.msec (), // time-out value (TIMERPROC) &timer_callback)); // address of timer procedure - + ACE_ASSERT (result != 0); ACE_Reactor::run_event_loop (); diff --git a/ACE/examples/Registry/test_registry_iterator.cpp b/ACE/examples/Registry/test_registry_iterator.cpp index df776ca2fad..5a05f5b90b8 100644 --- a/ACE/examples/Registry/test_registry_iterator.cpp +++ b/ACE/examples/Registry/test_registry_iterator.cpp @@ -16,7 +16,7 @@ // FUZZ: disable check_for_streams_include #include "ace/streams.h" -ACE_RCSID(Registry, test_registry_iterator, "$Id$") + // Indentation while printing names static const u_long INDENTATION_LEVEL = 3; diff --git a/ACE/examples/Registry/test_registry_update.cpp b/ACE/examples/Registry/test_registry_update.cpp index 8aec0bd412d..488a739991f 100644 --- a/ACE/examples/Registry/test_registry_update.cpp +++ b/ACE/examples/Registry/test_registry_update.cpp @@ -22,7 +22,7 @@ // FUZZ: disable check_for_streams_include #include "ace/streams.h" -ACE_RCSID(Registry, test_registry_update, "$Id$") + // Name for application's naming context static ACE_Registry::Name application_context_name; diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp index 3be991cc36e..0a38827a07a 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp @@ -2,7 +2,7 @@ #include "Handle_L_FIFO.h" -ACE_RCSID(server, Handle_L_FIFO, "$Id$") + #if defined (SunOS4) extern "C" diff --git a/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp b/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp index 583552c6de4..aecf63fdd7a 100644 --- a/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp +++ b/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp @@ -4,7 +4,7 @@ #include "Timer_Service.h" #include "ace/Log_Msg.h" -ACE_RCSID(Misc, Timer_Service, "$Id$") + Timer_Service_1::Timer_Service_1 (void) { diff --git a/ACE/examples/Service_Configurator/Misc/main.cpp b/ACE/examples/Service_Configurator/Misc/main.cpp index 0130a135c1e..f93c7c1b4c2 100644 --- a/ACE/examples/Service_Configurator/Misc/main.cpp +++ b/ACE/examples/Service_Configurator/Misc/main.cpp @@ -24,7 +24,7 @@ #include "ace/Log_Msg.h" #include "Timer_Service.h" -ACE_RCSID(Misc, main, "$Id$") + // Create an object that will insert the <Timer_Service> into the list // of statically linked services that the <ACE_Service_Config> will @@ -40,10 +40,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Manufacture a "fake" svc.conf entry to demonstrate the -S option // that allows us to pass these entries via the "command-line" // rather than the svc.conf file. - + for (int i = 0; i < argc; i++) args.add (argv[i]); - + args.add (ACE_TEXT ("-y")); args.add (ACE_TEXT ("-d")); args.add (ACE_TEXT ("-S")); diff --git a/ACE/examples/Shared_Malloc/Malloc.cpp b/ACE/examples/Shared_Malloc/Malloc.cpp index 4499d9fa11b..2236e2ec6c0 100644 --- a/ACE/examples/Shared_Malloc/Malloc.cpp +++ b/ACE/examples/Shared_Malloc/Malloc.cpp @@ -16,7 +16,7 @@ #include "ace/Process_Mutex.h" #include "ace/Malloc_T.h" -ACE_RCSID(Shared_Malloc, Malloc, "$Id$") + // Strategic typedefs for memory allocation. diff --git a/ACE/examples/Shared_Malloc/test_malloc.cpp b/ACE/examples/Shared_Malloc/test_malloc.cpp index 242aa1736a8..29d1f9bc696 100644 --- a/ACE/examples/Shared_Malloc/test_malloc.cpp +++ b/ACE/examples/Shared_Malloc/test_malloc.cpp @@ -15,7 +15,7 @@ #include "Malloc.h" #include "Options.h" -ACE_RCSID(Shared_Malloc, test_malloc, "$Id$") + static int gen_size (void) @@ -23,7 +23,7 @@ gen_size (void) #if defined (ACE_HAS_THREADS) ACE_RANDR_TYPE seed = static_cast<ACE_RANDR_TYPE> (reinterpret_cast<uintptr_t> (&seed)); - + return ( ACE_Utils::truncate_cast<int> ( ACE_OS::rand_r (seed) % Options::instance ()->max_msg_size ()) + 1); diff --git a/ACE/examples/Shared_Malloc/test_multiple_mallocs.cpp b/ACE/examples/Shared_Malloc/test_multiple_mallocs.cpp index 1638a762060..9a5b98bbb24 100644 --- a/ACE/examples/Shared_Malloc/test_multiple_mallocs.cpp +++ b/ACE/examples/Shared_Malloc/test_multiple_mallocs.cpp @@ -9,7 +9,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Process_Mutex.h" -ACE_RCSID(Shared_Malloc, test_multiple_mallocs, "$Id$") + typedef ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> TEST_MALLOC; diff --git a/ACE/examples/Shared_Malloc/test_position_independent_malloc.cpp b/ACE/examples/Shared_Malloc/test_position_independent_malloc.cpp index 3da3436377e..511c198b2b5 100644 --- a/ACE/examples/Shared_Malloc/test_position_independent_malloc.cpp +++ b/ACE/examples/Shared_Malloc/test_position_independent_malloc.cpp @@ -14,7 +14,7 @@ #include "ace/Malloc_T.h" #include "ace/MMAP_Memory_Pool.h" -ACE_RCSID(Shared_Malloc, test_multiple_mallocs, "$Id$") + #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) typedef ACE_PI_Control_Block CONTROL_BLOCK; diff --git a/ACE/examples/Shared_Memory/test_MM.cpp b/ACE/examples/Shared_Memory/test_MM.cpp index 90697296dbc..27184bb8e2d 100644 --- a/ACE/examples/Shared_Memory/test_MM.cpp +++ b/ACE/examples/Shared_Memory/test_MM.cpp @@ -6,7 +6,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdlib.h" -ACE_RCSID(Shared_Memory, test_MM, "$Id$") + #define SHMSZ 27 ACE_TCHAR shm_key[] = ACE_TEXT ("/tmp/fooXXXXXX"); diff --git a/ACE/examples/Shared_Memory/test_SV.cpp b/ACE/examples/Shared_Memory/test_SV.cpp index f606eea5b70..ce7e2218115 100644 --- a/ACE/examples/Shared_Memory/test_SV.cpp +++ b/ACE/examples/Shared_Memory/test_SV.cpp @@ -4,7 +4,7 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Shared_Memory, test_SV, "$Id$") + #define SHMSZ 27 #define SHM_KEY (key_t) 5678 diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp b/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp index 5f26eb583b4..41d11a3039e 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp @@ -11,7 +11,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdlib.h" -ACE_RCSID(SV_Message_Queues, MQ_Client, "$Id$") + #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp b/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp index fb45e296084..63411fcf313 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp @@ -11,7 +11,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdlib.h" -ACE_RCSID(SV_Message_Queues, MQ_Server, "$Id$") + #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp b/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp index 23fc877663c..d2bcf36cc9e 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp @@ -10,7 +10,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(SV_Message_Queues, TMQ_Client, "$Id$") + int ACE_TMAIN (int, ACE_TCHAR *[]) diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp b/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp index f91b1abf917..1f29cb6b9ff 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp @@ -13,7 +13,7 @@ #include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(SV_Message_Queues, TMQ_Server, "$Id$") + #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) diff --git a/ACE/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp b/ACE/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp index 933bd09a3bf..ce3685a7f36 100644 --- a/ACE/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp +++ b/ACE/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp @@ -12,7 +12,7 @@ #include "ace/SV_Semaphore_Complex.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(SV_Semaphores, Semaphores_2, "$Id$") + #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) diff --git a/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp b/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp index 606db9993a8..774de9bafb8 100644 --- a/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp +++ b/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp @@ -7,7 +7,7 @@ #include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(SV_Shared_Memory, SV_Shared_Memory_Test, "$Id$") + #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) diff --git a/ACE/examples/Threads/barrier1.cpp b/ACE/examples/Threads/barrier1.cpp index 4d3762b1eb6..81c9bc8d40e 100644 --- a/ACE/examples/Threads/barrier1.cpp +++ b/ACE/examples/Threads/barrier1.cpp @@ -8,7 +8,7 @@ #include "ace/Thread_Manager.h" #include "ace/Service_Config.h" -ACE_RCSID(Threads, barrier1, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Threads/barrier2.cpp b/ACE/examples/Threads/barrier2.cpp index db3a4f551e0..862290894ac 100644 --- a/ACE/examples/Threads/barrier2.cpp +++ b/ACE/examples/Threads/barrier2.cpp @@ -16,7 +16,7 @@ #include "ace/Task.h" #include "ace/Service_Config.h" -ACE_RCSID(Threads, barrier2, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Threads/future1.cpp b/ACE/examples/Threads/future1.cpp index a73549fd36c..1891cd5fa70 100644 --- a/ACE/examples/Threads/future1.cpp +++ b/ACE/examples/Threads/future1.cpp @@ -30,7 +30,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Atomic_Op.h" -ACE_RCSID(Threads, future1, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Threads/manual_event.cpp b/ACE/examples/Threads/manual_event.cpp index 0e1e76bfd8e..bad5de56b72 100644 --- a/ACE/examples/Threads/manual_event.cpp +++ b/ACE/examples/Threads/manual_event.cpp @@ -19,7 +19,7 @@ #include "ace/Thread_Manager.h" #include "ace/Atomic_Op.h" -ACE_RCSID(Threads, manual_event, "$Id$") + #if defined (ACE_HAS_THREADS) static ACE_Atomic_Op <ACE_Thread_Mutex, int> amount_of_work = 0; diff --git a/ACE/examples/Threads/process_mutex.cpp b/ACE/examples/Threads/process_mutex.cpp index bbb03c08d0b..6e874bff2c5 100644 --- a/ACE/examples/Threads/process_mutex.cpp +++ b/ACE/examples/Threads/process_mutex.cpp @@ -10,7 +10,7 @@ #include "ace/Log_Msg.h" #include "ace/Process_Mutex.h" -ACE_RCSID(Threads, process_mutex, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Threads/process_semaphore.cpp b/ACE/examples/Threads/process_semaphore.cpp index e7adbb6a3ac..0f551128a75 100644 --- a/ACE/examples/Threads/process_semaphore.cpp +++ b/ACE/examples/Threads/process_semaphore.cpp @@ -10,7 +10,7 @@ #include "ace/Process_Semaphore.h" #include "ace/OS_NS_stdlib.h" -ACE_RCSID(Threads, process_semaphore, "$Id$") + static sig_atomic_t done; diff --git a/ACE/examples/Threads/reader_writer.cpp b/ACE/examples/Threads/reader_writer.cpp index 460ce32249a..560e7cc1340 100644 --- a/ACE/examples/Threads/reader_writer.cpp +++ b/ACE/examples/Threads/reader_writer.cpp @@ -9,7 +9,7 @@ #include "ace/Get_Opt.h" #include "ace/Atomic_Op.h" -ACE_RCSID(Threads, reader_writer, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Threads/recursive_mutex.cpp b/ACE/examples/Threads/recursive_mutex.cpp index 9c30e6e975d..08e20d30aac 100644 --- a/ACE/examples/Threads/recursive_mutex.cpp +++ b/ACE/examples/Threads/recursive_mutex.cpp @@ -8,7 +8,7 @@ #include "ace/Thread_Manager.h" #include "ace/Get_Opt.h" -ACE_RCSID(Threads, recursive_mutex, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Threads/task_one.cpp b/ACE/examples/Threads/task_one.cpp index c106d9c6ba9..b1e657f72ad 100644 --- a/ACE/examples/Threads/task_one.cpp +++ b/ACE/examples/Threads/task_one.cpp @@ -9,7 +9,7 @@ #include "ace/Task.h" #include "ace/Service_Config.h" -ACE_RCSID(Threads, task_one, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Threads/task_three.cpp b/ACE/examples/Threads/task_three.cpp index 51bc95d3346..13625f64dc6 100644 --- a/ACE/examples/Threads/task_three.cpp +++ b/ACE/examples/Threads/task_three.cpp @@ -23,7 +23,7 @@ #include "ace/Signal.h" -ACE_RCSID(Threads, task_three, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Threads/task_two.cpp b/ACE/examples/Threads/task_two.cpp index 91b6de2bd1a..aa153ed1042 100644 --- a/ACE/examples/Threads/task_two.cpp +++ b/ACE/examples/Threads/task_two.cpp @@ -10,7 +10,7 @@ #include "ace/Service_Config.h" #include "ace/Atomic_Op.h" -ACE_RCSID(Threads, task_two, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Threads/thread_manager.cpp b/ACE/examples/Threads/thread_manager.cpp index 7b3fb230fd3..573b61bc5cb 100644 --- a/ACE/examples/Threads/thread_manager.cpp +++ b/ACE/examples/Threads/thread_manager.cpp @@ -11,7 +11,7 @@ #include "ace/Thread_Manager.h" #include "ace/Signal.h" -ACE_RCSID(Threads, thread_manager, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Threads/thread_pool.cpp b/ACE/examples/Threads/thread_pool.cpp index 62d13ebc279..5aaa1d2de0b 100644 --- a/ACE/examples/Threads/thread_pool.cpp +++ b/ACE/examples/Threads/thread_pool.cpp @@ -18,7 +18,7 @@ #include "ace/Task.h" #include "ace/Service_Config.h" -ACE_RCSID(Threads, thread_pool, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Threads/token.cpp b/ACE/examples/Threads/token.cpp index c3513724cdc..4b9776ff8c6 100644 --- a/ACE/examples/Threads/token.cpp +++ b/ACE/examples/Threads/token.cpp @@ -7,7 +7,7 @@ #include "ace/Task.h" #include "ace/OS_NS_time.h" -ACE_RCSID(Threads, token, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Threads/tss1.cpp b/ACE/examples/Threads/tss1.cpp index 23011071722..799e7b240eb 100644 --- a/ACE/examples/Threads/tss1.cpp +++ b/ACE/examples/Threads/tss1.cpp @@ -25,7 +25,7 @@ #include "ace/Service_Config.h" #include "ace/Task.h" -ACE_RCSID(Threads, tss1, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Threads/tss2.cpp b/ACE/examples/Threads/tss2.cpp index 0c7fb9ac3ee..e9110a643a1 100644 --- a/ACE/examples/Threads/tss2.cpp +++ b/ACE/examples/Threads/tss2.cpp @@ -25,7 +25,7 @@ #include "TSS_Obj.h" #include "TSS_Task.h" -ACE_RCSID(Threads, tss2, "$Id$") + #if defined (ACE_HAS_THREADS) diff --git a/ACE/examples/Threads/wfmo.cpp b/ACE/examples/Threads/wfmo.cpp index d7336d4e831..50bf7606365 100644 --- a/ACE/examples/Threads/wfmo.cpp +++ b/ACE/examples/Threads/wfmo.cpp @@ -12,7 +12,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_main.h" -ACE_RCSID(Threads, wfmo, "$Id$") + #if defined (ACE_WIN32) diff --git a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp index 5e4058feae6..2fc564e95cf 100644 --- a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp +++ b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp @@ -21,7 +21,7 @@ #include "Async_Timer_Queue_Test.h" -ACE_RCSID(Timer_Queue, Async_Timer_Queue_Test, "$Id$") + // Hook method that is called to handle the expiration of a timer. int diff --git a/ACE/examples/Timer_Queue/Driver.cpp b/ACE/examples/Timer_Queue/Driver.cpp index f290b17b053..e14ab85e533 100644 --- a/ACE/examples/Timer_Queue/Driver.cpp +++ b/ACE/examples/Timer_Queue/Driver.cpp @@ -23,7 +23,7 @@ #include "ace/Auto_Ptr.h" #include "Driver.h" -ACE_RCSID(Timer_Queue, Driver, "$Id$") + // constructor diff --git a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp index 9d1f59e57cc..ba8b86d649d 100644 --- a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp +++ b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp @@ -22,7 +22,7 @@ #include "Driver.h" #include "Reactor_Timer_Queue_Test.h" -ACE_RCSID(Timer_Queue, Reactor_Timer_Queue_Test, "$Id$") + void Reactor_Timer_Handler::set_timer_id (long tid) diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp index 4ca5ab2466e..33b4d4a1b70 100644 --- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp +++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp @@ -25,7 +25,7 @@ #include "ace/Condition_T.h" #include "ace/Thread_Mutex.h" -ACE_RCSID(Timer_Queue, Thread_Timer_Queue_Test, "$Id$") + // Administrivia methods... Handler::Handler(const ACE_Time_Value &expiration_time) diff --git a/ACE/examples/Web_Crawler/Command_Processor.cpp b/ACE/examples/Web_Crawler/Command_Processor.cpp index dafdd5e7ff0..ae03d574184 100644 --- a/ACE/examples/Web_Crawler/Command_Processor.cpp +++ b/ACE/examples/Web_Crawler/Command_Processor.cpp @@ -7,7 +7,7 @@ #include "Command_Processor.h" #include "URL_Visitor.h" -ACE_RCSID(Web_Crawler, Command_Processor, "$Id$") + Command::~Command (void) { diff --git a/ACE/examples/Web_Crawler/HTTP_URL.cpp b/ACE/examples/Web_Crawler/HTTP_URL.cpp index 44ceea324d4..c5b458005d7 100644 --- a/ACE/examples/Web_Crawler/HTTP_URL.cpp +++ b/ACE/examples/Web_Crawler/HTTP_URL.cpp @@ -7,7 +7,7 @@ #include "Options.h" #include "HTTP_URL.h" -ACE_RCSID(Web_Crawler, HTTP_URL, "$Id$") + const ACE_URL_Addr & HTTP_URL::url_addr (void) const diff --git a/ACE/examples/Web_Crawler/Iterators.cpp b/ACE/examples/Web_Crawler/Iterators.cpp index a79a30c1eb1..2f0da8f1c73 100644 --- a/ACE/examples/Web_Crawler/Iterators.cpp +++ b/ACE/examples/Web_Crawler/Iterators.cpp @@ -4,7 +4,7 @@ #include "Options.h" #include "Iterators.h" -ACE_RCSID(Web_Crawler, Iterators, "$Id$") + URL_Iterator::~URL_Iterator (void) { @@ -53,7 +53,7 @@ HTML_Body_Iterator::next (ACE_CString &url) int start_index = ACE_Utils::truncate_cast<int> ( buffer.find ('\"', href_index)); - + if (start_index <= 0) break; @@ -62,7 +62,7 @@ HTML_Body_Iterator::next (ACE_CString &url) int end_index = ACE_Utils::truncate_cast<int> ( buffer.find ('\"', start_index + 1)); - + if (end_index <= 0) break; diff --git a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp index 82e48b4d7e7..b2c345dcbc4 100644 --- a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp +++ b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp @@ -6,7 +6,7 @@ #include "Options.h" #include "Mem_Map_Stream.h" -ACE_RCSID(Web_Crawler, Mem_Map_Stream, "$Id$") + ACE_SOCK_Stream & Mem_Map_Stream::stream (void) @@ -69,7 +69,7 @@ Mem_Map_Stream::recv (size_t &len) if (this->eof () && this->grow_file_and_remap () == -1) return 0; - + const char *s = this->recv_pos_; ACE_OFF_T olen = static_cast <ACE_OFF_T> (len); this->seek (olen, SEEK_CUR); @@ -84,7 +84,7 @@ Mem_Map_Stream::recv_len (void) const } const char * -Mem_Map_Stream::peek_str (size_t offset, +Mem_Map_Stream::peek_str (size_t offset, size_t size) { // We will iterate if the size of <offset> is large. @@ -128,7 +128,7 @@ Mem_Map_Stream::seek (ACE_OFF_T offset, int whence) this->recv_pos_ - reinterpret_cast<char *> (this->mem_map_.addr ())); } -Mem_Map_Stream::Svc_Handler * +Mem_Map_Stream::Svc_Handler * Mem_Map_Stream::svc_handler (void) { return this->svc_handler_; @@ -139,9 +139,9 @@ int Mem_Map_Stream::open (STRAT_CONNECTOR *connector, const ACE_INET_Addr &addr) { - svc_handler_ = 0; + svc_handler_ = 0; - // Connect to the server at <addr>. If the handler has to be + // Connect to the server at <addr>. If the handler has to be // connected to the server again, the Caching strategy takes care // and uses the same connection. if (connector->connect (svc_handler_, @@ -178,7 +178,7 @@ Mem_Map_Stream::open (STRAT_CONNECTOR *connector, #endif // Initialize all the position pointers to 0. this->rewind (); - + return 0; } @@ -190,7 +190,7 @@ Mem_Map_Stream::grow_file_and_remap (void) // Copy the next chunk of bytes from the socket into the temporary // file. ACE_Time_Value tv (*OPTIONS::instance ()->timeout ()); - + ssize_t n = this->svc_handler_->peer ().recv_n (buf, sizeof buf, 0, diff --git a/ACE/examples/Web_Crawler/Options.cpp b/ACE/examples/Web_Crawler/Options.cpp index d999e841d66..faedf9a660d 100644 --- a/ACE/examples/Web_Crawler/Options.cpp +++ b/ACE/examples/Web_Crawler/Options.cpp @@ -6,9 +6,9 @@ #include "Options.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Web_Crawler, Options, "$Id$") -int + +int Options::parse_args (int argc, ACE_TCHAR *argv[]) { //FUZZ: disable check_for_lack_ACE_OS @@ -26,7 +26,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) this->verbose_ = 0; this->order_ = ACE_TEXT ("FIFO"); this->port_no_ = ACE_DEFAULT_HTTP_PORT; - + // The default is to make this limit as large as possible. this->handle_limit_ = -1; @@ -97,7 +97,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) return 0; } -int +int Options::port_no (void) const { return this->port_no_; @@ -174,7 +174,7 @@ Options::visitor (URL_Visitor *v) this->visitor_ = v; } -int +int Options::handle_limit (void) { return this->handle_limit_; diff --git a/ACE/examples/Web_Crawler/URL.cpp b/ACE/examples/Web_Crawler/URL.cpp index ce52ed892ad..3df8b54a248 100644 --- a/ACE/examples/Web_Crawler/URL.cpp +++ b/ACE/examples/Web_Crawler/URL.cpp @@ -2,7 +2,7 @@ #include "URL.h" -ACE_RCSID(Web_Crawler, URL, "$Id$") + Mem_Map_Stream & URL::stream (void) @@ -20,7 +20,7 @@ URL::reply_status (void) return this->reply_status_; } -void +void URL::reply_status (const URL_Status &rs) { this->reply_status_ = rs; @@ -32,7 +32,7 @@ URL::content_type (void) return this->content_type_; } -void +void URL::content_type (const ACE_CString &ct) { this->content_type_ = ct; diff --git a/ACE/examples/Web_Crawler/URL_Status.cpp b/ACE/examples/Web_Crawler/URL_Status.cpp index 35a57420593..79190a5f9f3 100644 --- a/ACE/examples/Web_Crawler/URL_Status.cpp +++ b/ACE/examples/Web_Crawler/URL_Status.cpp @@ -3,7 +3,7 @@ #include "URL_Status.h" -ACE_RCSID(Web_Crawler, URL_Status, "$Id$") + URL_Status::URL_Status (STATUS_CODE code) : status_ (code) diff --git a/ACE/examples/Web_Crawler/URL_Visitor.cpp b/ACE/examples/Web_Crawler/URL_Visitor.cpp index 2fc15322d22..1f93267efc2 100644 --- a/ACE/examples/Web_Crawler/URL_Visitor.cpp +++ b/ACE/examples/Web_Crawler/URL_Visitor.cpp @@ -5,7 +5,7 @@ #include "URL_Visitor.h" #include "Command_Processor.h" -ACE_RCSID(Web_Crawler, URL_Visitor, "$Id$") + URL_Processing_Strategy::URL_Processing_Strategy (URL &url, URL_Iterator &iterator) diff --git a/ACE/examples/Web_Crawler/Web_Crawler.cpp b/ACE/examples/Web_Crawler/Web_Crawler.cpp index 16639a38d73..a0913290ae4 100644 --- a/ACE/examples/Web_Crawler/Web_Crawler.cpp +++ b/ACE/examples/Web_Crawler/Web_Crawler.cpp @@ -4,7 +4,7 @@ #include "URL_Visitor_Factory.h" #include "Web_Crawler.h" -ACE_RCSID(Web_Crawler, Web_Crawler, "$Id$") + Web_Crawler::~Web_Crawler (void) { @@ -34,7 +34,7 @@ Web_Crawler::open (int argc, ACE_TCHAR *argv[]) int Web_Crawler::run (void) -{ +{ // Make the appropriate <URL_Visitor>. Auto_Destroyer<URL_Visitor> visitor (this->url_visitor_factory_->make_visitor ()); @@ -67,25 +67,25 @@ Web_Crawler::run (void) OPTIONS::instance()->port_no ()), //KIRTHIKA 0); Auto_Destroyer<ACE_URL_Addr> url_addr_ptr (url_addr); - + HTTP_URL *http_url; ACE_NEW_RETURN (http_url, HTTP_URL (**url_addr_ptr), 0); Auto_Destroyer<HTTP_URL> http_url_ptr (http_url); - + URL_Command *url_command; ACE_NEW_RETURN (url_command, URL_Command (*http_url_ptr), 0); // Auto_Destroyer<URL_Command> url_command_ptr (url_command); - + if (cp->insert (url_command) != 0) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "insert"), -1); - + if (cp->execute () != 0) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "execute"), diff --git a/ACE/examples/Web_Crawler/main.cpp b/ACE/examples/Web_Crawler/main.cpp index 1735f811b78..93d3674d011 100644 --- a/ACE/examples/Web_Crawler/main.cpp +++ b/ACE/examples/Web_Crawler/main.cpp @@ -22,7 +22,7 @@ #include "Web_Crawler.h" #include "Options.h" -ACE_RCSID(Web_Crawler, main, "$Id$") + void sig_handler (int) { @@ -31,14 +31,14 @@ void sig_handler (int) ACE_OS::abort (); } -int +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { #if !defined (ACE_HAS_WINCE) ACE_Sig_Action sa ((ACE_SignalHandler) sig_handler, SIGFPE); #endif Web_Crawler crawler; - + if (crawler.open (argc, argv) == -1) return 1; else if (crawler.run () == -1) |