mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-26 01:51:41 +00:00
SCRIPT namespace replacements
This commit is contained in:
committed by
Peter Johnson
parent
ae6c043632
commit
9aca8e0fd6
@@ -12,23 +12,23 @@
|
||||
#include "wpi/hal/Errors.h"
|
||||
#include "wpi/nt/DoubleTopic.hpp"
|
||||
|
||||
using namespace hal;
|
||||
using namespace wpi::hal;
|
||||
|
||||
namespace hal {
|
||||
namespace wpi::hal {
|
||||
|
||||
static void initializePower(int32_t* status) {
|
||||
hal::init::CheckInit();
|
||||
wpi::hal::init::CheckInit();
|
||||
}
|
||||
|
||||
} // namespace hal
|
||||
} // namespace wpi::hal
|
||||
|
||||
namespace {
|
||||
struct SystemServerPower {
|
||||
nt::NetworkTableInstance ntInst;
|
||||
wpi::nt::NetworkTableInstance ntInst;
|
||||
|
||||
nt::DoubleSubscriber batterySubscriber;
|
||||
wpi::nt::DoubleSubscriber batterySubscriber;
|
||||
|
||||
explicit SystemServerPower(nt::NetworkTableInstance inst) {
|
||||
explicit SystemServerPower(wpi::nt::NetworkTableInstance inst) {
|
||||
ntInst = inst;
|
||||
|
||||
batterySubscriber =
|
||||
@@ -39,11 +39,11 @@ struct SystemServerPower {
|
||||
|
||||
static ::SystemServerPower* systemServerPower;
|
||||
|
||||
namespace hal::init {
|
||||
namespace wpi::hal::init {
|
||||
void InitializePower() {
|
||||
systemServerPower = new ::SystemServerPower{hal::GetSystemServer()};
|
||||
systemServerPower = new ::SystemServerPower{wpi::hal::GetSystemServer()};
|
||||
}
|
||||
} // namespace hal::init
|
||||
} // namespace wpi::hal::init
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user