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

Replaced C-style casts found by GCC in HAL, wpilibc, and JNI (#211)

Browse Source
This commit is contained in:
Tyler Veness
2016-08-24 21:39:16 -07:00
committed by Peter Johnson
parent 2ec6132fcb
commit 93b486b6ba
16 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wpilibj/src/athena/cpp/lib/InterruptJNI.cpp
View File

@@ -81,7 +81,8 @@ void InterruptThreadJNI::Main() {
args.version = JNI_VERSION_1_2;
args.name = const_cast<char*>("Interrupt");
args.group = nullptr;
jint rs = jvm->AttachCurrentThreadAsDaemon((void**)&env, &args);
jint rs = jvm->AttachCurrentThreadAsDaemon(reinterpret_cast<void**>(&env),
&args);
if (rs != JNI_OK) return;
std::unique_lock<std::mutex> lock(m_mutex);
@@ -95,7 +96,7 @@ void InterruptThreadJNI::Main() {
uint32_t mask = m_mask;
jobject param = m_param;
lock.unlock(); // don't hold mutex during callback execution
env->CallVoidMethod(func, mid, (jint)mask, param);
env->CallVoidMethod(func, mid, static_cast<jint>(mask), param);
if (env->ExceptionCheck()) {
env->ExceptionDescribe();
env->ExceptionClear();
@@ -111,7 +112,7 @@ void InterruptThreadJNI::Main() {
}
void interruptHandler(uint32_t mask, void* param) {
((InterruptJNI*)param)->Notify(mask);
static_cast<InterruptJNI*>(param)->Notify(mask);
}
extern "C" {