diff options
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | tests/IOStream_Test.cpp | 19 | ||||
| -rw-r--r-- | tests/Simple_Message_Block_Test.cpp | 10 |
3 files changed, 19 insertions, 11 deletions
@@ -508,6 +508,7 @@ Kevin Martindale <kevin_martindale@stortek.com> Luis Lopes <llopes@tick.rcc.Ryerson.CA> Adrian Salt <acsalt@magi.com> Hongbo Xu <hxu@mas.co.nz> +Michael Hartman <c62nt57@ibx.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson and is now at ObjectSpace. Paul devised the recursive diff --git a/tests/IOStream_Test.cpp b/tests/IOStream_Test.cpp index e41a95e45d7..be0cfc1c683 100644 --- a/tests/IOStream_Test.cpp +++ b/tests/IOStream_Test.cpp @@ -332,7 +332,7 @@ spawn (void) ACE_SOCK_Acceptor acceptor; if (acceptor.open ((const ACE_INET_Addr &) ACE_Addr::sap_any) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "open"), -1)); + ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "open"), -1); #if defined (ACE_HAS_THREADS) else if (ACE_Service_Config::thr_mgr ()->spawn (ACE_THR_FUNC (server), &acceptor, @@ -351,13 +351,15 @@ spawn (void) ACE_ERROR ((LM_ERROR, "%p\n%a", "fork failed")); ACE_OS::_exit (-1); case 0: // In child - ACE_INET_Addr server_addr; - - if (acceptor.get_local_addr (server_addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "get_local_addr"), -1); - else - client ((void *) &server_addr); - break; + { + ACE_INET_Addr server_addr; + + if (acceptor.get_local_addr (server_addr) == -1) + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "get_local_addr"), -1); + else + client ((void *) &server_addr); + break; + } default: // In parent server (&acceptor); @@ -370,6 +372,7 @@ spawn (void) "threads *and* processes not supported on this platform\n%"), -1); #endif /* ACE_HAS_THREADS */ + return 0; } int diff --git a/tests/Simple_Message_Block_Test.cpp b/tests/Simple_Message_Block_Test.cpp index 7686f076a91..378af323a28 100644 --- a/tests/Simple_Message_Block_Test.cpp +++ b/tests/Simple_Message_Block_Test.cpp @@ -64,7 +64,7 @@ main (void) // Same set of tests but with locking_strategy set. { - ACE_Lock_Adapter <ACE_Mutex> mutex; + ACE_Lock_Adapter <ACE_SYNCH_MUTEX> mutex; ACE_Lock *lock = &mutex; { @@ -154,8 +154,8 @@ main (void) // Checks continuation of message blocks on the heap with two // different lock strategies - ACE_Lock_Adapter <ACE_Mutex> lock1; - ACE_Lock_Adapter <ACE_Mutex> lock2; + ACE_Lock_Adapter <ACE_SYNCH_MUTEX> lock1; + ACE_Lock_Adapter <ACE_SYNCH_MUTEX> lock2; ACE_Message_Block *mb1; ACE_Message_Block *mb2; @@ -173,3 +173,7 @@ main (void) ACE_END_TEST; return 0; } + +#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) +template class ACE_Lock_Adapter<ACE_SYNCH_MUTEX>; +#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ |