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/options | |
| 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/options')
| -rw-r--r-- | src/options/options.h | 3 | ||||
| -rw-r--r-- | src/options/options_template.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/options/options.h b/src/options/options.h index 16210e1a3..474fe3a4b 100644 --- a/src/options/options.h +++ b/src/options/options.h @@ -26,7 +26,6 @@ #include "base/listener.h" #include "base/modal_exception.h" -#include "base/tls.h" #include "options/argument_extender.h" #include "options/language.h" #include "options/option_exception.h" @@ -47,7 +46,7 @@ class CVC4_PUBLIC Options { options::OptionsHandler* d_handler; /** The current Options in effect */ - static CVC4_THREAD_LOCAL Options* s_current; + static thread_local Options* s_current; /** Listeners for options::forceLogicString being set. */ ListenerCollection d_forceLogicListeners; diff --git a/src/options/options_template.cpp b/src/options/options_template.cpp index d2ccd37ca..609713ce8 100644 --- a/src/options/options_template.cpp +++ b/src/options/options_template.cpp @@ -48,7 +48,6 @@ extern int optreset; #include <sstream> #include <limits> -#include "base/tls.h" #include "base/cvc4_assert.h" #include "base/exception.h" #include "base/output.h" @@ -73,7 +72,7 @@ using namespace CVC4::options; namespace CVC4 { -CVC4_THREAD_LOCAL Options* Options::s_current = NULL; +thread_local Options* Options::s_current = NULL; |