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

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

View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2016-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. */
@@ -73,7 +73,7 @@ static const JExceptionInit exceptions[] = {
&canNotInitializedExCls},
{"edu/wpi/first/hal/util/UncleanStatusException", &uncleanStatusExCls}};
namespace frc {
namespace hal {
void ThrowUncleanStatusException(JNIEnv* env, wpi::StringRef msg,
int32_t status) {
@@ -304,14 +304,14 @@ jobject CreateHALValue(JNIEnv* env, const HAL_Value& value) {
JavaVM* GetJVM() { return jvm; }
} // namespace frc
namespace sim {
jint SimOnLoad(JavaVM* vm, void* reserved);
void SimOnUnload(JavaVM* vm, void* reserved);
} // namespace sim
using namespace frc;
} // namespace hal
using namespace hal;
extern "C" {