summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2001-06-26 22:39:11 +0000
committerbala <balanatarajan@users.noreply.github.com>2001-06-26 22:39:11 +0000
commit42638f18b73306520da2e416b181ad035bfe199b (patch)
tree5868632ce26b85fe9f3c49d05f7673dd3fe3fed1
parent124acd72132301b6be27f7596c46fb69199a8607 (diff)
downloadATCD-42638f18b73306520da2e416b181ad035bfe199b.tar.gz
ChangeLogTag: Tue Jun 26 17:37:51 2001 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLogs/ChangeLog-02a5
-rw-r--r--ChangeLogs/ChangeLog-03a5
-rw-r--r--ace/ACE.cpp2
-rw-r--r--ace/Proactor.h2
5 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9fc536edf95..5bde25a4c2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 26 17:37:51 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * ace/Proactor.h: Fixed a compile error with g++. There were two
+ return types. Retained the return type as int.
+
Tue Jun 26 16:22:24 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
* ace/OS_TLI.h: Zapped a dummy declaration of struct rlimit { }.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 9fc536edf95..5bde25a4c2d 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Tue Jun 26 17:37:51 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * ace/Proactor.h: Fixed a compile error with g++. There were two
+ return types. Retained the return type as int.
+
Tue Jun 26 16:22:24 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
* ace/OS_TLI.h: Zapped a dummy declaration of struct rlimit { }.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 9fc536edf95..5bde25a4c2d 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,8 @@
+Tue Jun 26 17:37:51 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * ace/Proactor.h: Fixed a compile error with g++. There were two
+ return types. Retained the return type as int.
+
Tue Jun 26 16:22:24 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
* ace/OS_TLI.h: Zapped a dummy declaration of struct rlimit { }.
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 2004252c332..0fd4b87d46d 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -2373,7 +2373,7 @@ ACE::format_hexdump (const char *buffer,
if (i == 7)
{
ACE_OS::sprintf (obuf,
- ACE_LIB_TEXT (" "));
+ ACE_LIB_TEXT (" \n"));
obuf++;
}
textver[i] = ACE_OS::ace_isprint (c) ? c : '.';
diff --git a/ace/Proactor.h b/ace/Proactor.h
index d577ccdde47..172f987be97 100644
--- a/ace/Proactor.h
+++ b/ace/Proactor.h
@@ -196,7 +196,7 @@ public:
* Resets the <ACE_Proactor::end_event_loop_> static so that the
* <run_event_loop> method can be restarted.
*/
- static int void reset_event_loop (void);
+ static int reset_event_loop (void);
/// Report if the <ACE_Proactor::instance> event loop is finished.
static int event_loop_done (void);