diff options
Diffstat (limited to 'src/bindings')
| -rw-r--r-- | src/bindings/Makefile.am | 6 | ||||
| -rw-r--r-- | src/bindings/compat/java/include/cvc3/JniUtils.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am index cc2a7c53f..80e65d180 100644 --- a/src/bindings/Makefile.am +++ b/src/bindings/Makefile.am @@ -142,7 +142,7 @@ endif endif nodist_java_libcvc4jni_la_SOURCES = java.cpp -java_libcvc4jni_la_CXXFLAGS = @FNO_STRICT_ALIASING@ @WNO_UNUSED_VARIABLE@ @WNO_UNINITIALIZED@ +java_libcvc4jni_la_CXXFLAGS = -Wno-all @FNO_STRICT_ALIASING@ @WNO_UNUSED_VARIABLE@ @WNO_UNINITIALIZED@ nodist_csharp_CVC4_la_SOURCES = csharp.cpp nodist_perl_CVC4_la_SOURCES = perl.cpp nodist_php_CVC4_la_SOURCES = php.cpp @@ -171,7 +171,9 @@ MOSTLYCLEANFILES = \ $(patsubst %,%.d,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))) \ CVC4.jar -java_libcvc4jni_la-java.lo java.lo: java.cpp +java_libcvc4jni_la-java.lo: java.cpp + $(AM_V_CXX)$(LTCXXCOMPILE) -c $(JAVA_CPPFLAGS) $(java_libcvc4jni_la_CXXFLAGS) -o $@ $< +java.lo: java.cpp $(AM_V_CXX)$(LTCXXCOMPILE) -c $(JAVA_CPPFLAGS) $(java_libcvc4jni_la_CXXFLAGS) -o $@ $< CVC4.jar: java.cpp $(AM_V_GEN) \ diff --git a/src/bindings/compat/java/include/cvc3/JniUtils.h b/src/bindings/compat/java/include/cvc3/JniUtils.h index 567c691fe..404774c62 100644 --- a/src/bindings/compat/java/include/cvc3/JniUtils.h +++ b/src/bindings/compat/java/include/cvc3/JniUtils.h @@ -109,7 +109,7 @@ namespace Java_cvc3_JniUtils { // embeds a c++ object into a jobject, // and takes over the responsibility to deallocate it template <class T> jobject embed_own(JNIEnv* env, T* cobj) { - DebugAssert(&cobj != NULL, "JniUtils::embed_own: null object given"); + DebugAssert(cobj != NULL, "JniUtils::embed_own: null object given"); return embed<T>(env, cobj, typeid(cobj), &DeleteEmbedded<T>::deleteEmbedded); } |