diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-10-21 23:45:56 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-10-21 23:45:56 +0000 |
commit | 4afa10f31117643fc014ec95c5dd9fa8d5231999 (patch) | |
tree | 832eb82647b2f1c202f579e151c9883ccef2aa05 | |
parent | 7421f4071f091ae70c135cd220c1b21bdc7e5c22 (diff) | |
download | ATCD-4afa10f31117643fc014ec95c5dd9fa8d5231999.tar.gz |
ChangeLogTag:Sun Oct 21 16:44:41 2001 Ossama Othman <ossama@uci.edu>
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
-rw-r--r-- | tests/Proactor_Test.cpp | 12 |
4 files changed, 30 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index c1168d38ea2..7c83fd1b7ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Oct 21 16:44:41 2001 Ossama Othman <ossama@uci.edu> + + * tests/Proactor_Test.cpp (disable_signal): + + Fixed warnings regarding a method that "hid" virtual function + with the same name, in addition to unused argument warnings. + Sun Oct 21 15:22:57 2001 Ossama Othman <ossama@uci.edu> * tests/Proactor_Test.cpp: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index c1168d38ea2..7c83fd1b7ad 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Sun Oct 21 16:44:41 2001 Ossama Othman <ossama@uci.edu> + + * tests/Proactor_Test.cpp (disable_signal): + + Fixed warnings regarding a method that "hid" virtual function + with the same name, in addition to unused argument warnings. + Sun Oct 21 15:22:57 2001 Ossama Othman <ossama@uci.edu> * tests/Proactor_Test.cpp: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index c1168d38ea2..7c83fd1b7ad 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Sun Oct 21 16:44:41 2001 Ossama Othman <ossama@uci.edu> + + * tests/Proactor_Test.cpp (disable_signal): + + Fixed warnings regarding a method that "hid" virtual function + with the same name, in addition to unused argument warnings. + Sun Oct 21 15:22:57 2001 Ossama Othman <ossama@uci.edu> * tests/Proactor_Test.cpp: diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp index c8c3ef80b59..75d02056e2c 100644 --- a/tests/Proactor_Test.cpp +++ b/tests/Proactor_Test.cpp @@ -653,7 +653,7 @@ public: static int activate (int num); static void stop (void); - int open (const ACE_TCHAR *host, u_short port); + int open_sender (const ACE_TCHAR *host, u_short port); protected: @@ -730,7 +730,7 @@ Sender::activate (int num) Sender (i), rc); - if (sender->open (host, port) == 0) + if (sender->open_sender (host, port) == 0) rc++; else delete sender; @@ -807,7 +807,7 @@ Sender::check_destroy (void) return 0; } -int Sender::open (const ACE_TCHAR *host, u_short port) +int Sender::open_sender (const ACE_TCHAR *host, u_short port) { // Initialize stuff // Connect to remote host @@ -1257,6 +1257,12 @@ disable_signal (int sigmin, int sigmax) ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error: (%P|%t):%p\n"), ACE_TEXT ("pthread_sigmask failed"))); + +#else + + ACE_UNUSED_ARG (sigmin); + ACE_UNUSED_ARG (sigmax); + #endif /* ACE_WIN32 */ return 1; |