Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-25 01:41: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

6
wpilibj/src/athena/cpp/lib/DigitalGlitchFilterJNI.cpp
View File

@@ -20,7 +20,8 @@ Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_setFilterSelect(
JNIEnv* env, jclass, jint id, jint filter_index) {
int32_t status = 0;
HAL_SetFilterSelect((HAL_DigitalHandle)id, filter_index, &status);
HAL_SetFilterSelect(static_cast<HAL_DigitalHandle>(id), filter_index,
&status);
CheckStatus(env, status);
}
@@ -33,7 +34,8 @@ Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_getFilterSelect(
JNIEnv* env, jclass, jint id) {
int32_t status = 0;
jint result = HAL_GetFilterSelect((HAL_DigitalHandle)id, &status);
jint result =
HAL_GetFilterSelect(static_cast<HAL_DigitalHandle>(id), &status);
CheckStatus(env, status);
return result;
}

12
wpilibj/src/athena/cpp/lib/HALUtil.cpp
View File

@@ -67,7 +67,8 @@ static void GetStackTrace(JNIEnv *env, std::string &res, std::string &func) {
// call getStackTrace
jobjectArray stackTrace =
(jobjectArray)env->CallObjectMethod(throwable, getStackTraceId);
static_cast<jobjectArray>(env->CallObjectMethod(throwable,
getStackTraceId));
if (!stackTrace) return;
@@ -87,7 +88,8 @@ static void GetStackTrace(JNIEnv *env, std::string &res, std::string &func) {
// call to string on the object
jstring stackElementString =
(jstring)env->CallObjectMethod(curStackTraceElement, toStringId);
static_cast<jstring>(env->CallObjectMethod(curStackTraceElement,
toStringId));
if (!stackElementString) {
env->DeleteLocalRef(stackTrace);
@@ -236,8 +238,10 @@ void ThrowBoundaryException(JNIEnv *env, double value, double lower,
env->GetMethodID(boundaryExCls, "<init>", "(Ljava/lang/String;)V");
jobject msg =
env->CallStaticObjectMethod(boundaryExCls, getMessage, (jdouble)value,
(jdouble)lower, (jdouble)upper);
env->CallStaticObjectMethod(boundaryExCls, getMessage,
static_cast<jdouble>(value),
static_cast<jdouble>(lower),
static_cast<jdouble>(upper));
jobject ex = env->NewObject(boundaryExCls, constructor, msg);
env->Throw(static_cast<jthrowable>(ex));
}

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" {

4
wpilibj/src/athena/cpp/lib/NIVisionJNI.cpp
View File

@@ -17,7 +17,7 @@ static void throwJavaException(JNIEnv *env) {
jclass je = env->FindClass("com/ni/vision/VisionException");
int err = imaqGetLastError();
const char* err_text = getErrorText(err);
char* full_err_msg = (char*)malloc(30+strlen(err_text));
char* full_err_msg = static_cast<char*>(malloc(30+strlen(err_text)));
sprintf(full_err_msg, "imaqError: %d: %s", err, err_text);
env->ThrowNew(je, full_err_msg);
free(full_err_msg);
@@ -27,7 +27,7 @@ static void throwJavaException(JNIEnv *env) {
static void dxthrowJavaException(JNIEnv *env, IMAQdxError err) {
jclass je = env->FindClass("com/ni/vision/VisionException");
const char* err_text = getErrorText(err);
char* full_err_msg = (char*)malloc(30+strlen(err_text));
char* full_err_msg = static_cast<char*>(malloc(30+strlen(err_text)));
sprintf(full_err_msg, "IMAQdxError: %d: %s", err, err_text);
env->ThrowNew(je, full_err_msg);
free(full_err_msg);

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();

4
wpilibj/src/athena/cpp/nivision/gen_java.py
View File

@@ -1169,7 +1169,7 @@ static void throwJavaException(JNIEnv *env) {{
jclass je = env->FindClass("{packagepath}/VisionException");
int err = imaqGetLastError();
const char* err_text = getErrorText(err);
char* full_err_msg = (char*)malloc(30+strlen(err_text));
char* full_err_msg = static_cast<char*>(malloc(30+strlen(err_text)));
sprintf(full_err_msg, "imaqError: %d: %s", err, err_text);
env->ThrowNew(je, full_err_msg);
free(full_err_msg);
@@ -1179,7 +1179,7 @@ static void throwJavaException(JNIEnv *env) {{
static void dxthrowJavaException(JNIEnv *env, IMAQdxError err) {{
jclass je = env->FindClass("{packagepath}/VisionException");
const char* err_text = getErrorText(err);
char* full_err_msg = (char*)malloc(30+strlen(err_text));
char* full_err_msg = static_cast<char*>(malloc(30+strlen(err_text)));
sprintf(full_err_msg, "IMAQdxError: %d: %s", err, err_text);
env->ThrowNew(je, full_err_msg);
free(full_err_msg);