diff options
| author | Andres Noetzli <andres.noetzli@gmail.com> | 2017-08-30 20:55:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 20:55:27 -0700 |
| commit | 546d795470ca7c30fc62fe9b6c7b8e5838e1eed4 (patch) | |
| tree | 443f7101c4246b684ce21a04704d769eb2db15ad /src/options/options.h | |
| parent | d7dadde871ae4775748695b0b7f9deee49576c0a (diff) | |
Use thread_local instead of compiler extensions (#210)
C++11 introduced the thread_local keyword, so we don't need to use
non-standard extensions or our custom pthread extension anymore.
The behavior was previously introduced as a workaround in commit
753a072c542c1c254d7c6adbf10e091ba585ede5. This commit
introduces the macro CVC4_THREAD_LOCAL that can be used to
declare variables as thread local. For Swig, this macro is defined to
be empty.
Diffstat (limited to 'src/options/options.h')
| -rw-r--r-- | src/options/options.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/options/options.h b/src/options/options.h index 6b2bfedad..f93663095 100644 --- a/src/options/options.h +++ b/src/options/options.h @@ -29,8 +29,8 @@ #include "base/tls.h" #include "options/argument_extender.h" #include "options/language.h" -#include "options/printer_modes.h" #include "options/option_exception.h" +#include "options/printer_modes.h" namespace CVC4 { @@ -47,7 +47,7 @@ class CVC4_PUBLIC Options { options::OptionsHandler* d_handler; /** The current Options in effect */ - static CVC4_THREADLOCAL(Options*) s_current; + static CVC4_THREAD_LOCAL Options* s_current; /** Listeners for options::forceLogicString being set. */ ListenerCollection d_forceLogicListeners; |