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/theory/bv/bitblast | |
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/theory/bv/bitblast')
-rw-r--r-- | src/theory/bv/bitblast/aig_bitblaster.cpp | 2 | ||||
-rw-r--r-- | src/theory/bv/bitblast/aig_bitblaster.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/theory/bv/bitblast/aig_bitblaster.cpp b/src/theory/bv/bitblast/aig_bitblaster.cpp index f2417deb6..b06062cf4 100644 --- a/src/theory/bv/bitblast/aig_bitblaster.cpp +++ b/src/theory/bv/bitblast/aig_bitblaster.cpp @@ -116,7 +116,7 @@ Abc_Obj_t* mkIte<Abc_Obj_t*>(Abc_Obj_t* cond, Abc_Obj_t* a, Abc_Obj_t* b) { return Abc_AigMux(AigBitblaster::currentAigM(), cond, a, b); } -CVC4_THREAD_LOCAL Abc_Ntk_t* AigBitblaster::s_abcAigNetwork = nullptr; +thread_local Abc_Ntk_t* AigBitblaster::s_abcAigNetwork = nullptr; Abc_Ntk_t* AigBitblaster::currentAigNtk() { if (!AigBitblaster::s_abcAigNetwork) { diff --git a/src/theory/bv/bitblast/aig_bitblaster.h b/src/theory/bv/bitblast/aig_bitblaster.h index bd624bf92..6d21b69e6 100644 --- a/src/theory/bv/bitblast/aig_bitblaster.h +++ b/src/theory/bv/bitblast/aig_bitblaster.h @@ -21,8 +21,6 @@ #include "theory/bv/bitblast/bitblaster.h" -#include "base/tls.h" - class Abc_Obj_t_; typedef Abc_Obj_t_ Abc_Obj_t; @@ -57,7 +55,7 @@ class AigBitblaster : public TBitblaster<Abc_Obj_t*> typedef std::unordered_map<TNode, Abc_Obj_t*, TNodeHashFunction> TNodeAigMap; typedef std::unordered_map<Node, Abc_Obj_t*, NodeHashFunction> NodeAigMap; - static CVC4_THREAD_LOCAL Abc_Ntk_t* s_abcAigNetwork; + static thread_local Abc_Ntk_t* s_abcAigNetwork; std::unique_ptr<context::Context> d_nullContext; std::unique_ptr<prop::SatSolver> d_satSolver; TNodeAigMap d_aigCache; |