diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-04-29 18:03:28 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-04-29 19:25:40 -0400 |
| commit | e070c4a6d716407916c65a66ea9f019d1681ae8e (patch) | |
| tree | 0bc25d1889866944515c8ccb504c0f2da0c95325 /src | |
| parent | dde893d63a162346fc35663118f9d341524e578b (diff) | |
Some fixes for GCC 4.2, and for Java on Mac
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/Makefile.am | 1 | ||||
| -rw-r--r-- | src/theory/arith/error_set.h | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am index dcc4bc858..cc2a7c53f 100644 --- a/src/bindings/Makefile.am +++ b/src/bindings/Makefile.am @@ -60,6 +60,7 @@ javalib_LTLIBRARIES += java/libcvc4jni.la javadata_DATA += CVC4.jar java_libcvc4jni_la_LDFLAGS = \ -module \ + -shrext $(CVC4_JAVA_MODULE_EXT) \ -version-info $(LIBCVC4BINDINGS_VERSION) java_libcvc4jni_la_LIBADD = \ -L@builddir@/.. -lcvc4 \ diff --git a/src/theory/arith/error_set.h b/src/theory/arith/error_set.h index e616db3b9..91d7e49ea 100644 --- a/src/theory/arith/error_set.h +++ b/src/theory/arith/error_set.h @@ -29,6 +29,22 @@ #include "util/statistics_registry.h" //#include <boost/heap/d_ary_heap.hpp> + +#if CVC4_GCC_HAS_PB_DS_BUG + // Unfortunate bug in some older GCCs (e.g., v4.2): + // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36612 + // Requires some header-hacking to work around +# define __throw_container_error inline __throw_container_error +# define __throw_insert_error inline __throw_insert_error +# define __throw_join_error inline __throw_join_error +# define __throw_resize_error inline __throw_resize_error +# include <ext/pb_ds/exception.hpp> +# undef __throw_container_error +# undef __throw_insert_error +# undef __throw_join_error +# undef __throw_resize_error +#endif /* CVC4_GCC_HAS_PB_DS_BUG */ + #include <ext/pb_ds/priority_queue.hpp> #include <vector> |