diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-01-25 15:16:43 -0500 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-01-25 17:39:21 -0500 |
| commit | 195dffbb7468e814d3dc3226666688869c13ba3d (patch) | |
| tree | 4c4915245a90615ea36cbcfbb4a8a6dcc910c384 /src/util/node_visitor.h | |
| parent | 73760b3c213733fc98d67f9ceeb74d06b01a3777 (diff) | |
Fix errors and reduce warnings on clang (merge from mdeters/clang)
Diffstat (limited to 'src/util/node_visitor.h')
| -rw-r--r-- | src/util/node_visitor.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/util/node_visitor.h b/src/util/node_visitor.h index e444ba6e2..4c8e646bd 100644 --- a/src/util/node_visitor.h +++ b/src/util/node_visitor.h @@ -36,10 +36,11 @@ class NodeVisitor { /** * Guard against NodeVisitor<> being re-entrant. */ + template <class T> class GuardReentry { - bool& d_guard; + T& d_guard; public: - GuardReentry(bool& guard) + GuardReentry(T& guard) : d_guard(guard) { Assert(!d_guard); d_guard = true; @@ -71,7 +72,7 @@ public: */ static typename Visitor::return_type run(Visitor& visitor, TNode node) { - GuardReentry guard(bool(s_inRun)); + GuardReentry<CVC4_THREADLOCAL_TYPE(bool)> guard(s_inRun); // Notify of a start visitor.start(node); |