add workaround for systems (i.e., Mac OS X) that don't support __thread; also configure script auto-detection of __thread support and syntax

2 files changed, 4 insertions, 2 deletions

diff --git a/src/expr/node_manager.cpp b/src/expr/node_manager.cpp
index 1f15f7e29..31b848885 100644
--- a/src/expr/node_manager.cpp
+++ b/src/expr/node_manager.cpp
@@ -28,6 +28,7 @@
 #include "theory/bv/theory_bv_type_rules.h"
 
 #include "util/Assert.h"
+#include "util/tls.h"
 
 #include <ext/hash_set>
 #include <algorithm>
@@ -38,7 +39,7 @@ using __gnu_cxx::hash_set;
 
 namespace CVC4 {
 
-__thread NodeManager* NodeManager::s_current = 0;
+CVC4_THREADLOCAL(NodeManager*) NodeManager::s_current = 0;
 
 /**
  * This class sets it reference argument to true and ensures that it gets set
diff --git a/src/expr/node_manager.h b/src/expr/node_manager.h
index bf1bed5f0..5fb7c57ad 100644
--- a/src/expr/node_manager.h
+++ b/src/expr/node_manager.h
@@ -38,6 +38,7 @@
 #include "expr/node_value.h"
 #include "context/context.h"
 #include "util/configuration_private.h"
+#include "util/tls.h"
 
 namespace CVC4 {
 
@@ -70,7 +71,7 @@ class NodeManager {
                               expr::NodeValueIDHashFunction,
                               expr::NodeValueEq> ZombieSet;
 
-  static __thread NodeManager* s_current;
+  static CVC4_THREADLOCAL(NodeManager*) s_current;
 
   NodeValuePool d_nodeValuePool;