Work around a swig segfault issue when building on Mac OS

diff --git a/src/bindings/swig.h b/src/bindings/swig.h
index 94ad91dc6fed731aaf1a21360af7e6f3b5b73244..2fa6ba4f0e7eeb2a8c9029b7d5960825ab571183 100644 (file)
--- a/src/bindings/swig.h
+++ b/src/bindings/swig.h
@@ -26,7 +26,11 @@
 #endif /* SWIG_VERSION */
 
 %import "cvc4_public.h"
-%import "util/tls.h"
+#warning Working around a SWIG segfault in C++ template parsing.
+//%import "util/tls.h"
+#define CVC4_THREADLOCAL(__type...) __type
+#define CVC4_THREADLOCAL_PUBLIC(__type...) CVC4_PUBLIC __type
+#define CVC4_THREADLOCAL_TYPE(__type...) __type
 
 // swig doesn't like the __thread storage class...
 #define __thread

diff --git a/src/util/tls.h.in b/src/util/tls.h.in
index 2512e481d16555f938c546b48a0cacbc0ba74c76..e13149c3a290493b0b9630dafc43c3ec4ac4e913 100644 (file)
--- a/src/util/tls.h.in
+++ b/src/util/tls.h.in
@@ -195,4 +195,4 @@ public:
 
 #endif /* @CVC4_TLS_SUPPORTED@ */
 
-#endif /* _CVC4__TLS_H */
+#endif /* __CVC4__TLS_H */