Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +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

17
wpiutil/src/main/native/include/wpi/jni_util.h
View File

@@ -187,7 +187,8 @@ class JArrayRefInner {
};
/**
* Specialization of JArrayRefBase to provide std::string_view conversion.
* Specialization of JArrayRefBase to provide std::string_view conversion
* and span<const uint8_t> conversion.
*/
template <typename C>
class JArrayRefInner<C, jbyte> {
@@ -201,6 +202,14 @@ class JArrayRefInner<C, jbyte> {
}
return {reinterpret_cast<const char*>(arr.data()), arr.size()};
}
span<const uint8_t> uarray() const {
auto arr = static_cast<const C*>(this)->array();
if (arr.empty()) {
return {};
}
return {reinterpret_cast<const uint8_t*>(arr.data()), arr.size()};
}
};
/**
@@ -484,12 +493,12 @@ inline jintArray MakeJIntArray(JNIEnv* env, const std::vector<T>& arr) {
}
/**
* Convert a std::string_view into a jbyteArray.
* Convert a span into a jbyteArray.
*
* @param env JRE environment.
* @param str std::string_view to convert.
* @param str span to convert.
*/
inline jbyteArray MakeJByteArray(JNIEnv* env, std::string_view str) {
inline jbyteArray MakeJByteArray(JNIEnv* env, span<const uint8_t> str) {
jbyteArray jarr = env->NewByteArray(str.size());
if (!jarr) {
return nullptr;