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/main/interactive_shell.cpp | |
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/main/interactive_shell.cpp')
-rw-r--r-- | src/main/interactive_shell.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/interactive_shell.cpp b/src/main/interactive_shell.cpp index f1220b961..2cec42fbf 100644 --- a/src/main/interactive_shell.cpp +++ b/src/main/interactive_shell.cpp @@ -37,7 +37,6 @@ # endif /* HAVE_EXT_STDIO_FILEBUF_H */ #endif /* HAVE_LIBREADLINE */ -#include "base/tls.h" #include "base/output.h" #include "options/language.h" #include "options/options.h" @@ -384,8 +383,8 @@ struct StringPrefix2Less { };/* struct StringPrefix2Less */ char* commandGenerator(const char* text, int state) { - static CVC4_THREAD_LOCAL const std::string* rlCommand; - static CVC4_THREAD_LOCAL set<string>::const_iterator* rlDeclaration; + static thread_local const std::string* rlCommand; + static thread_local set<string>::const_iterator* rlDeclaration; const std::string* i = lower_bound(commandsBegin, commandsEnd, text, StringPrefix2Less()); const std::string* j = upper_bound(commandsBegin, commandsEnd, text, StringPrefix1Less()); |