Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-22 01:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

JNI: Don't call HALInitialize() within an assert().

Browse Source 
If built without asserts enabled (e.g. -DNDEBUG), HALInitialize won't get
called.  Instead call outside the assert and then do the assert.

Change-Id: I51546b9f9fc9a74f8a3a732c4b754257d9697e46
This commit is contained in:
Peter Johnson
2015-11-06 20:46:29 -08:00
parent 7023013c4b
commit 06372cb143
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wpilibj/wpilibJavaJNI/lib/FRCNetworkCommunicationsLibrary.cpp
View File

@@ -256,7 +256,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_communication_FRCNetworkCommun
JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_communication_FRCNetworkCommunicationsLibrary_FRCNetworkCommunicationReserve
(JNIEnv *, jclass)
{
assert(1 == HALInitialize(0));
int rv = HALInitialize(0);
assert(1 == rv);
}
/*