Skip to content

Commit b5e3d06

Browse files
daedricjfirebaugh
authored andcommitted
Avoid a C++ standard ambiguity
See http://stackoverflow.com/q/27810202/52207
1 parent ea930dd commit b5e3d06

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

test/high_level.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -746,8 +746,6 @@ int main()
746746
assert(jni::Make<std::vector<jboolean>>(env, jni::Make<jni::Array<jni::jboolean>>(env, vec)) == vec);
747747

748748

749-
jni::MakeNativeMethod<decltype(Method), Method>("name");
750-
jni::MakeNativeMethod<decltype(StaticMethod), StaticMethod>("name");
751749
jni::MakeNativeMethod<decltype(&Method), &Method>("name");
752750
jni::MakeNativeMethod<decltype(&StaticMethod), &StaticMethod>("name");
753751

@@ -773,7 +771,7 @@ int main()
773771

774772
env.functions->RegisterNatives = [] (JNIEnv*, jclass, const JNINativeMethod* m, jint len) -> jint
775773
{
776-
assert(len == 6);
774+
assert(len <= 6);
777775
std::copy(m, m + len, methods);
778776
return JNI_OK;
779777
};
@@ -784,7 +782,6 @@ int main()
784782
METHOD("true", &Peer::True),
785783
METHOD("false", &Peer::False),
786784
METHOD("void", &Peer::Void),
787-
METHOD("static", Peer::Static),
788785
METHOD("static", &Peer::Static),
789786
jni::MakeNativePeerMethod("static", [] (JNIEnv&, Peer&) {}));
790787

test/low_level.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,6 @@ static void TestMakeNativeMethod()
217217
// jni::MakeNativeMethod("name", "sig", &Struct::StaticMethod );
218218
// jni::MakeNativeMethod("name", "sig", Struct() );
219219

220-
jni::MakeNativeMethod< decltype(Method), Method >("name", "sig");
221-
jni::MakeNativeMethod< decltype(StaticMethod), StaticMethod >("name", "sig");
222220
jni::MakeNativeMethod< decltype(&Method), &Method >("name", "sig");
223221
jni::MakeNativeMethod< decltype(&StaticMethod), &StaticMethod >("name", "sig");
224222
jni::MakeNativeMethod< decltype(&Struct::Method), &Struct::Method >("name", "sig");

0 commit comments

Comments
 (0)