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

[wpiutil] MakeJByteArray: Use span<uint8> instead of string_view (#4446)

Browse Source
This commit is contained in:
Peter Johnson
2022-10-02 06:28:50 -07:00
committed by GitHub
parent 10e04e2b13
commit ceaf493811
5 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hal/src/main/native/cpp/jni/CANJNI.cpp
View File

@@ -62,9 +62,7 @@ Java_edu_wpi_first_hal_can_CANJNI_FRCNetCommCANSessionMuxReceiveMessage
if (!CheckCANStatus(env, status, *messageIDPtr)) {
return nullptr;
}
return MakeJByteArray(env,
std::string_view{reinterpret_cast<const char*>(buffer),
static_cast<size_t>(dataSize)});
return MakeJByteArray(env, {buffer, static_cast<size_t>(dataSize)});
}
/*

5
hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.cpp
View File

@@ -57,9 +57,8 @@ void BufferCallbackStore::performCallback(const char* name, uint8_t* buffer,
std::fflush(stdout);
}
auto toCallbackArr = MakeJByteArray(
env, std::string_view{reinterpret_cast<const char*>(buffer),
static_cast<size_t>(length)});
auto toCallbackArr =
MakeJByteArray(env, {buffer, static_cast<size_t>(length)});
env->CallVoidMethod(m_call, sim::GetBufferCallback(), MakeJString(env, name),
toCallbackArr, static_cast<jint>(length));

5
hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.cpp
View File

@@ -58,9 +58,8 @@ void ConstBufferCallbackStore::performCallback(const char* name,
std::fflush(stdout);
}
auto toCallbackArr = MakeJByteArray(
env, std::string_view{reinterpret_cast<const char*>(buffer),
static_cast<size_t>(length)});
auto toCallbackArr =
MakeJByteArray(env, {buffer, static_cast<size_t>(length)});
env->CallVoidMethod(m_call, sim::GetConstBufferCallback(),
MakeJString(env, name), toCallbackArr,