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

HALUtil: Update to new GetJavaStackTrace function.

Browse Source
This commit is contained in:
Peter Johnson
2017-08-22 20:53:01 -07:00
parent be58a279a5
commit f7016b359f
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wpilibj/src/main/native/cpp/HALUtil.cpp
View File

@@ -80,12 +80,6 @@ void ThrowHalHandleException(JNIEnv *env, int32_t status) {
halHandleExCls.Throw(env, buf.c_str());
}
#ifndef _WIN32
constexpr const char JNI_wpilibjPrefix[] = "edu.wpi.first.wpilibj";
#else
extern const char JNI_wpilibjPrefix[] = "edu.wpi.first.wpilibj";
#endif
void ReportError(JNIEnv *env, int32_t status, bool doThrow) {
if (status == 0) return;
if (status == HAL_HANDLE_ERROR) {
@@ -99,7 +93,7 @@ void ReportError(JNIEnv *env, int32_t status, bool doThrow) {
runtimeExCls.Throw(env, buf.c_str());
} else {
std::string func;
auto stack = GetJavaStackTrace<JNI_wpilibjPrefix>(env, &func);
auto stack = GetJavaStackTrace(env, &func, "edu.wpi.first.wpilibj");
HAL_SendError(1, status, 0, message, func.c_str(), stack.c_str(), 1);
}
}