diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1999-09-02 15:54:09 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1999-09-02 15:54:09 +0000 |
| commit | fe99a8e2af9e09b74e48a4ad5b27991b731279ab (patch) | |
| tree | b34e1ec4594afb49021da6d62684c77ed85da4fe | |
| parent | cdf5c42b6ac723eee666eae1af2f7c6b63d912dc (diff) | |
| download | ATCD-fe99a8e2af9e09b74e48a4ad5b27991b731279ab.tar.gz | |
ChangeLogTag:Thu Sep 2 10:41:14 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 5 | ||||
| -rw-r--r-- | tests/Cached_Accept_Conn_Test.cpp | 17 |
2 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 3193f3f0916..4ee5677a4ab 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,8 @@ +Thu Sep 2 10:41:14 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * tests/Cached_Accept_Conn_Test.cpp: Removed a "static" from + int debug so that the friggin' SunC++ compiler will link... + Thu Sep 2 08:56:39 1999 Jeff Parsons <parsons@cs.wustl.edu> * ace/CDR_Stream.h: diff --git a/tests/Cached_Accept_Conn_Test.cpp b/tests/Cached_Accept_Conn_Test.cpp index 3fd0f22bcd0..e040fdf18d6 100644 --- a/tests/Cached_Accept_Conn_Test.cpp +++ b/tests/Cached_Accept_Conn_Test.cpp @@ -46,6 +46,11 @@ ACE_RCSID(tests, Cached_Accept_Conn_Test, "$Id$") +#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 +USELIB("..\ace\aced.lib"); +//--------------------------------------------------------------------------- +#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) // The explicit instantiations are necessary with g++ 2.91.66 @@ -241,12 +246,9 @@ template class ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX> >; #endif /* CACHED_CONNECT_TEST */ -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - -static int debug = 0; +// For some strange reason this must *not* be static since otherwise +// certain versions of SunC++ will not link properly. +int debug = 0; Client_Svc_Handler::Client_Svc_Handler (ACE_Thread_Manager *t) : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (t) @@ -390,7 +392,8 @@ Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler (void) { // Close connections which are cached by explicitly purging the // connection cache maintained by the connector. - ACE_DEBUG ((LM_DEBUG, "Purging connections from Connection Cache...\n")); + ACE_DEBUG ((LM_DEBUG, + "Purging connections from Connection Cache...\n")); return this->caching_connect_strategy_.purge_connections (); } |