mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-21 01:01:43 +00:00
SCRIPT namespace replacements
This commit is contained in:
committed by
Peter Johnson
parent
ae6c043632
commit
9aca8e0fd6
@@ -11,8 +11,8 @@
|
||||
#include "wpi/util/StringExtras.hpp"
|
||||
#include "wpi/util/jni_util.hpp"
|
||||
|
||||
using namespace hal;
|
||||
using namespace wpi::java;
|
||||
using namespace wpi::hal;
|
||||
using namespace wpi::util::java;
|
||||
|
||||
extern "C" {
|
||||
|
||||
@@ -537,9 +537,9 @@ Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setMatchInfo
|
||||
JStringRef gameSpecificMessageRef{env, gameSpecificMessage};
|
||||
|
||||
HAL_MatchInfo halMatchInfo;
|
||||
wpi::format_to_n_c_str(halMatchInfo.eventName, sizeof(halMatchInfo.eventName),
|
||||
wpi::util::format_to_n_c_str(halMatchInfo.eventName, sizeof(halMatchInfo.eventName),
|
||||
"{}", eventNameRef.str());
|
||||
wpi::format_to_n_c_str(
|
||||
wpi::util::format_to_n_c_str(
|
||||
reinterpret_cast<char*>(halMatchInfo.gameSpecificMessage),
|
||||
sizeof(halMatchInfo.gameSpecificMessage), "{}",
|
||||
gameSpecificMessageRef.str());
|
||||
@@ -732,7 +732,7 @@ Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setJoystickName
|
||||
(JNIEnv* env, jclass, jint stick, jstring name)
|
||||
{
|
||||
JStringRef nameJString{env, name};
|
||||
auto str = wpi::make_string(nameJString);
|
||||
auto str = wpi::util::make_string(nameJString);
|
||||
HALSIM_SetJoystickName(stick, &str);
|
||||
}
|
||||
|
||||
@@ -746,7 +746,7 @@ Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setGameSpecificMess
|
||||
(JNIEnv* env, jclass, jstring message)
|
||||
{
|
||||
JStringRef messageJString{env, message};
|
||||
auto str = wpi::make_string(messageJString);
|
||||
auto str = wpi::util::make_string(messageJString);
|
||||
HALSIM_SetGameSpecificMessage(&str);
|
||||
}
|
||||
|
||||
@@ -760,7 +760,7 @@ Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setEventName
|
||||
(JNIEnv* env, jclass, jstring name)
|
||||
{
|
||||
JStringRef nameJString{env, name};
|
||||
auto str = wpi::make_string(nameJString);
|
||||
auto str = wpi::util::make_string(nameJString);
|
||||
HALSIM_SetEventName(&str);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user