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

[hal] Move JNI helpers and sim namespace to hal namespace (#2543)

Browse Source
This commit is contained in:
Peter Johnson
2020-06-26 17:12:55 -07:00
committed by GitHub
parent 3cbec411c7
commit 8a80f97c06
60 changed files with 158 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hal/src/main/native/sim/jni/SimDeviceDataJNI.cpp
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2019-2020 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -20,6 +20,7 @@
#include "edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI.h"
#include "mockdata/SimDeviceData.h"
using namespace hal;
using namespace wpi::java;
static JClass simDeviceInfoCls;
@@ -259,6 +260,7 @@ void CallbackJNI::FreeCallback(JNIEnv* env, int32_t uid) {
store->Free(env);
}
namespace hal {
namespace sim {
bool InitializeSimDeviceDataJNI(JNIEnv* env) {
@@ -295,6 +297,7 @@ void FreeSimDeviceDataJNI(JNIEnv* env) {
}
} // namespace sim
} // namespace hal
extern "C" {