Skip to content

Commit eb89b98

Browse files
kkaeferkkaefer
committed
don't shadow the functions member
1 parent 77ee1e4 commit eb89b98

File tree

3 files changed

+66
-66
lines changed

3 files changed

+66
-66
lines changed

‎test/high_level.cpp‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ int main()
6464
static Testable<jni::jobject> objectValue;
6565
static Testable<jni::jstring> stringValue;
6666

67-
env.functions->FindClass = [] (JNIEnv*, const char* name) -> jclass
67+
env.fns->FindClass = [] (JNIEnv*, const char* name) -> jclass
6868
{
6969
assert(name == Test::Name());
7070
return Unwrap(classValue.Ptr());
@@ -77,33 +77,33 @@ int main()
7777
static bool calledNewWeakGlobalRef = false;
7878
static bool calledNewLocalRef = false;
7979

80-
env.functions->NewGlobalRef = [] (JNIEnv*, jobject obj) -> jobject
80+
env.fns->NewGlobalRef = [] (JNIEnv*, jobject obj) -> jobject
8181
{
8282
calledNewGlobalRef = true;
8383
return obj;
8484
};
8585

86-
env.functions->DeleteGlobalRef = [] (JNIEnv*, jobject) -> void
86+
env.fns->DeleteGlobalRef = [] (JNIEnv*, jobject) -> void
8787
{
8888
};
8989

90-
env.functions->NewWeakGlobalRef = [] (JNIEnv*, jobject obj) -> jobject
90+
env.fns->NewWeakGlobalRef = [] (JNIEnv*, jobject obj) -> jobject
9191
{
9292
calledNewWeakGlobalRef = true;
9393
return obj;
9494
};
9595

96-
env.functions->DeleteWeakGlobalRef = [] (JNIEnv*, jobject) -> void
96+
env.fns->DeleteWeakGlobalRef = [] (JNIEnv*, jobject) -> void
9797
{
9898
};
9999

100-
env.functions->NewLocalRef = [] (JNIEnv*, jobject obj) -> jobject
100+
env.fns->NewLocalRef = [] (JNIEnv*, jobject obj) -> jobject
101101
{
102102
calledNewLocalRef = true;
103103
return obj;
104104
};
105105

106-
env.functions->DeleteLocalRef = [] (JNIEnv*, jobject) -> void
106+
env.fns->DeleteLocalRef = [] (JNIEnv*, jobject) -> void
107107
{
108108
};
109109

@@ -135,7 +135,7 @@ int main()
135135
static Testable<jni::jmethodID> booleanConstructorMethodID;
136136
static Testable<jni::jmethodID> objectConstructorMethodID;
137137

138-
env.functions->GetMethodID = [] (JNIEnv*, jclass, const char* name, const char* sig) -> jmethodID
138+
env.fns->GetMethodID = [] (JNIEnv*, jclass, const char* name, const char* sig) -> jmethodID
139139
{
140140
assert(name == std::string("<init>"));
141141

@@ -157,7 +157,7 @@ int main()
157157
}
158158
};
159159

160-
env.functions->NewObjectV = [] (JNIEnv*, jclass, jmethodID methodID, va_list args) -> jobject
160+
env.fns->NewObjectV = [] (JNIEnv*, jclass, jmethodID methodID, va_list args) -> jobject
161161
{
162162
if (methodID == jni::Unwrap(defaultConstructorMethodID.Ptr()))
163163
{
@@ -193,7 +193,7 @@ int main()
193193
static const char * objectFieldName = "object";
194194
static const char * stringFieldName = "string";
195195

196-
env.functions->GetStaticFieldID = [] (JNIEnv*, jclass, const char* name, const char* sig) -> jfieldID
196+
env.fns->GetStaticFieldID = [] (JNIEnv*, jclass, const char* name, const char* sig) -> jfieldID
197197
{
198198
if (name == booleanFieldName)
199199
{
@@ -216,28 +216,28 @@ int main()
216216
}
217217
};
218218

219-
env.functions->GetStaticBooleanField = [] (JNIEnv*, jclass clazz, jfieldID field) -> jboolean
219+
env.fns->GetStaticBooleanField = [] (JNIEnv*, jclass clazz, jfieldID field) -> jboolean
220220
{
221221
assert(clazz == jni::Unwrap(classValue.Ptr()));
222222
assert(field == jni::Unwrap(booleanFieldID.Ptr()));
223223
return JNI_TRUE;
224224
};
225225

226-
env.functions->GetStaticObjectField = [] (JNIEnv*, jclass clazz, jfieldID field) -> jobject
226+
env.fns->GetStaticObjectField = [] (JNIEnv*, jclass clazz, jfieldID field) -> jobject
227227
{
228228
assert(clazz == jni::Unwrap(classValue.Ptr()));
229229
assert(field == jni::Unwrap(objectFieldID.Ptr()));
230230
return jni::Unwrap(objectValue.Ptr());
231231
};
232232

233-
env.functions->SetStaticBooleanField = [] (JNIEnv*, jclass clazz, jfieldID field, jboolean value)
233+
env.fns->SetStaticBooleanField = [] (JNIEnv*, jclass clazz, jfieldID field, jboolean value)
234234
{
235235
assert(clazz == jni::Unwrap(classValue.Ptr()));
236236
assert(field == jni::Unwrap(booleanFieldID.Ptr()));
237237
assert(value == JNI_FALSE);
238238
};
239239

240-
env.functions->SetStaticObjectField = [] (JNIEnv*, jclass clazz, jfieldID field, jobject value)
240+
env.fns->SetStaticObjectField = [] (JNIEnv*, jclass clazz, jfieldID field, jobject value)
241241
{
242242
assert(clazz == jni::Unwrap(classValue.Ptr()));
243243
assert(field == jni::Unwrap(objectFieldID.Ptr()));
@@ -255,16 +255,16 @@ int main()
255255

256256
/// Field
257257

258-
env.functions->GetFieldID = env.functions->GetStaticFieldID; // Reuse from above
258+
env.fns->GetFieldID = env.fns->GetStaticFieldID; // Reuse from above
259259

260-
env.functions->GetBooleanField = [] (JNIEnv*, jobject obj, jfieldID field) -> jboolean
260+
env.fns->GetBooleanField = [] (JNIEnv*, jobject obj, jfieldID field) -> jboolean
261261
{
262262
assert(obj == jni::Unwrap(objectValue.Ptr()));
263263
assert(field == jni::Unwrap(booleanFieldID.Ptr()));
264264
return JNI_TRUE;
265265
};
266266

267-
env.functions->GetObjectField = [] (JNIEnv*, jobject obj, jfieldID field) -> jobject
267+
env.fns->GetObjectField = [] (JNIEnv*, jobject obj, jfieldID field) -> jobject
268268
{
269269
assert(obj == jni::Unwrap(objectValue.Ptr()));
270270
if (field == jni::Unwrap(objectFieldID.Ptr()))
@@ -281,14 +281,14 @@ int main()
281281
}
282282
};
283283

284-
env.functions->SetBooleanField = [] (JNIEnv*, jobject obj, jfieldID field, jboolean value)
284+
env.fns->SetBooleanField = [] (JNIEnv*, jobject obj, jfieldID field, jboolean value)
285285
{
286286
assert(obj == jni::Unwrap(objectValue.Ptr()));
287287
assert(field == jni::Unwrap(booleanFieldID.Ptr()));
288288
assert(value == JNI_FALSE);
289289
};
290290

291-
env.functions->SetObjectField = [] (JNIEnv*, jobject obj, jfieldID field, jobject value)
291+
env.fns->SetObjectField = [] (JNIEnv*, jobject obj, jfieldID field, jobject value)
292292
{
293293
assert(obj == jni::Unwrap(objectValue.Ptr()));
294294
if (field == jni::Unwrap(objectFieldID.Ptr()))
@@ -333,7 +333,7 @@ int main()
333333
static const char * booleanMethodName = "returnBoolean";
334334
static const char * objectMethodName = "returnObject";
335335

336-
env.functions->GetStaticMethodID = [] (JNIEnv*, jclass, const char* name, const char* sig) -> jmethodID
336+
env.fns->GetStaticMethodID = [] (JNIEnv*, jclass, const char* name, const char* sig) -> jmethodID
337337
{
338338
if (sig == std::string("()V"))
339339
{
@@ -386,7 +386,7 @@ int main()
386386
}
387387
};
388388

389-
env.functions->CallStaticVoidMethodV = [] (JNIEnv*, jclass clazz, jmethodID methodID, va_list args) -> void
389+
env.fns->CallStaticVoidMethodV = [] (JNIEnv*, jclass clazz, jmethodID methodID, va_list args) -> void
390390
{
391391
assert(clazz == jni::Unwrap(classValue.Ptr()));
392392

@@ -417,7 +417,7 @@ int main()
417417
testClass.Call(env, voidBooleanStaticMethod, jni::jni_true);
418418
testClass.Call(env, voidObjectStaticMethod, object);
419419

420-
env.functions->CallStaticBooleanMethodV = [] (JNIEnv*, jclass clazz, jmethodID methodID, va_list args) -> jboolean
420+
env.fns->CallStaticBooleanMethodV = [] (JNIEnv*, jclass clazz, jmethodID methodID, va_list args) -> jboolean
421421
{
422422
assert(clazz == jni::Unwrap(classValue.Ptr()));
423423

@@ -449,7 +449,7 @@ int main()
449449
assert(testClass.Call(env, booleanBooleanStaticMethod, jni::jni_true) == jni::jni_true);
450450
assert(testClass.Call(env, booleanObjectStaticMethod, object) == jni::jni_true);
451451

452-
env.functions->CallStaticObjectMethodV = [] (JNIEnv*, jclass clazz, jmethodID methodID, va_list args) -> jobject
452+
env.fns->CallStaticObjectMethodV = [] (JNIEnv*, jclass clazz, jmethodID methodID, va_list args) -> jobject
453453
{
454454
assert(clazz == jni::Unwrap(classValue.Ptr()));
455455

@@ -484,9 +484,9 @@ int main()
484484

485485
/// Method
486486

487-
env.functions->GetMethodID = env.functions->GetStaticMethodID; // Reuse from above
487+
env.fns->GetMethodID = env.fns->GetStaticMethodID; // Reuse from above
488488

489-
env.functions->CallVoidMethodV = [] (JNIEnv*, jobject obj, jmethodID methodID, va_list args) -> void
489+
env.fns->CallVoidMethodV = [] (JNIEnv*, jobject obj, jmethodID methodID, va_list args) -> void
490490
{
491491
assert(obj == jni::Unwrap(objectValue.Ptr()));
492492

@@ -517,7 +517,7 @@ int main()
517517
object.Call(env, voidBooleanMethod, jni::jni_true);
518518
object.Call(env, voidObjectMethod, object);
519519

520-
env.functions->CallBooleanMethodV = [] (JNIEnv*, jobject obj, jmethodID methodID, va_list args) -> jboolean
520+
env.fns->CallBooleanMethodV = [] (JNIEnv*, jobject obj, jmethodID methodID, va_list args) -> jboolean
521521
{
522522
assert(obj == jni::Unwrap(objectValue.Ptr()));
523523

@@ -549,7 +549,7 @@ int main()
549549
assert(object.Call(env, booleanBooleanMethod, jni::jni_true) == jni::jni_true);
550550
assert(object.Call(env, booleanObjectMethod, object) == jni::jni_true);
551551

552-
env.functions->CallObjectMethodV = [] (JNIEnv*, jobject obj, jmethodID methodID, va_list args) -> jobject
552+
env.fns->CallObjectMethodV = [] (JNIEnv*, jobject obj, jmethodID methodID, va_list args) -> jobject
553553
{
554554
assert(obj == jni::Unwrap(objectValue.Ptr()));
555555

@@ -586,13 +586,13 @@ int main()
586586

587587
static Testable<jni::jarray<jni::jboolean>> booleanArrayValue;
588588

589-
env.functions->GetArrayLength = [] (JNIEnv*, jarray array) -> jsize
589+
env.fns->GetArrayLength = [] (JNIEnv*, jarray array) -> jsize
590590
{
591591
assert(array == jni::Unwrap(booleanArrayValue.Ptr()));
592592
return 42;
593593
};
594594

595-
env.functions->GetBooleanArrayRegion = [] (JNIEnv*, jbooleanArray, jsize, jsize, jboolean* buf)
595+
env.fns->GetBooleanArrayRegion = [] (JNIEnv*, jbooleanArray, jsize, jsize, jboolean* buf)
596596
{
597597
*buf = jni::jni_true;
598598
};
@@ -603,13 +603,13 @@ int main()
603603

604604
static Testable<jni::jarray<jni::jbyte>> byteArrayValue;
605605

606-
env.functions->GetArrayLength = [] (JNIEnv*, jarray array) -> jsize
606+
env.fns->GetArrayLength = [] (JNIEnv*, jarray array) -> jsize
607607
{
608608
assert(array == jni::Unwrap(byteArrayValue.Ptr()));
609609
return 42;
610610
};
611611

612-
env.functions->GetByteArrayRegion = [] (JNIEnv*, jbyteArray, jsize, jsize, jbyte* buf)
612+
env.fns->GetByteArrayRegion = [] (JNIEnv*, jbyteArray, jsize, jsize, jbyte* buf)
613613
{
614614
*buf = 's';
615615
};
@@ -623,13 +623,13 @@ int main()
623623

624624
static Testable<jni::jarray<jni::jobject>> objectArrayValue;
625625

626-
env.functions->GetArrayLength = [] (JNIEnv*, jarray array) -> jsize
626+
env.fns->GetArrayLength = [] (JNIEnv*, jarray array) -> jsize
627627
{
628628
assert(array == jni::Unwrap(objectArrayValue.Ptr()));
629629
return 42;
630630
};
631631

632-
env.functions->GetObjectArrayElement = [] (JNIEnv*, jobjectArray, jsize) -> jobject
632+
env.fns->GetObjectArrayElement = [] (JNIEnv*, jobjectArray, jsize) -> jobject
633633
{
634634
return jni::Unwrap(objectValue.Ptr());
635635
};
@@ -682,13 +682,13 @@ int main()
682682
static const char* lastExceptionMessage = nullptr;
683683
static Testable<jni::jclass> errorClassValue;
684684

685-
env.functions->FindClass = [] (JNIEnv*, const char* name) -> jclass
685+
env.fns->FindClass = [] (JNIEnv*, const char* name) -> jclass
686686
{
687687
assert(name == std::string("java/lang/Error"));
688688
return Unwrap(errorClassValue.Ptr());
689689
};
690690

691-
env.functions->ThrowNew = [] (JNIEnv*, ::jclass clazz, const char* message) -> jint
691+
env.fns->ThrowNew = [] (JNIEnv*, ::jclass clazz, const char* message) -> jint
692692
{
693693
assert(clazz == Unwrap(errorClassValue.Ptr()));
694694
lastExceptionMessage = message;
@@ -717,18 +717,18 @@ int main()
717717

718718
/// Make
719719

720-
env.functions->NewString = [] (JNIEnv*, const jchar*, jsize) -> jstring
720+
env.fns->NewString = [] (JNIEnv*, const jchar*, jsize) -> jstring
721721
{
722722
return jni::Unwrap(stringValue.Ptr());
723723
};
724724

725-
env.functions->GetStringLength = [] (JNIEnv*, jstring str) -> jsize
725+
env.fns->GetStringLength = [] (JNIEnv*, jstring str) -> jsize
726726
{
727727
assert(str == jni::Unwrap(stringValue.Ptr()));
728728
return 5;
729729
};
730730

731-
env.functions->GetStringRegion = [] (JNIEnv*, jstring str, jsize start, jsize len, jchar* buf)
731+
env.fns->GetStringRegion = [] (JNIEnv*, jstring str, jsize start, jsize len, jchar* buf)
732732
{
733733
assert(str == jni::Unwrap(stringValue.Ptr()));
734734
assert(start == 0);
@@ -740,26 +740,26 @@ int main()
740740
assert(jni::Make<std::u16string>(env, jni::Make<jni::String>(env, u"hello")) == u"hello");
741741

742742

743-
env.functions->NewBooleanArray = [] (JNIEnv*, jsize) -> jbooleanArray
743+
env.fns->NewBooleanArray = [] (JNIEnv*, jsize) -> jbooleanArray
744744
{
745745
return jni::Unwrap(booleanArrayValue.Ptr());
746746
};
747747

748-
env.functions->GetArrayLength = [] (JNIEnv*, jarray array) -> jsize
748+
env.fns->GetArrayLength = [] (JNIEnv*, jarray array) -> jsize
749749
{
750750
assert(array == jni::Unwrap(booleanArrayValue.Ptr()));
751751
return 1;
752752
};
753753

754-
env.functions->GetBooleanArrayRegion = [] (JNIEnv*, jbooleanArray array, jsize start, jsize len, jboolean* buf)
754+
env.fns->GetBooleanArrayRegion = [] (JNIEnv*, jbooleanArray array, jsize start, jsize len, jboolean* buf)
755755
{
756756
assert(array == jni::Unwrap(booleanArrayValue.Ptr()));
757757
assert(start == 0);
758758
assert(len == 1);
759759
*buf = jni::jni_true;
760760
};
761761

762-
env.functions->SetBooleanArrayRegion = [] (JNIEnv*, jbooleanArray array, jsize start, jsize len, const jboolean* buf)
762+
env.fns->SetBooleanArrayRegion = [] (JNIEnv*, jbooleanArray array, jsize start, jsize len, const jboolean* buf)
763763
{
764764
assert(array == jni::Unwrap(booleanArrayValue.Ptr()));
765765
assert(start == 0);
@@ -771,26 +771,26 @@ int main()
771771
assert(jni::Make<std::vector<jboolean>>(env, jni::Make<jni::Array<jni::jboolean>>(env, vec)) == vec);
772772

773773

774-
env.functions->NewByteArray = [] (JNIEnv*, jsize) -> jbyteArray
774+
env.fns->NewByteArray = [] (JNIEnv*, jsize) -> jbyteArray
775775
{
776776
return jni::Unwrap(byteArrayValue.Ptr());
777777
};
778778

779-
env.functions->GetArrayLength = [] (JNIEnv*, jarray array) -> jsize
779+
env.fns->GetArrayLength = [] (JNIEnv*, jarray array) -> jsize
780780
{
781781
assert(array == jni::Unwrap(byteArrayValue.Ptr()));
782782
return 1;
783783
};
784784

785-
env.functions->GetByteArrayRegion = [] (JNIEnv*, jbyteArray array, jsize start, jsize len, jbyte* buf)
785+
env.fns->GetByteArrayRegion = [] (JNIEnv*, jbyteArray array, jsize start, jsize len, jbyte* buf)
786786
{
787787
assert(array == jni::Unwrap(byteArrayValue.Ptr()));
788788
assert(start == 0);
789789
assert(len == 1);
790790
*buf = 's';
791791
};
792792

793-
env.functions->SetByteArrayRegion = [] (JNIEnv*, jbyteArray array, jsize start, jsize len, const jbyte* buf)
793+
env.fns->SetByteArrayRegion = [] (JNIEnv*, jbyteArray array, jsize start, jsize len, const jbyte* buf)
794794
{
795795
assert(array == jni::Unwrap(byteArrayValue.Ptr()));
796796
assert(start == 0);
@@ -812,22 +812,22 @@ int main()
812812

813813
static Peer peerInstance;
814814

815-
env.functions->GetFieldID = [] (JNIEnv*, jclass clazz, const char* name, const char* sig) -> jfieldID
815+
env.fns->GetFieldID = [] (JNIEnv*, jclass clazz, const char* name, const char* sig) -> jfieldID
816816
{
817817
assert(clazz = jni::Unwrap(classValue.Ptr()));
818818
assert(name == std::string("peer"));
819819
assert(sig == std::string("J"));
820820
return jni::Unwrap(objectFieldID.Ptr());
821821
};
822822

823-
env.functions->GetLongField = [] (JNIEnv*, jobject obj, jfieldID fieldID) -> jlong
823+
env.fns->GetLongField = [] (JNIEnv*, jobject obj, jfieldID fieldID) -> jlong
824824
{
825825
assert(obj = jni::Unwrap(objectValue.Ptr()));
826826
assert(fieldID = jni::Unwrap(objectFieldID.Ptr()));
827827
return reinterpret_cast<jlong>(&peerInstance);
828828
};
829829

830-
env.functions->RegisterNatives = [] (JNIEnv*, jclass, const JNINativeMethod* m, jint len) -> jint
830+
env.fns->RegisterNatives = [] (JNIEnv*, jclass, const JNINativeMethod* m, jint len) -> jint
831831
{
832832
assert(len <= 6);
833833
std::copy(m, m + len, methods);

0 commit comments

Comments
 (0)