summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2004-01-26 20:55:23 +0000
committerSteve Huston <shuston@riverace.com>2004-01-26 20:55:23 +0000
commit33e5d5f576cb7b64b7c9945e71fca21df5106c1e (patch)
treecf4fb81b8e732d5539279131aa3fed9a8bba9eb8
parent2d4248d14e8648f0e04bf29ca3fea0ff070c8bea (diff)
downloadATCD-33e5d5f576cb7b64b7c9945e71fca21df5106c1e.tar.gz
ChangeLogTag:Mon Jan 26 15:47:55 2004 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog5
-rw-r--r--examples/APG/Timers/PCB.cpp11
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b4aca67b9f8..9cfa7f1c652 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 26 15:47:55 2004 Steve Huston <shuston@riverace.com>
+
+ * examples/APG/Timers/PCB.cpp: Don't put needed things inside
+ ACE_ASSERT - they disappear when built with ACE_NDEBUG.
+
Mon Jan 26 13:01:42 2004 Chad Elliott <elliott_c@ociweb.com>
* bin/MakeProjectCreator/templates/make.mpd:
diff --git a/examples/APG/Timers/PCB.cpp b/examples/APG/Timers/PCB.cpp
index 6abfec71c4a..03392ca7ead 100644
--- a/examples/APG/Timers/PCB.cpp
+++ b/examples/APG/Timers/PCB.cpp
@@ -29,17 +29,18 @@ int PCB::handleEvent (const void *arg)
// New interval is 10 ms.
ACE_Time_Value interval (0L, 1000L);
- ACE_ASSERT (PTimer::instance ()->reset_interval
- (timerID_, interval) != -1);
-
- ACE_UNUSED_ARG (interval);
+ if (PTimer::instance ()->reset_interval (timerID_, interval) != -1)
+ ACE_ERROR_RETURN ((LM_ERROR,
+ ACE_TEXT ("%p\n"),
+ ACE_TEXT ("reset_interval")),
+ -1);
}
if (count_++ == 10)
{
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Canceling %d\n"),
timerID_));
- ACE_ASSERT ((PTimer::instance ()->cancel (this)) != 0);
+ PTimer::instance ()->cancel (this);
}
return 0;