diff options
author | Andres Noetzli <andres.noetzli@gmail.com> | 2018-08-07 23:24:07 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-07 23:24:07 -0700 |
commit | 047e75b485ad16a729083c210ba4064943d2e7c5 (patch) | |
tree | cbd0ac11a061cb6da426e44bd6684f6115fecc88 /src/smt_util/node_visitor.h | |
parent | 95e9918607ed879347bb250ecbaa3c5c557d71b4 (diff) |
Require Swig 3 (#2283)
Removes some hacks due to Swig 2's incomplete C++11 support and adds
checks for version 3 at configuration time as well as in swig.h
Diffstat (limited to 'src/smt_util/node_visitor.h')
-rw-r--r-- | src/smt_util/node_visitor.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/smt_util/node_visitor.h b/src/smt_util/node_visitor.h index 0517e9d2c..31a436f81 100644 --- a/src/smt_util/node_visitor.h +++ b/src/smt_util/node_visitor.h @@ -20,7 +20,6 @@ #include <vector> -#include "base/tls.h" #include "expr/node.h" namespace CVC4 { @@ -33,7 +32,7 @@ template<typename Visitor> class NodeVisitor { /** For re-entry checking */ - static CVC4_THREAD_LOCAL bool s_inRun; + static thread_local bool s_inRun; /** * Guard against NodeVisitor<> being re-entrant. @@ -116,6 +115,6 @@ public: };/* class NodeVisitor<> */ template <typename Visitor> -CVC4_THREAD_LOCAL bool NodeVisitor<Visitor>::s_inRun = false; +thread_local bool NodeVisitor<Visitor>::s_inRun = false; }/* CVC4 namespace */ |