summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--tapsets.cxx4
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e4922e7..c7bb82c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-20 Frank Ch. Eigler <fche@elastic.org>
+
+ PR 5975.
+ * tapsets.cxx (*): Added a few (void) expressions for asserts that
+ may be compiled out.
+
2008-03-14 Masami Hiramatsu <mhiramat@redhat.com>
PR 3542
diff --git a/tapsets.cxx b/tapsets.cxx
index 5ed8017d..a9db3717 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -2113,6 +2113,7 @@ base_query::base_query(systemtap_session & sess,
{
bool has_module = get_string_param(params, TOK_MODULE, module_val);
assert (has_module); // no other options are possible by construction
+ (void) has_module;
}
}
@@ -4287,7 +4288,9 @@ struct uprobe_builder: public derived_probe_builder
int64_t process, address;
bool b1 = get_param (parameters, TOK_PROCESS, process);
+ (void) b1;
bool b2 = get_param (parameters, TOK_STATEMENT, address);
+ (void) b2;
bool rr = has_null_param (parameters, TOK_RETURN);
assert (b1 && b2); // by pattern_root construction
@@ -5782,6 +5785,7 @@ mark_builder::build(systemtap_session & sess,
string mark_format_val;
bool has_mark_format = get_param (parameters, "format", mark_format_val);
assert (has_mark_str);
+ (void) has_mark_str;
if (! cache_initialized)
{