Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +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

5
wpilibj/src/athena/cpp/lib/NotifierJNI.cpp
View File

@@ -79,7 +79,8 @@ void NotifierThreadJNI::Main() {
args.version = JNI_VERSION_1_2;
args.name = const_cast<char *>("Notifier");
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);
@@ -92,7 +93,7 @@ void NotifierThreadJNI::Main() {
jmethodID mid = m_mid;
uint64_t currentTime = m_currentTime;
lock.unlock(); // don't hold mutex during callback execution
env->CallVoidMethod(func, mid, (jlong)currentTime);
env->CallVoidMethod(func, mid, static_cast<jlong>(currentTime));
if (env->ExceptionCheck()) {
env->ExceptionDescribe();
env->ExceptionClear();