Skip to content

Commit

Permalink
Merge pull request #1104 from JohnLangford/java-bug-fixes
Browse files Browse the repository at this point in the history
Fixing compilation warnings in Java
  • Loading branch information
jmorra committed Sep 13, 2016
2 parents 08cc042 + f5ded18 commit 17b4c66
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 14 deletions.
2 changes: 1 addition & 1 deletion java/src/main/c++/jni_base_learner.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ T base_predict(
int example_count = env->GetArrayLength(example_strings);

// When doing multiline prediction the final result is stored in the FIRST example parsed.
example* first_example;
example* first_example = NULL;
for (int i=0; i<example_count; i++) {
jstring example_string = (jstring) (env->GetObjectArrayElement(example_strings, i));
example* ex = read_example(env, example_string, vwInstance);
Expand Down
2 changes: 2 additions & 0 deletions java/src/main/c++/vowpalWabbit_learner_VWLearners.cc
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ JNIEXPORT jobject JNICALL Java_vowpalWabbit_learner_VWLearners_getReturnType(JNI
case prediction_type::prediction_type_t::scalars:
field = env->GetStaticFieldID(clVWReturnType , "Scalars", RETURN_TYPE_INSTANCE);
break;
default:
field = env->GetStaticFieldID(clVWReturnType , "Unknown", RETURN_TYPE_INSTANCE);
}

return env->GetStaticObjectField(clVWReturnType, field);
Expand Down
13 changes: 0 additions & 13 deletions java/src/main/java/vowpalWabbit/exception/IllegalVWInput.java

This file was deleted.

0 comments on commit 17b4c66

Please sign in to comment.