diff options
author | Aurimas Liutikas <aurimas@google.com> | 2016-02-16 12:25:19 -0800 |
---|---|---|
committer | Aurimas Liutikas <aurimas@google.com> | 2016-02-18 15:39:20 -0800 |
commit | 13223cca22c388bf9c4941fca3c92c5acfe73650 (patch) | |
tree | 080757c86444306b1e1935d671b0775fbabdd9fe | |
parent | e0721529b9662b5ffb6cc7daf5b097720f5eb3e8 (diff) | |
download | ml-nougat-cts-release.tar.gz |
Fix compiler warnings in ml/bordeaux/learning/android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-release
Cherry-pick of https://android-review.googlesource.com/#/c/203013/
Bug: 26936282
Change-Id: I17ae520c35cf6901e8647afb668a2b80aedd1caf
4 files changed, 27 insertions, 25 deletions
diff --git a/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.cpp b/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.cpp index 65575de6d..3825586ed 100644 --- a/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.cpp +++ b/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.cpp @@ -33,8 +33,8 @@ void CreateIndexValuePairs(const int* indices, const float* values, } } -jlong Java_android_bordeaux_learning_MulticlassPA_initNativeClassifier(JNIEnv* env, - jobject thiz, +jlong Java_android_bordeaux_learning_MulticlassPA_initNativeClassifier(JNIEnv* /* env */, + jobject /* thiz */, jint num_classes, jint num_dims, jfloat aggressiveness) { @@ -45,8 +45,8 @@ jlong Java_android_bordeaux_learning_MulticlassPA_initNativeClassifier(JNIEnv* e } -jboolean Java_android_bordeaux_learning_MulticlassPA_deleteNativeClassifier(JNIEnv* env, - jobject thiz, +jboolean Java_android_bordeaux_learning_MulticlassPA_deleteNativeClassifier(JNIEnv* /* env */, + jobject /* thiz */, jlong paPtr) { MulticlassPA* classifier = (MulticlassPA*) paPtr; delete classifier; @@ -54,7 +54,7 @@ jboolean Java_android_bordeaux_learning_MulticlassPA_deleteNativeClassifier(JNIE } jboolean Java_android_bordeaux_learning_MulticlassPA_nativeSparseTrainOneExample(JNIEnv* env, - jobject thiz, + jobject /* thiz */, jintArray index_array, jfloatArray value_array, jint target, @@ -87,7 +87,7 @@ jboolean Java_android_bordeaux_learning_MulticlassPA_nativeSparseTrainOneExample jint Java_android_bordeaux_learning_MulticlassPA_nativeSparseGetClass(JNIEnv* env, - jobject thiz, + jobject /* thiz */, jintArray index_array, jfloatArray value_array, jlong paPtr) { diff --git a/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.h b/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.h index 81fca8a9e..dd0f43d5c 100644 --- a/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.h +++ b/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.h @@ -15,7 +15,7 @@ */ #ifndef LEARNINGFW_JNI_MULTICLASS_PA_H -#define LEAENINGFW_JNI_MULTICLASS_PA_H +#define LEARNINGFW_JNI_MULTICLASS_PA_H #include <jni.h> @@ -56,4 +56,4 @@ Java_android_bordeaux_learning_MulticlassPA_nativeSparseGetClass(JNIEnv* env, } #endif -#endif /* ANDROID_LERNINGFW_JNI_MULTICLASS_PA_H */ +#endif /* ANDROID_LEARNINGFW_JNI_MULTICLASS_PA_H */ diff --git a/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.cpp b/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.cpp index f54b33e36..fd45edaa1 100644 --- a/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.cpp +++ b/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.cpp @@ -49,7 +49,7 @@ void ConvertParameter2Object(JNIEnv* env, jobjectArray *keys, jobjectArray *valu } void DecomposeSparseWeightVector(JNIEnv* env, jobjectArray *keys, jfloatArray *values, - const int length, SparseWeightVector<string> *sample) { + SparseWeightVector<string> *sample) { SparseWeightVector<string>::Wmap w_ = sample->GetMap(); int i=0; @@ -68,7 +68,7 @@ void DecomposeSparseWeightVector(JNIEnv* env, jobjectArray *keys, jfloatArray *v jboolean Java_android_bordeaux_learning_StochasticLinearRanker_nativeSetWeightClassifier( JNIEnv* env, - jobject thiz, + jobject /* thiz */, jobjectArray key_array_model, jfloatArray value_array_model, jfloat normalizer_model, @@ -94,7 +94,7 @@ jboolean Java_android_bordeaux_learning_StochasticLinearRanker_nativeSetWeightCl jboolean Java_android_bordeaux_learning_StochasticLinearRanker_nativeSetParameterClassifier( JNIEnv* env, - jobject thiz, + jobject /* thiz */, jstring key, jstring value, jlong paPtr) { @@ -227,8 +227,8 @@ jboolean Java_android_bordeaux_learning_StochasticLinearRanker_nativeSetParamete } jint Java_android_bordeaux_learning_StochasticLinearRanker_nativeGetLengthClassifier( - JNIEnv* env, - jobject thiz, + JNIEnv* /* env */, + jobject /* thiz */, jlong paPtr) { StochasticLinearRanker<string>* classifier = (StochasticLinearRanker<string>*) paPtr; @@ -248,7 +248,7 @@ std::string ConvertFloat2String(float v){ void Java_android_bordeaux_learning_StochasticLinearRanker_nativeGetParameterClassifier( JNIEnv* env, - jobject thiz, + jobject /* thiz */, jobjectArray key_array_param, jobjectArray value_array_param, jlong paPtr){ @@ -367,7 +367,7 @@ void Java_android_bordeaux_learning_StochasticLinearRanker_nativeGetParameterCla void Java_android_bordeaux_learning_StochasticLinearRanker_nativeGetWeightClassifier( JNIEnv* env, - jobject thiz, + jobject /* thiz */, jobjectArray key_array_model, jfloatArray value_array_model, jfloat normalizer, @@ -380,18 +380,20 @@ void Java_android_bordeaux_learning_StochasticLinearRanker_nativeGetWeightClassi int array_len = w_map.size(); normalizer = M_weights.GetNormalizer(); - DecomposeSparseWeightVector(env, &key_array_model, &value_array_model, array_len, &M_weights); + DecomposeSparseWeightVector(env, &key_array_model, &value_array_model, &M_weights); } -jlong Java_android_bordeaux_learning_StochasticLinearRanker_initNativeClassifier(JNIEnv* env, - jobject thiz) { +jlong Java_android_bordeaux_learning_StochasticLinearRanker_initNativeClassifier( + JNIEnv* /* env */, + jobject /* thiz */) { StochasticLinearRanker<string>* classifier = new StochasticLinearRanker<string>(); return ((jlong) classifier); } -jboolean Java_android_bordeaux_learning_StochasticLinearRanker_deleteNativeClassifier(JNIEnv* env, - jobject thiz, - jlong paPtr) { +jboolean Java_android_bordeaux_learning_StochasticLinearRanker_deleteNativeClassifier( + JNIEnv* /* env */, + jobject /* thiz */, + jlong paPtr) { StochasticLinearRanker<string>* classifier = (StochasticLinearRanker<string>*) paPtr; delete classifier; return JNI_TRUE; @@ -399,7 +401,7 @@ jboolean Java_android_bordeaux_learning_StochasticLinearRanker_deleteNativeClass jboolean Java_android_bordeaux_learning_StochasticLinearRanker_nativeUpdateClassifier( JNIEnv* env, - jobject thiz, + jobject /* thiz */, jobjectArray key_array_positive, jfloatArray value_array_positive, jobjectArray key_array_negative, @@ -438,7 +440,7 @@ jboolean Java_android_bordeaux_learning_StochasticLinearRanker_nativeUpdateClass jfloat Java_android_bordeaux_learning_StochasticLinearRanker_nativeScoreSample( JNIEnv* env, - jobject thiz, + jobject /* thiz */, jobjectArray key_array, jfloatArray value_array, jlong paPtr) { diff --git a/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.h b/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.h index 09a7047bc..fd187b009 100644 --- a/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.h +++ b/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.h @@ -15,7 +15,7 @@ */ #ifndef LEARNING_JNI_STOCHASTIC_LINEAR_RANKER_H -#define LEAENING_JNI_STOCHASTIC_LINEAR_RANKER_H +#define LEARNING_JNI_STOCHASTIC_LINEAR_RANKER_H #include <jni.h> @@ -179,4 +179,4 @@ Java_android_bordeaux_learning_StochasticLinearRanker_nativeSetParameterClassifi } #endif -#endif /* ANDROID_LERNING_JNI_STOCHASTIC_LINEAR_RANKER_H */ +#endif /* ANDROID_LEARNING_JNI_STOCHASTIC_LINEAR_RANKER_H */ |