Module: ppl/ppl Branch: master Commit: 0f82172b6a51e2695d730f9f52e1becfd863583d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0f82172b6a51e... Author: Enea Zaffanella <zaffanella@cs.unipr.it> Date: Thu Aug 30 14:50:27 2012 +0200 Fixed Java interface issues for method drop_some_non_integer_points(), reported by Zell (Zhoulai). Corrected the declaration of the method by letting it accept a Complexity_Class enumeration value (rather than a plain integer). Also renamed the version taking a set of variables as input, which was using the suffix "_2", so as to exploit overloading. --- ...ppl_interface_generator_java_classes_cc_code.m4 | 4 ++-- ...l_interface_generator_java_classes_java_code.m4 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 b/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 index a06df38..349b01d 100644 --- a/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 +++ b/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 @@ -1171,7 +1171,7 @@ CATCH_ALL m4_define(`ppl_@CLASS@_drop_some_non_integer_points_code', `dnl -JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_@1CLASS@_drop_1some_1non_1integer_1points +JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_@1CLASS@_drop_1some_1non_1integer_1points__Lparma_1polyhedra_1library_Complexity_1Class_2 (JNIEnv* env, jobject j_this, jobject j_complexity) try { @CPP_CLASS@* this_ptr = reinterpret_cast<@CPP_CLASS@*>(get_ptr(env, j_this)); @@ -1200,7 +1200,7 @@ CATCH_ALL m4_define(`ppl_@CLASS@_drop_some_non_integer_points_2_code', `dnl -JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_@1CLASS@_drop_1some_1non_1integer_1points_12 +JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_@1CLASS@_drop_1some_1non_1integer_1points__Lparma_1polyhedra_1library_Variables_1Set_2Lparma_1polyhedra_1library_Complexity_1Class_2 (JNIEnv* env, jobject j_this, jobject j_v_set, jobject j_complexity) try { @CPP_CLASS@* this_ptr = reinterpret_cast<@CPP_CLASS@*>(get_ptr(env, j_this)); diff --git a/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 b/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 index cb86f1f..66723bc 100644 --- a/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 +++ b/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 @@ -538,7 +538,7 @@ m4_define(`ppl_@CLASS@_drop_some_non_integer_points_code', ___END_OF_FILE___ ___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ public native void drop_some_non_integer_points - (Integer complexity_threshold); + (Complexity_Class complexity); ') @@ -546,8 +546,8 @@ m4_define(`ppl_@CLASS@_drop_some_non_integer_points_2_code', `dnl ___END_OF_FILE___ ___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ - public native void drop_some_non_integer_points_2 - (Variables_Set vars, Integer complexity_threshold); + public native void drop_some_non_integer_points + (Variables_Set vars, Complexity_Class complexity); ')