summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorgan Deters <mdeters@cs.nyu.edu>2013-12-03 15:40:00 -0500
committerMorgan Deters <mdeters@cs.nyu.edu>2013-12-03 16:04:32 -0500
commitf8e854fef6b89e5ece7cede9299bfb2750f34780 (patch)
treeb008bdcf36640e38915e987a9c7a1c7c6a471030
parentef5b1909ccdd50d566264682bd2cb43ada706fed (diff)
Work around a swig segfault issue when building on Mac OS
-rw-r--r--src/bindings/swig.h6
-rw-r--r--src/util/tls.h.in2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/bindings/swig.h b/src/bindings/swig.h
index 94ad91dc6..2fa6ba4f0 100644
--- 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 2512e481d..e13149c3a 100644
--- 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 */
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback