diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2009-05-11 15:21:04 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2009-05-11 15:21:04 +0000 |
| commit | eda2199ed00a18f0c22a48dd9cc2c5976efd8258 (patch) | |
| tree | c6952438eb9adcde9b6d8470e999f6cea57a2e28 | |
| parent | c7e5284476fd4a3d961704cf70f91b4577f71052 (diff) | |
| download | ATCD-eda2199ed00a18f0c22a48dd9cc2c5976efd8258.tar.gz | |
ChangeLogTag:Sun
| -rw-r--r-- | ACE/ChangeLog | 11 | ||||
| -rw-r--r-- | ACE/THANKS | 1 | ||||
| -rw-r--r-- | ACE/m4/aio.m4 | 10 |
3 files changed, 13 insertions, 9 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index d247431e8a3..2c0ea851887 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,14 @@ +Sun May 10 14:50:46 UTC 2009 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * m4/aio.m4 (Test_Aio): Removed all the commented out 'cout' + lines. Thanks to Johnny for this suggestion. + +Sat May 9 03:29:08 UTC 2009 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * m4/aio.m4: Change #include <iostream.h> to #include <iostream>. + Thanks to Boyan Kasarov <bkasarov at gmail dot com> for + reporting this. + Mon May 11 06:54:05 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_stdio.inl (fflush): diff --git a/ACE/THANKS b/ACE/THANKS index 93987ba563a..57e4611943e 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2291,6 +2291,7 @@ Skrzyniarz Alexandre <alexandre dot skrzyniarz at fr dot thalesgroup dot com> Rob Beekmans <r dot a dot beekmans at philips dot com> Steven Hartmann <shartmann at militho dot com> Dicky <qianchendi at gmail dot com> +Boyan Kasarov <bkasarov at gmail dot com> 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/ACE/m4/aio.m4 b/ACE/m4/aio.m4 index aaa5622dd33..b8248c6d24c 100644 --- a/ACE/m4/aio.m4 +++ b/ACE/m4/aio.m4 @@ -64,7 +64,7 @@ if test "$ace_has_aio_funcs" = yes; then #include <string.h> #include <errno.h> #include <stdio.h> -#include <iostream.h> +#include <iostream> #include <aio.h> @@ -138,7 +138,6 @@ Test_Aio::init (void) // Init the buffers. this->buffer_write_ = new char [sizeof (message) + 1]; strcpy (this->buffer_write_, message); - // cout << "The buffer : " << this->buffer_write_ << endl; this->buffer_read_ = new char [sizeof (message) + 1]; return 0; @@ -220,8 +219,6 @@ Test_Aio::do_aio (void) list_aiocb [0] = 0; } } -// else -// cout << "AIO in progress" << endl; if (list_aiocb [1] != 0 && aio_error (list_aiocb [1]) != EINPROGRESS) { @@ -238,17 +235,12 @@ Test_Aio::do_aio (void) list_aiocb [1] = 0; } } -// else -// cout << "AIO in progress" << endl; // Is it done? if ((list_aiocb [0] == 0) && (list_aiocb [1] == 0)) done = 1; } - //cout << "Both the AIO operations done." << endl; - //cout << "The buffer is :" << this->buffer_read_ << endl; - return 0; } |