summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlli Savia <ops@iki.fi>2009-07-07 12:59:36 +0000
committerOlli Savia <ops@iki.fi>2009-07-07 12:59:36 +0000
commit24c018e5ac6a7d06c12cb8ee861b01a42d804fd7 (patch)
tree4bb9dc89148ca184b942c7b397a9d94addc4299e
parent742360d5543be8dd4a9739ea632427fe7e7ce9a2 (diff)
downloadATCD-24c018e5ac6a7d06c12cb8ee861b01a42d804fd7.tar.gz
ChangeLogTag: Tue Jul 7 12:57:30 UTC 2009 Olli Savia <ops@iki.fi>
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/ace/FoxReactor/FoxReactor.cpp4
2 files changed, 9 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index f40e6e8e2e3..c63fd77186f 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul 7 12:57:30 UTC 2009 Olli Savia <ops@iki.fi>
+
+ * ace/FoxReactor/FoxReactor.cpp:
+ Added missing return statement to avoid gcc's
+ 'no return statement in function returning non-void' warning.
+
Tue Jul 7 06:00:39 UTC 2009 Olli Savia <ops@iki.fi>
* ace/config-freebsd.h:
diff --git a/ACE/ace/FoxReactor/FoxReactor.cpp b/ACE/ace/FoxReactor/FoxReactor.cpp
index d2aaaa1cce1..b8277c02228 100644
--- a/ACE/ace/FoxReactor/FoxReactor.cpp
+++ b/ACE/ace/FoxReactor/FoxReactor.cpp
@@ -137,6 +137,8 @@ long ACE_FoxReactor::onFileEvents(FXObject* /* ob */, FXSelector se, void* handl
f=true;
};
if(f) dispatch (1, dispatch_set);
+
+ return 1;
}
long ACE_FoxReactor::onTimerEvents(FXObject* /* ob */, FXSelector /* sel */, void* /* handle */)
@@ -147,7 +149,7 @@ long ACE_FoxReactor::onTimerEvents(FXObject* /* ob */, FXSelector /* sel */, voi
// Set next timeout signal
this->reset_timeout ();
-
+
return 0;
}