diff options
| author | Andres Noetzli <andres.noetzli@gmail.com> | 2017-08-31 17:39:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-31 17:39:16 -0700 |
| commit | d344234d056e1cd9f50cfc611151879381c6124d (patch) | |
| tree | 4b1984cfdbf79f83900980d1c8c10ce05d73d2a7 /src/main | |
| parent | 949dc989f72c680b98a4f7c4e52616b393237b52 (diff) | |
Replace CVC4_THREADLOCAL in interactive_shell (#1065)
Commit 546d795470ca7c30fc62fe9b6c7b8e5838e1eed4
caused our nightly builds to fail because it did
not replace CVC4_THREADLOCAL with
CVC4_THREAD_LOCAL in interactive_shell. This
commit fixes the issue and adds readline to
Travis, s.t. readline related code gets compiled
as part of our CI tests.
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/interactive_shell.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/interactive_shell.cpp b/src/main/interactive_shell.cpp index 0fa026f76..325f44769 100644 --- a/src/main/interactive_shell.cpp +++ b/src/main/interactive_shell.cpp @@ -37,7 +37,7 @@ # 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" @@ -382,8 +382,8 @@ struct StringPrefix2Less { };/* struct StringPrefix2Less */ char* commandGenerator(const char* text, int state) { - static CVC4_THREADLOCAL(const std::string*) rlCommand; - static CVC4_THREADLOCAL(set<string>::const_iterator*) rlDeclaration; + static CVC4_THREAD_LOCAL const std::string* rlCommand; + static CVC4_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()); |