diff options
| author | Steve Huston <shuston@riverace.com> | 2004-11-02 23:40:11 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2004-11-02 23:40:11 +0000 |
| commit | f55dfa0dabbcbde3b0fc3a11782cbe7a138177df (patch) | |
| tree | 2626238903b250ff482e3f150cc0d09e3f2c35a0 | |
| parent | ff464bc1424547987f2b9ad7a51cfa20eea8e30c (diff) | |
| download | ATCD-f55dfa0dabbcbde3b0fc3a11782cbe7a138177df.tar.gz | |
ChangeLogTag:Tue Nov 2 18:37:22 2004 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | tests/SOCK_SEQPACK_SCTP_Test.cpp | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index e90be83fb8f..81d4d696699 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Nov 2 18:37:22 2004 Steve Huston <shuston@riverace.com> + + * tests/SOCK_SEQPACK_SCTP_Test.cpp: Reverted: + Tue Nov 2 10:15:01 2004 Chad Elliott <elliott_c@ociweb.com> + and changed the Server() and Client() return types from void* + to ACE_THR_FUNC_RETURN to fix compile errors. Also changed a + char to unsigned char to avoid a truncation warning. + Tue Nov 2 14:09:57 2004 Chad Elliott <elliott_c@ociweb.com> * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: diff --git a/tests/SOCK_SEQPACK_SCTP_Test.cpp b/tests/SOCK_SEQPACK_SCTP_Test.cpp index d70a9ee31e3..1e06ac6be73 100644 --- a/tests/SOCK_SEQPACK_SCTP_Test.cpp +++ b/tests/SOCK_SEQPACK_SCTP_Test.cpp @@ -45,7 +45,7 @@ typedef struct tdesc tdesc_t; #define SELECT_WIDTH(x) (x) #endif -void * +ACE_THR_FUNC_RETURN Server (void *arg) { ACE_SOCK_SEQPACK_Acceptor *AcceptorSocket = @@ -122,7 +122,7 @@ Server (void *arg) 0); } - char byte = BYTE_MESG; + unsigned char byte = BYTE_MESG; if (-1 == Stream.send_n (&byte, 1)) { @@ -169,7 +169,7 @@ Server (void *arg) return 0; } -void * +ACE_THR_FUNC_RETURN Client(void *arg) { ACE_Multihomed_INET_Addr *ServerAddr = @@ -310,7 +310,7 @@ spawn_test(bool ipv6_test) } #elif defined (ACE_HAS_THREADS) if (-1 == ACE_Thread_Manager::instance ()->spawn - (ACE_THR_FUNC (Server), + (Server, ACE_reinterpret_cast(void *, &AcceptorSocket), THR_NEW_LWP | THR_DETACHED)) { @@ -320,7 +320,7 @@ spawn_test(bool ipv6_test) } if (-1 == ACE_Thread_Manager::instance ()->spawn - (ACE_THR_FUNC (Client), + (Client, ACE_reinterpret_cast(void *, &ServerAddr), THR_NEW_LWP | THR_DETACHED)) { |