Merging + fixing memory bugs

[satune.git] / src / satune_SatuneJavaAPI.cc

diff --git a/src/satune_SatuneJavaAPI.cc b/src/satune_SatuneJavaAPI.cc
index e337590fa92b409cb9272beb9e65a26ea8cfad77..0a7d6725773f4219a85b45dea0eafe5cdf5bff96 100644 (file)
--- a/src/satune_SatuneJavaAPI.cc
+++ b/src/satune_SatuneJavaAPI.cc
@@ -1,7 +1,7 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
 #include "satune_SatuneJavaAPI.h"
 #include "ccsolver.h"
 /* DO NOT EDIT THIS FILE - it is machine generated */
 #include "satune_SatuneJavaAPI.h"
 #include "ccsolver.h"

-#define CCSOLVER(solver) (void*)solver
+#define CCSOLVER(solver) (void *)solver

 /* Header for class SatuneJavaAPI */
 
 /*
 /* Header for class SatuneJavaAPI */
 
 /*


@@ -14,7 +14,7 @@ JNIEXPORT jlong JNICALL Java_satune_SatuneJavaAPI_createCCSolver
        (JNIEnv *env, jobject obj)
 {
        return (jlong)createCCSolver();
        (JNIEnv *env, jobject obj)
 {
        return (jlong)createCCSolver();

-       
+

 }
 
 /*
 }
 
 /*


@@ -158,7 +158,7 @@ JNIEXPORT jlong JNICALL Java_satune_SatuneJavaAPI_getBooleanVar
  * Signature: (JI)J
  */
 JNIEXPORT jlong JNICALL Java_satune_SatuneJavaAPI_getBooleanTrue
  * Signature: (JI)J
  */
 JNIEXPORT jlong JNICALL Java_satune_SatuneJavaAPI_getBooleanTrue

-       (JNIEnv * env, jobject obj, jlong solver)
+       (JNIEnv *env, jobject obj, jlong solver)

 {
        return (jlong)getBooleanTrue((void *)solver);
 }
 {
        return (jlong)getBooleanTrue((void *)solver);
 }


@@ -169,7 +169,7 @@ JNIEXPORT jlong JNICALL Java_satune_SatuneJavaAPI_getBooleanTrue
  * Signature: (JI)J
  */
 JNIEXPORT jlong JNICALL Java_satune_SatuneJavaAPI_getBooleanFalse
  * Signature: (JI)J
  */
 JNIEXPORT jlong JNICALL Java_satune_SatuneJavaAPI_getBooleanFalse

-       (JNIEnv * env, jobject obj, jlong solver)
+       (JNIEnv *env, jobject obj, jlong solver)

 {
        return (jlong)getBooleanFalse((void *)solver);
 }
 {
        return (jlong)getBooleanFalse((void *)solver);
 }