diff options
author | Morgan Deters <mdeters@gmail.com> | 2012-12-01 17:12:18 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2012-12-01 17:12:18 +0000 |
commit | 251841986bb6a68d18350ed76135507b63ef29b6 (patch) | |
tree | dc2cb607cf9f9d4ff7754804c0576628230cd26d | |
parent | ca3c6c4842f122641c4bb5096e6c9249db2ff12b (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
-rw-r--r-- | src/expr/node.h | 3 |
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"); } } |