diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 12 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 12 | ||||
| -rw-r--r-- | THANKS | 3 | ||||
| -rw-r--r-- | examples/Reactor/Proactor/test_proactor.cpp | 7 | ||||
| -rw-r--r-- | examples/Reactor/Proactor/test_proactor2.cpp | 19 | ||||
| -rw-r--r-- | examples/Reactor/WFMO_Reactor/Talker.cpp | 9 | ||||
| -rw-r--r-- | tests/IOStream_Test.cpp | 2 |
8 files changed, 68 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index b376671b8a0..12c747d6600 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Fri Apr 26 07:42:12 2002 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/IOStream_Test.cpp: + Corrected the debug output string of server received so that + the formatting is the same as client received. Thanks to + Soeren Gerlach for reporting this. + + * examples/Reactor/WFMO_Reactor/Talker.cpp: + * examples/Reactor/Proactor/test_proactor.cpp: + * examples/Reactor/Proactor/test_proactor2.cpp: + Fixed BCB compile warnings + Thu Apr 25 17:34:31 2002 Steve Huston <shuston@riverace.com> * bin/auto_compile: When doing 'realclean', do them in reverse diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index b376671b8a0..12c747d6600 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,15 @@ +Fri Apr 26 07:42:12 2002 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/IOStream_Test.cpp: + Corrected the debug output string of server received so that + the formatting is the same as client received. Thanks to + Soeren Gerlach for reporting this. + + * examples/Reactor/WFMO_Reactor/Talker.cpp: + * examples/Reactor/Proactor/test_proactor.cpp: + * examples/Reactor/Proactor/test_proactor2.cpp: + Fixed BCB compile warnings + Thu Apr 25 17:34:31 2002 Steve Huston <shuston@riverace.com> * bin/auto_compile: When doing 'realclean', do them in reverse diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index b376671b8a0..12c747d6600 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,15 @@ +Fri Apr 26 07:42:12 2002 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/IOStream_Test.cpp: + Corrected the debug output string of server received so that + the formatting is the same as client received. Thanks to + Soeren Gerlach for reporting this. + + * examples/Reactor/WFMO_Reactor/Talker.cpp: + * examples/Reactor/Proactor/test_proactor.cpp: + * examples/Reactor/Proactor/test_proactor2.cpp: + Fixed BCB compile warnings + Thu Apr 25 17:34:31 2002 Steve Huston <shuston@riverace.com> * bin/auto_compile: When doing 'realclean', do them in reverse @@ -1046,7 +1046,7 @@ Caleb Epstein <cae@home.com> Bruno Marconi <bmarconi@jetstream.com> Ken Childress <kchildre@uccs.jpl.nasa.gov> Michael Kramer <kramer@ave.ac.agit.de> -Johnny Willemsen <johnny.willemsen@meco.nl> +Johnny Willemsen <jwillemsen@remedy.nl> Jonathan Astle <JNASTLE@dera.gov.uk> Javier Lopez Sanchez <jlopez@uida.es> Nir Drang <Nir@bandwiz.com> @@ -1507,6 +1507,7 @@ Ansgar Konermann <ansgar.konermann@inf.tu-dresden.de> Amir Kunst <amir@fats.co.il> Daniel Garrido <dgarrido@lcc.uma.es> Andy Alvarez <andy_alvarez@baxter.com> +Soeren Gerlach 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/examples/Reactor/Proactor/test_proactor.cpp b/examples/Reactor/Proactor/test_proactor.cpp index 2cb4b2caccc..41b7a39e647 100644 --- a/examples/Reactor/Proactor/test_proactor.cpp +++ b/examples/Reactor/Proactor/test_proactor.cpp @@ -318,6 +318,7 @@ public: int open (const ACE_TCHAR *host, u_short port); ACE_HANDLE handle (void) const; + void handle (ACE_HANDLE); protected: // These methods are called by the freamwork @@ -393,6 +394,12 @@ Sender::handle (void) const return this->stream_.get_handle (); } +void +Sender::handle (ACE_HANDLE handle) +{ + return this->stream_.set_handle (handle); +} + int Sender::open (const ACE_TCHAR *host, u_short port) diff --git a/examples/Reactor/Proactor/test_proactor2.cpp b/examples/Reactor/Proactor/test_proactor2.cpp index 5de8cf171c3..15fb6151ecd 100644 --- a/examples/Reactor/Proactor/test_proactor2.cpp +++ b/examples/Reactor/Proactor/test_proactor2.cpp @@ -368,11 +368,12 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result class Sender : public ACE_Handler { public: -Sender (void); -~Sender (void); -int open (const ACE_TCHAR *host, u_short port); -void close (); -ACE_HANDLE handle (void) const; + Sender (void); + ~Sender (void); + int open (const ACE_TCHAR *host, u_short port); + void close (); + ACE_HANDLE handle (void) const; + void handle (ACE_HANDLE); protected: // These methods are called by the freamwork @@ -430,6 +431,11 @@ ACE_HANDLE Sender::handle (void) const return this->stream_.get_handle (); } +void Sender::handle (ACE_HANDLE handle) +{ + return this->stream_.set_handle (handle); +} + int Sender::open (const ACE_TCHAR *host, u_short port) { // Initialize stuff @@ -754,6 +760,8 @@ int DisableSignal ( int SigNum ) "Error:(%P | %t):%p\n", "pthread_sigmask failed")); } +#else + ACE_UNUSED_ARG(SigNum); #endif return 1; @@ -791,7 +799,6 @@ int PrintSigMask () break ; } } - #endif return 0; } diff --git a/examples/Reactor/WFMO_Reactor/Talker.cpp b/examples/Reactor/WFMO_Reactor/Talker.cpp index 06840cf025c..f6bb6c900e2 100644 --- a/examples/Reactor/WFMO_Reactor/Talker.cpp +++ b/examples/Reactor/WFMO_Reactor/Talker.cpp @@ -178,6 +178,9 @@ public: // called by the ACE_Asynch_* classes when an ACE_INVALID_HANDLE is // passed to <open>. + void handle (ACE_HANDLE); + // Set the ACE_HANDLE value for this Handler. + virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); // We've been removed from the Reactor. @@ -380,6 +383,12 @@ Peer_Handler::handle (void) const return this->stream_.get_handle (); } +void +Peer_Handler::handle (ACE_HANDLE handle) +{ + return this->stream_.set_handle (handle); +} + // We've been removed from the Reactor. int Peer_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) diff --git a/tests/IOStream_Test.cpp b/tests/IOStream_Test.cpp index 3226f11a863..82fb0207b3d 100644 --- a/tests/IOStream_Test.cpp +++ b/tests/IOStream_Test.cpp @@ -399,7 +399,7 @@ server (void *arg = 0) client_handler >> i >> f1 >> l >> f2 >> d; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" (%P|%t) Server Received: int %d float %g long %d float %g double %g\n"), + ACE_TEXT (" (%P|%t) Server Received: int %d float %f long %d float %f double %f\n"), i, f1, (int) l, |