diff options
| author | Clark Barrett <clarkbarrett@google.com> | 2015-04-21 16:34:15 -0700 |
|---|---|---|
| committer | Clark Barrett <clarkbarrett@google.com> | 2015-04-21 16:34:15 -0700 |
| commit | d95fe7675e20eaee86b8e804469e6db83265a005 (patch) | |
| tree | 34616ecdc217d608b97d9432a368b20c75039542 /src/expr/node_value.h | |
| parent | 22601bce9648a8e784527e4e5d176f634d234797 (diff) | |
Changes needed to compile at Google, plus some bug fixes from Google.
Diffstat (limited to 'src/expr/node_value.h')
| -rw-r--r-- | src/expr/node_value.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/expr/node_value.h b/src/expr/node_value.h index a6e7a6053..785f8909f 100644 --- a/src/expr/node_value.h +++ b/src/expr/node_value.h @@ -74,9 +74,6 @@ namespace expr { */ class NodeValue { - /** A convenient null-valued expression value */ - static NodeValue s_null; - static const unsigned NBITS_REFCOUNT = __CVC4__EXPR__NODE_VALUE__NBITS__REFCOUNT; static const unsigned NBITS_KIND = __CVC4__EXPR__NODE_VALUE__NBITS__KIND; static const unsigned NBITS_ID = __CVC4__EXPR__NODE_VALUE__NBITS__ID; @@ -278,8 +275,9 @@ public: return (d == kindMask) ? kind::UNDEFINED_KIND : Kind(d); } - static inline const NodeValue& null() { - return s_null; + static inline NodeValue& null() { + static NodeValue* s_null = new NodeValue(0); + return *s_null; } /** |