diff options
| -rw-r--r-- | ChangeLog | 30 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 30 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 30 | ||||
| -rw-r--r-- | THANKS | 4 | ||||
| -rw-r--r-- | ace/CDR_Stream.h | 2 | ||||
| -rw-r--r-- | ace/Connector.cpp | 10 | ||||
| -rw-r--r-- | ace/Log_Record.cpp | 40 | ||||
| -rw-r--r-- | ace/Map_T.h | 10 | ||||
| -rw-r--r-- | ace/Map_T.i | 2 | ||||
| -rw-r--r-- | ace/OS.i | 2 | ||||
| -rw-r--r-- | ace/config-cygwin32.h | 1 | ||||
| -rw-r--r-- | ace/config-g++-common.h | 6 | ||||
| -rw-r--r-- | examples/Connection/non_blocking/CPP-acceptor.cpp | 34 | ||||
| -rw-r--r-- | examples/Connection/non_blocking/CPP-connector.cpp | 32 | ||||
| -rw-r--r-- | examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp | 24 |
15 files changed, 178 insertions, 79 deletions
diff --git a/ChangeLog b/ChangeLog index 30df22e5f2a..0f21adc0f21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,33 @@ +Sun Jul 22 08:19:43 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Log_Record.cpp (priority_names_): Added commas after the + 'ACE_LIB_TEXT ("LM_UNK(04000)")' lines. Thanks to Steve Harris + <harris_s@ociweb.com> for reporting this. + +Sat Jul 21 19:56:08 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Map_T.{h,i}: Made current_value() a const member function. + Thanks to Johnny Willemsen for reporting this. + +Fri Jul 20 10:16:46 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Connector.cpp (create_AST): Replaced some calls to + sh->get_handle () with a cached value of handle. This fixes a + bug with gcc 2.96 on Tornado 2.1/VxWorks for SuperH. Thanks to + Frank Wolf <fwolf@gum.de> for reporting this. + + * examples/Connection/non_blocking/CPP-acceptor.cpp: + * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp: + * examples/Connection/non_blocking/CPP-connector.cpp: Changed the + SH macro to SVH to avoid clashes with a macro in VxWorks. + Thanks to Frank Wolf <fwolf@gum.de> for reporting this. + +Thu Jul 19 06:55:07 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/config-g++-common.h: Version 2.96 of g++ on VxWorks + is missing auto_ptr, so let's add the ACE_LACK_AUTO_PTR flag + there. Thanks to Frank Wolf for suggesting this. + Fri Jul 20 09:47:38 2001 Nanbor Wang <nanbor@cs.wustl.edu> * ace/Log_Msg.cpp: Fixed WinCE errors. CE does not support diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 30df22e5f2a..0f21adc0f21 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,33 @@ +Sun Jul 22 08:19:43 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Log_Record.cpp (priority_names_): Added commas after the + 'ACE_LIB_TEXT ("LM_UNK(04000)")' lines. Thanks to Steve Harris + <harris_s@ociweb.com> for reporting this. + +Sat Jul 21 19:56:08 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Map_T.{h,i}: Made current_value() a const member function. + Thanks to Johnny Willemsen for reporting this. + +Fri Jul 20 10:16:46 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Connector.cpp (create_AST): Replaced some calls to + sh->get_handle () with a cached value of handle. This fixes a + bug with gcc 2.96 on Tornado 2.1/VxWorks for SuperH. Thanks to + Frank Wolf <fwolf@gum.de> for reporting this. + + * examples/Connection/non_blocking/CPP-acceptor.cpp: + * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp: + * examples/Connection/non_blocking/CPP-connector.cpp: Changed the + SH macro to SVH to avoid clashes with a macro in VxWorks. + Thanks to Frank Wolf <fwolf@gum.de> for reporting this. + +Thu Jul 19 06:55:07 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/config-g++-common.h: Version 2.96 of g++ on VxWorks + is missing auto_ptr, so let's add the ACE_LACK_AUTO_PTR flag + there. Thanks to Frank Wolf for suggesting this. + Fri Jul 20 09:47:38 2001 Nanbor Wang <nanbor@cs.wustl.edu> * ace/Log_Msg.cpp: Fixed WinCE errors. CE does not support diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 30df22e5f2a..0f21adc0f21 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,33 @@ +Sun Jul 22 08:19:43 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Log_Record.cpp (priority_names_): Added commas after the + 'ACE_LIB_TEXT ("LM_UNK(04000)")' lines. Thanks to Steve Harris + <harris_s@ociweb.com> for reporting this. + +Sat Jul 21 19:56:08 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Map_T.{h,i}: Made current_value() a const member function. + Thanks to Johnny Willemsen for reporting this. + +Fri Jul 20 10:16:46 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Connector.cpp (create_AST): Replaced some calls to + sh->get_handle () with a cached value of handle. This fixes a + bug with gcc 2.96 on Tornado 2.1/VxWorks for SuperH. Thanks to + Frank Wolf <fwolf@gum.de> for reporting this. + + * examples/Connection/non_blocking/CPP-acceptor.cpp: + * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp: + * examples/Connection/non_blocking/CPP-connector.cpp: Changed the + SH macro to SVH to avoid clashes with a macro in VxWorks. + Thanks to Frank Wolf <fwolf@gum.de> for reporting this. + +Thu Jul 19 06:55:07 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/config-g++-common.h: Version 2.96 of g++ on VxWorks + is missing auto_ptr, so let's add the ACE_LACK_AUTO_PTR flag + there. Thanks to Frank Wolf for suggesting this. + Fri Jul 20 09:47:38 2001 Nanbor Wang <nanbor@cs.wustl.edu> * ace/Log_Msg.cpp: Fixed WinCE errors. CE does not support @@ -114,7 +114,7 @@ Greg Baker <GBaker@p01.az15m.iac.honeywell.com> Alexandre Karev <karev@vxcern.cern.ch> Pramod Kumar Singh <pramod@saturn.miel.mot.com> Bryon Rigg <bryon_rigg@mail.telecorpsys.com> -Brad Brown <bbrown@rdxsunhost.aud.alcatel.com> +Brad Brown <Brad.A.Brown@usa.alcatel.com> Patty Genualdi <genualdp@agcs.com> Eshel Liran <liran@bimacs.cs.biu.ac.il> Mick Adams <eeimas@eei.ericsson.se> @@ -1293,6 +1293,8 @@ Wilfried Reinoehl <Wilfried.Reinoehl@WiredMinds.de> Sangeetha Ramadurai <Sangeetha.Ramadurai@geind.ge.com> Victor Chernenko <v_chernenko@hotmail.com> Frank Wolf <fwolf@gum.de> +Christophe Galerne <christophgalerne@earthlink.net> +Steve Harris <harris_s@ociweb.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h index 89a1984e949..e97565ce787 100644 --- a/ace/CDR_Stream.h +++ b/ace/CDR_Stream.h @@ -728,7 +728,7 @@ public: void reset (const ACE_Message_Block *data, int byte_order); - /// Steal the contents from the currect CDR. + /// Steal the contents from the current CDR. ACE_Message_Block *steal_contents (void); /// Steal the contents of <cdr> and make a shallow copy into this diff --git a/ace/Connector.cpp b/ace/Connector.cpp index 56c24aa0fb3..1ffbfcc2498 100644 --- a/ace/Connector.cpp +++ b/ace/Connector.cpp @@ -559,11 +559,12 @@ ACE_Connector<SVH, PR_CO_2>::create_AST (SVH *sh, const ACE_Synch_Options &synch_options) { ACE_TRACE ("ACE_Connector<SVH, PR_CO_2>::create_AST"); + ACE_HANDLE handle = sh->get_handle (); AST *ast; ACE_NEW_RETURN (ast, AST (sh, - sh->get_handle (), + handle, synch_options.arg (), -1), -1); @@ -571,10 +572,9 @@ ACE_Connector<SVH, PR_CO_2>::create_AST (SVH *sh, ACE_Reactor_Mask mask = ACE_Event_Handler::CONNECT_MASK; // Bind ACE_Svc_Tuple with the ACE_HANDLE we're trying to connect. - if (this->handler_map_.bind (sh->get_handle (), - ast) == -1) + if (this->handler_map_.bind (handle, ast) == -1) goto fail1; - else if (this->reactor ()->register_handler (sh->get_handle (), + else if (this->reactor ()->register_handler (handle, this, mask) == -1) goto fail2; @@ -609,7 +609,7 @@ fail3: (this, mask | ACE_Event_Handler::DONT_CALL); /* FALLTHRU */ fail2: - this->handler_map_.unbind (sh->get_handle ()); + this->handler_map_.unbind (handle); /* FALLTHRU */ fail1: diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp index b29d09e8993..4a95499f8ee 100644 --- a/ace/Log_Record.cpp +++ b/ace/Log_Record.cpp @@ -30,26 +30,26 @@ const ACE_TCHAR *ACE_Log_Record::priority_names_[] = ACE_LIB_TEXT ("LM_CRITICAL"), ACE_LIB_TEXT ("LM_ALERT"), ACE_LIB_TEXT ("LM_EMERGENCY"), - ACE_LIB_TEXT ("LM_UNK(04000)") - ACE_LIB_TEXT ("LM_UNK(010000)") - ACE_LIB_TEXT ("LM_UNK(020000)") - ACE_LIB_TEXT ("LM_UNK(040000)") - ACE_LIB_TEXT ("LM_UNK(0100000)") - ACE_LIB_TEXT ("LM_UNK(0200000)") - ACE_LIB_TEXT ("LM_UNK(0400000)") - ACE_LIB_TEXT ("LM_UNK(01000000)") - ACE_LIB_TEXT ("LM_UNK(02000000)") - ACE_LIB_TEXT ("LM_UNK(04000000)") - ACE_LIB_TEXT ("LM_UNK(010000000)") - ACE_LIB_TEXT ("LM_UNK(020000000)") - ACE_LIB_TEXT ("LM_UNK(040000000)") - ACE_LIB_TEXT ("LM_UNK(0100000000)") - ACE_LIB_TEXT ("LM_UNK(0200000000)") - ACE_LIB_TEXT ("LM_UNK(0400000000)") - ACE_LIB_TEXT ("LM_UNK(01000000000)") - ACE_LIB_TEXT ("LM_UNK(02000000000)") - ACE_LIB_TEXT ("LM_UNK(04000000000)") - ACE_LIB_TEXT ("LM_UNK(010000000000)") + ACE_LIB_TEXT ("LM_UNK(04000)"), + ACE_LIB_TEXT ("LM_UNK(010000)"), + ACE_LIB_TEXT ("LM_UNK(020000)"), + ACE_LIB_TEXT ("LM_UNK(040000)"), + ACE_LIB_TEXT ("LM_UNK(0100000)"), + ACE_LIB_TEXT ("LM_UNK(0200000)"), + ACE_LIB_TEXT ("LM_UNK(0400000)"), + ACE_LIB_TEXT ("LM_UNK(01000000)"), + ACE_LIB_TEXT ("LM_UNK(02000000)"), + ACE_LIB_TEXT ("LM_UNK(04000000)"), + ACE_LIB_TEXT ("LM_UNK(010000000)"), + ACE_LIB_TEXT ("LM_UNK(020000000)"), + ACE_LIB_TEXT ("LM_UNK(040000000)"), + ACE_LIB_TEXT ("LM_UNK(0100000000)"), + ACE_LIB_TEXT ("LM_UNK(0200000000)"), + ACE_LIB_TEXT ("LM_UNK(0400000000)"), + ACE_LIB_TEXT ("LM_UNK(01000000000)"), + ACE_LIB_TEXT ("LM_UNK(02000000000)"), + ACE_LIB_TEXT ("LM_UNK(04000000000)"), + ACE_LIB_TEXT ("LM_UNK(010000000000)"), ACE_LIB_TEXT ("LM_UNK(020000000000)") }; diff --git a/ace/Map_T.h b/ace/Map_T.h index 49697e69529..396d2ae0e6e 100644 --- a/ace/Map_T.h +++ b/ace/Map_T.h @@ -64,7 +64,7 @@ public: int operator () (T &t); /// Returns the current value. - T& current_value (void); + T& current_value (void) const; protected: @@ -555,7 +555,7 @@ public: /// Initialize with the <ACE_DEFAULT_MAP_SIZE>. ACE_Map_Impl (ACE_Allocator *alloc = 0); - /// Initialize with <size> entries. The <size> parameter is ignore + /// Initialize with <size> entries. The <size> parameter is ignored /// by maps for which an initialize size does not make sense. ACE_Map_Impl (size_t size, ACE_Allocator *alloc = 0); @@ -837,7 +837,7 @@ public: /// Initialize with the <ACE_DEFAULT_MAP_SIZE>. ACE_Active_Map_Manager_Adapter (ACE_Allocator *alloc = 0); - /// Initialize with <size> entries. The <size> parameter is ignore + /// Initialize with <size> entries. The <size> parameter is ignored /// by maps for which an initialize size does not make sense. ACE_Active_Map_Manager_Adapter (size_t size, ACE_Allocator *alloc = 0); @@ -1131,7 +1131,7 @@ public: /// Initialize with the <ACE_DEFAULT_MAP_SIZE>. ACE_Hash_Map_Manager_Ex_Adapter (ACE_Allocator *alloc = 0); - /// Initialize with <size> entries. The <size> parameter is ignore + /// Initialize with <size> entries. The <size> parameter is ignored /// by maps for which an initialize size does not make sense. ACE_Hash_Map_Manager_Ex_Adapter (size_t size, ACE_Allocator *alloc = 0); @@ -1417,7 +1417,7 @@ public: /// Initialize with the <ACE_DEFAULT_MAP_SIZE>. ACE_Map_Manager_Adapter (ACE_Allocator *alloc = 0); - /// Initialize with <size> entries. The <size> parameter is ignore + /// Initialize with <size> entries. The <size> parameter is ignored /// by maps for which an initialize size does not make sense. ACE_Map_Manager_Adapter (size_t size, ACE_Allocator *alloc = 0); diff --git a/ace/Map_T.i b/ace/Map_T.i index 11c67049a33..62a028b55dd 100644 --- a/ace/Map_T.i +++ b/ace/Map_T.i @@ -20,7 +20,7 @@ ACE_Incremental_Key_Generator<T>::operator() (T &t) } template <class T> ACE_INLINE T & -ACE_Incremental_Key_Generator<T>::current_value (void) +ACE_Incremental_Key_Generator<T>::current_value (void) const { return this->t_; } @@ -9272,7 +9272,7 @@ ACE_OS::write (ACE_HANDLE handle, const void *buf, size_t nbyte) ACE_UNUSED_ARG (nbyte); ACE_NOTSUP_RETURN (-1); # else - if(::write_f(handle, (void *) buf, nbyte) == 0) + if(::write_f (handle, (void *) buf, nbyte) == 0) return (ssize_t) nbyte; else return -1; diff --git a/ace/config-cygwin32.h b/ace/config-cygwin32.h index ec433dc1e17..7470a180b43 100644 --- a/ace/config-cygwin32.h +++ b/ace/config-cygwin32.h @@ -11,6 +11,7 @@ #include "ace/config-cygwin32-common.h" #define ACE_HAS_AUTOMATIC_INIT_FINI +// #define _CLOCKID_T #include "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h index b367c2fffcb..5ae9686885b 100644 --- a/ace/config-g++-common.h +++ b/ace/config-g++-common.h @@ -39,6 +39,12 @@ # define ACE_LACKS_PLACEMENT_OPERATOR_DELETE # endif /* __GNUC__ >= 2.91 */ +# if (defined (VXWORKS) && __GNUC__ == 2 && __GNUC_MINOR__ == 96) +// This is for inofficial(!) gcc2.96 shipped with Tornado2.1.0 for +// Hitachi SuperH platform. +# define ACE_LACKS_AUTO_PTR +# endif /* (defined (VXWORKS) && __GNUC__ == 2 && __GNUC_MINOR__ == 96) */ + #if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 97 ) // gcc 2.97 and higher use libstdc++-v3 and require // the use of the std namespace for using iostreams diff --git a/examples/Connection/non_blocking/CPP-acceptor.cpp b/examples/Connection/non_blocking/CPP-acceptor.cpp index fff8c2c1f6f..9e47943cc4d 100644 --- a/examples/Connection/non_blocking/CPP-acceptor.cpp +++ b/examples/Connection/non_blocking/CPP-acceptor.cpp @@ -14,7 +14,7 @@ ACE_RCSID(non_blocking, CPP_acceptor, "$Id$") #define PR_AC_1 ACE_PEER_ACCEPTOR_1 #define PR_AC_2 ACE_PEER_ACCEPTOR_2 #define PR_AD ACE_PEER_STREAM_ADDR -#define SH SVC_HANDLER +#define SVH SVC_HANDLER template <PR_ST_1> Svc_Handler<PR_ST_2>::Svc_Handler (ACE_Reactor *r) @@ -104,8 +104,8 @@ Svc_Handler<PR_ST_2>::handle_timeout (const ACE_Time_Value &, return 0; } -template <class SH, PR_AC_1> int -IPC_Server<SH, PR_AC_2>::init (int argc, char *argv[]) +template <class SVH, PR_AC_1> int +IPC_Server<SVH, PR_AC_2>::init (int argc, char *argv[]) { const char *local_addr = argc > 1 ? argv[1] @@ -157,25 +157,25 @@ IPC_Server<SH, PR_AC_2>::init (int argc, char *argv[]) return 0; } -template <class SH, PR_AC_1> -IPC_Server<SH, PR_AC_2>::IPC_Server (void) +template <class SVH, PR_AC_1> +IPC_Server<SVH, PR_AC_2>::IPC_Server (void) : done_handler_ (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop)) { } -template <class SH, PR_AC_1> int -IPC_Server<SH, PR_AC_2>::fini (void) +template <class SVH, PR_AC_1> int +IPC_Server<SVH, PR_AC_2>::fini (void) { return 0; } -template <class SH, PR_AC_1> -IPC_Server<SH, PR_AC_2>::~IPC_Server (void) +template <class SVH, PR_AC_1> +IPC_Server<SVH, PR_AC_2>::~IPC_Server (void) { } -template <class SH, PR_AC_1> int -IPC_Server<SH, PR_AC_2>::handle_close (ACE_HANDLE handle, +template <class SVH, PR_AC_1> int +IPC_Server<SVH, PR_AC_2>::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask mask) { ACE_UNUSED_ARG (handle); @@ -188,8 +188,8 @@ IPC_Server<SH, PR_AC_2>::handle_close (ACE_HANDLE handle, // Run the interative service. -template <class SH, PR_AC_1> int -IPC_Server<SH, PR_AC_2>::svc (void) +template <class SVH, PR_AC_1> int +IPC_Server<SVH, PR_AC_2>::svc (void) { char buf[BUFSIZ]; @@ -209,9 +209,9 @@ IPC_Server<SH, PR_AC_2>::svc (void) while (ACE_Reactor::event_loop_done () == 0) { - SH sh (this->reactor ()); + SVH sh (this->reactor ()); - // Create a new <SH> endpoint, which performs all processing in + // Create a new <SVH> endpoint, which performs all processing in // its <open> method (note no automatic restart if errno == // EINTR). @@ -232,7 +232,7 @@ IPC_Server<SH, PR_AC_2>::svc (void) this->acceptor ().get_handle ())); } - // <SH>'s destructor closes the stream implicitly but the + // <SVH>'s destructor closes the stream implicitly but the // listening endpoint stays open. } @@ -245,5 +245,5 @@ IPC_Server<SH, PR_AC_2>::svc (void) #undef PR_AC_1 #undef PR_AC_2 #undef PR_AD -#undef SH +#undef SVH #endif /* CPP_ACCEPTOR_C */ diff --git a/examples/Connection/non_blocking/CPP-connector.cpp b/examples/Connection/non_blocking/CPP-connector.cpp index 04f9dacc5ce..af4bc3ab8dd 100644 --- a/examples/Connection/non_blocking/CPP-connector.cpp +++ b/examples/Connection/non_blocking/CPP-connector.cpp @@ -12,7 +12,7 @@ ACE_RCSID(non_blocking, CPP_connector, "$Id$") #define PR_CO_1 ACE_PEER_CONNECTOR_1 #define PR_CO_2 ACE_PEER_CONNECTOR_2 #define PR_AD ACE_PEER_CONNECTOR_ADDR -#define SH SVC_HANDLER +#define SVH SVC_HANDLER template <PR_ST_1> Peer_Handler<PR_ST_2>::Peer_Handler (ACE_Reactor *r) @@ -201,8 +201,8 @@ Peer_Handler<PR_ST_2>::handle_close (ACE_HANDLE h, return 0; } -template <class SH, PR_CO_1> int -IPC_Client<SH, PR_CO_2>::svc (void) +template <class SVH, PR_CO_1> int +IPC_Client<SVH, PR_CO_2>::svc (void) { if (this->reactor ()) ACE_Reactor::run_event_loop (); @@ -210,20 +210,20 @@ IPC_Client<SH, PR_CO_2>::svc (void) return 0; } -template <class SH, PR_CO_1> int -IPC_Client<SH, PR_CO_2>::fini (void) +template <class SVH, PR_CO_1> int +IPC_Client<SVH, PR_CO_2>::fini (void) { return 0; } -template <class SH, PR_CO_1> -IPC_Client<SH, PR_CO_2>::IPC_Client (void) +template <class SVH, PR_CO_1> +IPC_Client<SVH, PR_CO_2>::IPC_Client (void) : done_handler_ (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop)) { } -template <class SH, PR_CO_1> int -IPC_Client<SH, PR_CO_2>::init (int argc, char *argv[]) +template <class SVH, PR_CO_1> int +IPC_Client<SVH, PR_CO_2>::init (int argc, char *argv[]) { // Call down to the CONNECTOR's open() method to do the // initialization. @@ -248,9 +248,9 @@ IPC_Client<SH, PR_CO_2>::init (int argc, char *argv[]) this->options_.set (ACE_Synch_Options::USE_REACTOR, timeout); - SH *sh; + SVH *sh; ACE_NEW_RETURN (sh, - SH (this->reactor ()), + SVH (this->reactor ()), -1); // Connect to the peer. @@ -266,13 +266,13 @@ IPC_Client<SH, PR_CO_2>::init (int argc, char *argv[]) return 0; } -template <class SH, PR_CO_1> -IPC_Client<SH, PR_CO_2>::~IPC_Client (void) +template <class SVH, PR_CO_1> +IPC_Client<SVH, PR_CO_2>::~IPC_Client (void) { } -template <class SH, PR_CO_1> int -IPC_Client<SH, PR_CO_2>::handle_close (ACE_HANDLE h, +template <class SVH, PR_CO_1> int +IPC_Client<SVH, PR_CO_2>::handle_close (ACE_HANDLE h, ACE_Reactor_Mask) { if (h == ACE_INVALID_HANDLE) @@ -297,5 +297,5 @@ IPC_Client<SH, PR_CO_2>::handle_close (ACE_HANDLE h, #undef PR_CO_1 #undef PR_CO_2 #undef PR_AD -#undef SH +#undef SVH #endif /* CPP_CONNECTOR_C */ diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp index 3a9da3d5f94..00c75f552bd 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp +++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp @@ -17,25 +17,25 @@ ACE_RCSID(server, Handle_Thr_Stream, "$Id$") #endif /* __ACE_INLINE__ */ // Shorthand names. -#define SH SVC_HANDLER +#define SVH SVC_HANDLER #define PR_AC_1 ACE_PEER_ACCEPTOR_1 #define PR_AC_2 ACE_PEER_ACCEPTOR_2 #define PR_ST_1 ACE_PEER_STREAM_1 #define PR_ST_2 ACE_PEER_STREAM_2 -template <class SH, PR_AC_1> -Handle_Thr_Acceptor<SH, PR_AC_2>::~Handle_Thr_Acceptor (void) +template <class SVH, PR_AC_1> +Handle_Thr_Acceptor<SVH, PR_AC_2>::~Handle_Thr_Acceptor (void) { } -template <class SH, PR_AC_1> -Handle_Thr_Acceptor<SH, PR_AC_2>::Handle_Thr_Acceptor (void) +template <class SVH, PR_AC_1> +Handle_Thr_Acceptor<SVH, PR_AC_2>::Handle_Thr_Acceptor (void) : thr_flags_ (THR_DETACHED | THR_NEW_LWP) { } -template <class SH, PR_AC_1> int -Handle_Thr_Acceptor<SH, PR_AC_2>::info (char **strp, +template <class SVH, PR_AC_1> int +Handle_Thr_Acceptor<SVH, PR_AC_2>::info (char **strp, size_t length) const { char buf[BUFSIZ]; @@ -54,8 +54,8 @@ Handle_Thr_Acceptor<SH, PR_AC_2>::info (char **strp, return ACE_OS::strlen (buf); } -template <class SH, PR_AC_1> int -Handle_Thr_Acceptor<SH, PR_AC_2>::init (int argc, char *argv[]) +template <class SVH, PR_AC_1> int +Handle_Thr_Acceptor<SVH, PR_AC_2>::init (int argc, char *argv[]) { ACE_INET_Addr local_addr (ACE_DEFAULT_THR_PORT); int n_threads = ACE_DEFAULT_THREADS; @@ -93,8 +93,8 @@ Handle_Thr_Acceptor<SH, PR_AC_2>::init (int argc, char *argv[]) return 0; } -template <class SH, PR_AC_1> int -Handle_Thr_Acceptor<SH, PR_AC_2>::fini (void) +template <class SVH, PR_AC_1> int +Handle_Thr_Acceptor<SVH, PR_AC_2>::fini (void) { return ACE_Reactor::instance ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK); @@ -161,7 +161,7 @@ CLI_Stream<PR_ST_2>::svc (void) return 0; } -#undef SH +#undef SVH #undef PR_AC_1 #undef PR_AC_2 #undef PR_ST_1 |