summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMorgan Deters <mdeters@gmail.com>2012-12-01 17:12:18 +0000
committerMorgan Deters <mdeters@gmail.com>2012-12-01 17:12:18 +0000
commit251841986bb6a68d18350ed76135507b63ef29b6 (patch)
treedc2cb607cf9f9d4ff7754804c0576628230cd26d /src
parentca3c6c4842f122641c4bb5096e6c9249db2ff12b (diff)
fix to TNode assertion (which is too strict, given lax ordering requirements on static data initialization)---this should fix debug-staticbinary Mac builds, maybe others
Diffstat (limited to 'src')
-rw-r--r--src/expr/node.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/expr/node.h b/src/expr/node.h
index a3b8853a0..42e9f4253 100644
--- a/src/expr/node.h
+++ b/src/expr/node.h
@@ -1022,7 +1022,8 @@ NodeTemplate<ref_count>::NodeTemplate(const expr::NodeValue* ev) :
if(ref_count) {
d_nv->inc();
} else {
- Assert(d_nv->d_rc > 0, "TNode constructed from NodeValue with rc == 0");
+ Assert(d_nv->d_rc > 0 || d_nv == &expr::NodeValue::s_null,
+ "TNode constructed from NodeValue with rc == 0");
}
}
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback