summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2004-09-15 16:45:40 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2004-09-15 16:45:40 +0000
commitd20499ea973041a4d41c978f15f38a7b491207f3 (patch)
tree3919c3112993eb6331839a2159a7b17730df19e0
parent27d6ec7778f64c01e1f0d29be2b12e0df5820e0b (diff)
downloadATCD-d20499ea973041a4d41c978f15f38a7b491207f3.tar.gz
ChangeLogTag:Wed Sep 15 11:41:53 2004 Douglas C. Schmidt <schmidt@cs.wustl.edu>
-rw-r--r--ChangeLog17
-rw-r--r--ace/ACE.cpp6
2 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 2447e8f332b..31c540aeed0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,20 @@
+Wed Sep 15 11:41:53 2004 Douglas C. Schmidt <schmidt@cs.wustl.edu>
+
+ * ace/ACE.cpp (set_handle_limit): Removed the
+
+ ACE_NOTREACHED (return 0);
+
+ and replaced it with
+
+ return 0;
+
+ Thanks to Martin Corino <mcorino@remedy.nl> for reporting this.
+
Wed Sep 15 10:46:07 2004 Dale Wilson <wilson_d@ociweb.com>
* ace/Log_Msg.cpp:
- Uninitialized static int was assumed to be zero.
- It usually was.
-
+ Uninitialized static int was assumed to be zero. It usually
+ was.
Wed Sep 15 12:51:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index aa3733444ae..60a97d33f87 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -3170,11 +3170,7 @@ ACE::set_handle_limit (int new_limit,
#endif /* ACE_LACKS_RLIMIT */
}
- // Irix complains without this return statement. DEC cxx
- // (correctly) says that it's not reachable. ACE_NOTREACHED won't
- // work here, because it handles both platforms the same.
- // IRIX does not complain anymore [7.2]
- ACE_NOTREACHED (return 0);
+ return 0;
}
int