Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-24 01:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move entirety of llvm namespace to wpi namespace.

Browse Source 
During shared library loading, a different libLLVM can be pulled in, causing
llvm symbols from dependent libraries to resolve to that library instead of
this one. This has been seen in the wild with the Mesa OpenGL implementation
in JavaFX applications (see wpilibsuite/shuffleboard#361).

This is clearly a very breaking change. For some level of backwards
compatibility, a namespace alias from llvm to wpi is performed in the "llvm"
headers.  Unfortunately, forward declarations of llvm classes will still break,
but compilers seem to generate clear error messages in those cases
("namespace alias 'llvm' not allowed here, assuming 'wpi'").

This change also moves all the wpiutil headers to a single "wpi" subdirectory
from the previously split "llvm", "support", "tcpsockets", and "udpsockets".
Shim headers will be added for backwards compatibility in a later commit.
This commit is contained in:
Peter Johnson
2018-04-29 23:33:19 -07:00
parent 93859eb84f
commit f84018af5f
377 changed files with 2747 additions and 2742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibc/src/main/native/include/Buttons/NetworkButton.h
View File

@@ -9,9 +9,9 @@
#include <memory>
#include <llvm/Twine.h>
#include <networktables/NetworkTable.h>
#include <networktables/NetworkTableEntry.h>
#include <wpi/Twine.h>
#include "Buttons/Button.h"
@@ -19,9 +19,9 @@ namespace frc {
class NetworkButton : public Button {
public:
NetworkButton(const llvm::Twine& tableName, const llvm::Twine& field);
NetworkButton(const wpi::Twine& tableName, const wpi::Twine& field);
NetworkButton(std::shared_ptr<nt::NetworkTable> table,
const llvm::Twine& field);
const wpi::Twine& field);
virtual ~NetworkButton() = default;
virtual bool Get();

6
wpilibc/src/main/native/include/Commands/Command.h
View File

@@ -11,7 +11,7 @@
#include <set>
#include <string>
#include <llvm/Twine.h>
#include <wpi/Twine.h>
#include "ErrorBase.h"
#include "SmartDashboard/SendableBase.h"
@@ -51,9 +51,9 @@ class Command : public ErrorBase, public SendableBase {
public:
Command();
explicit Command(const llvm::Twine& name);
explicit Command(const wpi::Twine& name);
explicit Command(double timeout);
Command(const llvm::Twine& name, double timeout);
Command(const wpi::Twine& name, double timeout);
~Command() override = default;
double TimeSinceInitialized() const;
void Requires(Subsystem* s);

4
wpilibc/src/main/native/include/Commands/CommandGroup.h
View File

@@ -10,7 +10,7 @@
#include <list>
#include <vector>
#include <llvm/Twine.h>
#include <wpi/Twine.h>
#include "Commands/Command.h"
#include "Commands/CommandGroupEntry.h"
@@ -37,7 +37,7 @@ namespace frc {
class CommandGroup : public Command {
public:
CommandGroup() = default;
explicit CommandGroup(const llvm::Twine& name);
explicit CommandGroup(const wpi::Twine& name);
virtual ~CommandGroup() = default;
void AddSequential(Command* command);

4
wpilibc/src/main/native/include/Commands/ConditionalCommand.h
View File

@@ -7,7 +7,7 @@
#pragma once
#include <llvm/Twine.h>
#include <wpi/Twine.h>
#include "Commands/Command.h"
@@ -35,7 +35,7 @@ namespace frc {
class ConditionalCommand : public Command {
public:
explicit ConditionalCommand(Command* onTrue, Command* onFalse = nullptr);
ConditionalCommand(const llvm::Twine& name, Command* onTrue,
ConditionalCommand(const wpi::Twine& name, Command* onTrue,
Command* onFalse = nullptr);
virtual ~ConditionalCommand() = default;

4
wpilibc/src/main/native/include/Commands/InstantCommand.h
View File

@@ -7,7 +7,7 @@
#pragma once
#include <llvm/Twine.h>
#include <wpi/Twine.h>
#include "Commands/Command.h"
@@ -20,7 +20,7 @@ namespace frc {
*/
class InstantCommand : public Command {
public:
explicit InstantCommand(const llvm::Twine& name);
explicit InstantCommand(const wpi::Twine& name);
InstantCommand() = default;
virtual ~InstantCommand() = default;

8
wpilibc/src/main/native/include/Commands/PIDCommand.h
View File

@@ -9,7 +9,7 @@
#include <memory>
#include <llvm/Twine.h>
#include <wpi/Twine.h>
#include "Commands/Command.h"
#include "PIDController.h"
@@ -20,10 +20,10 @@ namespace frc {
class PIDCommand : public Command, public PIDOutput, public PIDSource {
public:
PIDCommand(const llvm::Twine& name, double p, double i, double d);
PIDCommand(const llvm::Twine& name, double p, double i, double d,
PIDCommand(const wpi::Twine& name, double p, double i, double d);
PIDCommand(const wpi::Twine& name, double p, double i, double d,
double period);
PIDCommand(const llvm::Twine& name, double p, double i, double d, double f,
PIDCommand(const wpi::Twine& name, double p, double i, double d, double f,
double period);
PIDCommand(double p, double i, double d);
PIDCommand(double p, double i, double d, double period);

8
wpilibc/src/main/native/include/Commands/PIDSubsystem.h
View File

@@ -9,7 +9,7 @@
#include <memory>
#include <llvm/Twine.h>
#include <wpi/Twine.h>
#include "Commands/Subsystem.h"
#include "PIDController.h"
@@ -29,9 +29,9 @@ namespace frc {
*/
class PIDSubsystem : public Subsystem, public PIDOutput, public PIDSource {
public:
PIDSubsystem(const llvm::Twine& name, double p, double i, double d);
PIDSubsystem(const llvm::Twine& name, double p, double i, double d, double f);
PIDSubsystem(const llvm::Twine& name, double p, double i, double d, double f,
PIDSubsystem(const wpi::Twine& name, double p, double i, double d);
PIDSubsystem(const wpi::Twine& name, double p, double i, double d, double f);
PIDSubsystem(const wpi::Twine& name, double p, double i, double d, double f,
double period);
PIDSubsystem(double p, double i, double d);
PIDSubsystem(double p, double i, double d, double f);

4
wpilibc/src/main/native/include/Commands/PrintCommand.h
View File

@@ -9,7 +9,7 @@
#include <string>
#include <llvm/Twine.h>
#include <wpi/Twine.h>
#include "Commands/InstantCommand.h"
@@ -17,7 +17,7 @@ namespace frc {
class PrintCommand : public InstantCommand {
public:
explicit PrintCommand(const llvm::Twine& message);
explicit PrintCommand(const wpi::Twine& message);
virtual ~PrintCommand() = default;
protected:

2
wpilibc/src/main/native/include/Commands/Scheduler.h
View File

@@ -13,7 +13,7 @@
#include <vector>
#include <networktables/NetworkTableEntry.h>
#include <support/mutex.h>
#include <wpi/mutex.h>
#include "Commands/Command.h"
#include "ErrorBase.h"

16
wpilibc/src/main/native/include/Commands/Subsystem.h
View File

@@ -9,8 +9,8 @@
#include <memory>
#include <llvm/StringRef.h>
#include <llvm/Twine.h>
#include <wpi/StringRef.h>
#include <wpi/Twine.h>
#include "ErrorBase.h"
#include "SmartDashboard/Sendable.h"
@@ -24,20 +24,20 @@ class Subsystem : public ErrorBase, public SendableBase {
friend class Scheduler;
public:
explicit Subsystem(const llvm::Twine& name);
explicit Subsystem(const wpi::Twine& name);
void SetDefaultCommand(Command* command);
Command* GetDefaultCommand();
llvm::StringRef GetDefaultCommandName();
wpi::StringRef GetDefaultCommandName();
void SetCurrentCommand(Command* command);
Command* GetCurrentCommand() const;
llvm::StringRef GetCurrentCommandName() const;
wpi::StringRef GetCurrentCommandName() const;
virtual void Periodic();
virtual void InitDefaultCommand();
void AddChild(const llvm::Twine& name, std::shared_ptr<Sendable> child);
void AddChild(const llvm::Twine& name, Sendable* child);
void AddChild(const llvm::Twine& name, Sendable& child);
void AddChild(const wpi::Twine& name, std::shared_ptr<Sendable> child);
void AddChild(const wpi::Twine& name, Sendable* child);
void AddChild(const wpi::Twine& name, Sendable& child);
void AddChild(std::shared_ptr<Sendable> child);
void AddChild(Sendable* child);
void AddChild(Sendable& child);

4
wpilibc/src/main/native/include/Commands/TimedCommand.h
View File

@@ -7,7 +7,7 @@
#pragma once
#include <llvm/Twine.h>
#include <wpi/Twine.h>
#include "Commands/Command.h"
@@ -20,7 +20,7 @@ namespace frc {
*/
class TimedCommand : public Command {
public:
TimedCommand(const llvm::Twine& name, double timeout);
TimedCommand(const wpi::Twine& name, double timeout);
explicit TimedCommand(double timeout);
virtual ~TimedCommand() = default;

4
wpilibc/src/main/native/include/Commands/WaitCommand.h
View File

@@ -7,7 +7,7 @@
#pragma once
#include <llvm/Twine.h>
#include <wpi/Twine.h>
#include "Commands/TimedCommand.h"
@@ -16,7 +16,7 @@ namespace frc {
class WaitCommand : public TimedCommand {
public:
explicit WaitCommand(double timeout);
WaitCommand(const llvm::Twine& name, double timeout);
WaitCommand(const wpi::Twine& name, double timeout);
virtual ~WaitCommand() = default;
};

4
wpilibc/src/main/native/include/Commands/WaitForChildren.h
View File

@@ -7,7 +7,7 @@
#pragma once
#include <llvm/Twine.h>
#include <wpi/Twine.h>
#include "Commands/Command.h"
@@ -16,7 +16,7 @@ namespace frc {
class WaitForChildren : public Command {
public:
explicit WaitForChildren(double timeout);
WaitForChildren(const llvm::Twine& name, double timeout);
WaitForChildren(const wpi::Twine& name, double timeout);
virtual ~WaitForChildren() = default;
protected:

4
wpilibc/src/main/native/include/Commands/WaitUntilCommand.h
View File

@@ -7,7 +7,7 @@
#pragma once
#include <llvm/Twine.h>
#include <wpi/Twine.h>
#include "Commands/Command.h"
@@ -16,7 +16,7 @@ namespace frc {
class WaitUntilCommand : public Command {
public:
explicit WaitUntilCommand(double time);
WaitUntilCommand(const llvm::Twine& name, double time);
WaitUntilCommand(const wpi::Twine& name, double time);
virtual ~WaitUntilCommand() = default;
protected:

2
wpilibc/src/main/native/include/ControllerPower.h
View File

@@ -7,7 +7,7 @@
#pragma once
#include <support/deprecated.h>
#include <wpi/deprecated.h>
namespace frc {

2
wpilibc/src/main/native/include/DigitalGlitchFilter.h
View File

@@ -11,7 +11,7 @@
#include <array>
#include <support/mutex.h>
#include <wpi/mutex.h>
#include "DigitalSource.h"
#include "SensorBase.h"

4
wpilibc/src/main/native/include/Drive/DifferentialDrive.h
View File

@@ -7,7 +7,7 @@
#pragma once
#include <llvm/raw_ostream.h>
#include <wpi/raw_ostream.h>
#include "Drive/RobotDriveBase.h"
@@ -116,7 +116,7 @@ class DifferentialDrive : public RobotDriveBase {
void SetQuickStopAlpha(double alpha);
void StopMotor() override;
void GetDescription(llvm::raw_ostream& desc) const override;
void GetDescription(wpi::raw_ostream& desc) const override;
void InitSendable(SendableBuilder& builder) override;

4
wpilibc/src/main/native/include/Drive/KilloughDrive.h
View File

@@ -9,7 +9,7 @@
#include <memory>
#include <llvm/raw_ostream.h>
#include <wpi/raw_ostream.h>
#include "Drive/RobotDriveBase.h"
#include "Drive/Vector2d.h"
@@ -65,7 +65,7 @@ class KilloughDrive : public RobotDriveBase {
void DrivePolar(double magnitude, double angle, double zRotation);
void StopMotor() override;
void GetDescription(llvm::raw_ostream& desc) const override;
void GetDescription(wpi::raw_ostream& desc) const override;
void InitSendable(SendableBuilder& builder) override;

4
wpilibc/src/main/native/include/Drive/MecanumDrive.h
View File

@@ -9,7 +9,7 @@
#include <memory>
#include <llvm/raw_ostream.h>
#include <wpi/raw_ostream.h>
#include "Drive/RobotDriveBase.h"
@@ -77,7 +77,7 @@ class MecanumDrive : public RobotDriveBase {
void DrivePolar(double magnitude, double angle, double rotation);
void StopMotor() override;
void GetDescription(llvm::raw_ostream& desc) const override;
void GetDescription(wpi::raw_ostream& desc) const override;
void InitSendable(SendableBuilder& builder) override;

8
wpilibc/src/main/native/include/Drive/RobotDriveBase.h
View File

@@ -9,8 +9,8 @@
#include <memory>
#include <llvm/ArrayRef.h>
#include <llvm/raw_ostream.h>
#include <wpi/ArrayRef.h>
#include <wpi/raw_ostream.h>
#include "MotorSafety.h"
#include "MotorSafetyHelper.h"
@@ -53,12 +53,12 @@ class RobotDriveBase : public MotorSafety, public SendableBase {
void StopMotor() override = 0;
bool IsSafetyEnabled() const override;
void SetSafetyEnabled(bool enabled) override;
void GetDescription(llvm::raw_ostream& desc) const override = 0;
void GetDescription(wpi::raw_ostream& desc) const override = 0;
protected:
double Limit(double number);
double ApplyDeadband(double number, double deadband);
void Normalize(llvm::MutableArrayRef<double> wheelSpeeds);
void Normalize(wpi::MutableArrayRef<double> wheelSpeeds);
double m_deadband = 0.02;
double m_maxOutput = 1.0;

22
wpilibc/src/main/native/include/DriverStation.h
View File

@@ -14,10 +14,10 @@
#include <thread>
#include <HAL/DriverStation.h>
#include <llvm/Twine.h>
#include <support/condition_variable.h>
#include <support/deprecated.h>
#include <support/mutex.h>
#include <wpi/Twine.h>
#include <wpi/condition_variable.h>
#include <wpi/deprecated.h>
#include <wpi/mutex.h>
#include "ErrorBase.h"
#include "RobotState.h"
@@ -38,11 +38,11 @@ class DriverStation : public ErrorBase, public RobotStateInterface {
~DriverStation() override;
static DriverStation& GetInstance();
static void ReportError(const llvm::Twine& error);
static void ReportWarning(const llvm::Twine& error);
static void ReportError(bool isError, int code, const llvm::Twine& error,
const llvm::Twine& location,
const llvm::Twine& stack);
static void ReportError(const wpi::Twine& error);
static void ReportWarning(const wpi::Twine& error);
static void ReportError(bool isError, int code, const wpi::Twine& error,
const wpi::Twine& location,
const wpi::Twine& stack);
static constexpr int kJoystickPorts = 6;
@@ -130,8 +130,8 @@ class DriverStation : public ErrorBase, public RobotStateInterface {
private:
DriverStation();
void ReportJoystickUnpluggedError(const llvm::Twine& message);
void ReportJoystickUnpluggedWarning(const llvm::Twine& message);
void ReportJoystickUnpluggedError(const wpi::Twine& message);
void ReportJoystickUnpluggedWarning(const wpi::Twine& message);
void Run();
void UpdateControlWord(bool force, HAL_ControlWord& controlWord) const;
void SendMatchData();

8
wpilibc/src/main/native/include/Error.h
View File

@@ -11,8 +11,8 @@
#include <string>
#include <llvm/StringRef.h>
#include <llvm/Twine.h>
#include <wpi/StringRef.h>
#include <wpi/Twine.h>
#ifdef _WIN32
#include <Windows.h>
@@ -47,8 +47,8 @@ class Error {
const ErrorBase* GetOriginatingObject() const;
double GetTimestamp() const;
void Clear();
void Set(Code code, const llvm::Twine& contextMessage,
llvm::StringRef filename, llvm::StringRef function, int lineNumber,
void Set(Code code, const wpi::Twine& contextMessage,
wpi::StringRef filename, wpi::StringRef function, int lineNumber,
const ErrorBase* originatingObject);
private:

40
wpilibc/src/main/native/include/ErrorBase.h
View File

@@ -7,9 +7,9 @@
#pragma once
#include <llvm/StringRef.h>
#include <llvm/Twine.h>
#include <support/mutex.h>
#include <wpi/StringRef.h>
#include <wpi/Twine.h>
#include <wpi/mutex.h>
#include "Base.h"
#include "Error.h"
@@ -82,35 +82,35 @@ class ErrorBase {
virtual Error& GetError();
virtual const Error& GetError() const;
virtual void SetErrnoError(const llvm::Twine& contextMessage,
llvm::StringRef filename, llvm::StringRef function,
virtual void SetErrnoError(const wpi::Twine& contextMessage,
wpi::StringRef filename, wpi::StringRef function,
int lineNumber) const;
virtual void SetImaqError(int success, const llvm::Twine& contextMessage,
llvm::StringRef filename, llvm::StringRef function,
virtual void SetImaqError(int success, const wpi::Twine& contextMessage,
wpi::StringRef filename, wpi::StringRef function,
int lineNumber) const;
virtual void SetError(Error::Code code, const llvm::Twine& contextMessage,
llvm::StringRef filename, llvm::StringRef function,
virtual void SetError(Error::Code code, const wpi::Twine& contextMessage,
wpi::StringRef filename, wpi::StringRef function,
int lineNumber) const;
virtual void SetErrorRange(Error::Code code, int32_t minRange,
int32_t maxRange, int32_t requestedValue,
const llvm::Twine& contextMessage,
llvm::StringRef filename, llvm::StringRef function,
const wpi::Twine& contextMessage,
wpi::StringRef filename, wpi::StringRef function,
int lineNumber) const;
virtual void SetWPIError(const llvm::Twine& errorMessage, Error::Code code,
const llvm::Twine& contextMessage,
llvm::StringRef filename, llvm::StringRef function,
virtual void SetWPIError(const wpi::Twine& errorMessage, Error::Code code,
const wpi::Twine& contextMessage,
wpi::StringRef filename, wpi::StringRef function,
int lineNumber) const;
virtual void CloneError(const ErrorBase& rhs) const;
virtual void ClearError() const;
virtual bool StatusIsFatal() const;
static void SetGlobalError(Error::Code code,
const llvm::Twine& contextMessage,
llvm::StringRef filename, llvm::StringRef function,
const wpi::Twine& contextMessage,
wpi::StringRef filename, wpi::StringRef function,
int lineNumber);
static void SetGlobalWPIError(const llvm::Twine& errorMessage,
const llvm::Twine& contextMessage,
llvm::StringRef filename,
llvm::StringRef function, int lineNumber);
static void SetGlobalWPIError(const wpi::Twine& errorMessage,
const wpi::Twine& contextMessage,
wpi::StringRef filename,
wpi::StringRef function, int lineNumber);
static Error& GetGlobalError();
protected:

10
wpilibc/src/main/native/include/Filters/LinearDigitalFilter.h
View File

@@ -10,7 +10,7 @@
#include <memory>
#include <vector>
#include <llvm/ArrayRef.h>
#include <wpi/ArrayRef.h>
#include "Filter.h"
#include "circular_buffer.h"
@@ -69,11 +69,11 @@ namespace frc {
*/
class LinearDigitalFilter : public Filter {
public:
LinearDigitalFilter(PIDSource& source, llvm::ArrayRef<double> ffGains,
llvm::ArrayRef<double> fbGains);
LinearDigitalFilter(PIDSource& source, wpi::ArrayRef<double> ffGains,
wpi::ArrayRef<double> fbGains);
LinearDigitalFilter(std::shared_ptr<PIDSource> source,
llvm::ArrayRef<double> ffGains,
llvm::ArrayRef<double> fbGains);
wpi::ArrayRef<double> ffGains,
wpi::ArrayRef<double> fbGains);
// Static methods to create commonly used filters
static LinearDigitalFilter SinglePoleIIR(PIDSource& source,

2
wpilibc/src/main/native/include/GamepadBase.h
View File

@@ -7,7 +7,7 @@
#pragma once
#include <support/deprecated.h>
#include <wpi/deprecated.h>
#include "GenericHID.h"

2
wpilibc/src/main/native/include/Joystick.h
View File

@@ -9,7 +9,7 @@
#include <array>
#include <support/deprecated.h>
#include <wpi/deprecated.h>
#include "GenericHID.h"

2
wpilibc/src/main/native/include/JoystickBase.h
View File

@@ -7,7 +7,7 @@
#pragma once
#include <support/deprecated.h>
#include <wpi/deprecated.h>
#include "GenericHID.h"

22
wpilibc/src/main/native/include/LiveWindow/LiveWindow.h
View File

@@ -9,8 +9,8 @@
#include <memory>
#include <llvm/Twine.h>
#include <support/deprecated.h>
#include <wpi/Twine.h>
#include <wpi/deprecated.h>
#include "SmartDashboard/Sendable.h"
@@ -31,30 +31,30 @@ class LiveWindow {
void Run() { UpdateValues(); }
WPI_DEPRECATED("use Sendable::SetName() instead")
void AddSensor(const llvm::Twine& subsystem, const llvm::Twine& name,
void AddSensor(const wpi::Twine& subsystem, const wpi::Twine& name,
Sendable* component);
WPI_DEPRECATED("use Sendable::SetName() instead")
void AddSensor(const llvm::Twine& subsystem, const llvm::Twine& name,
void AddSensor(const wpi::Twine& subsystem, const wpi::Twine& name,
Sendable& component);
WPI_DEPRECATED("use Sendable::SetName() instead")
void AddSensor(const llvm::Twine& subsystem, const llvm::Twine& name,
void AddSensor(const wpi::Twine& subsystem, const wpi::Twine& name,
std::shared_ptr<Sendable> component);
WPI_DEPRECATED("use Sendable::SetName() instead")
void AddActuator(const llvm::Twine& subsystem, const llvm::Twine& name,
void AddActuator(const wpi::Twine& subsystem, const wpi::Twine& name,
Sendable* component);
WPI_DEPRECATED("use Sendable::SetName() instead")
void AddActuator(const llvm::Twine& subsystem, const llvm::Twine& name,
void AddActuator(const wpi::Twine& subsystem, const wpi::Twine& name,
Sendable& component);
WPI_DEPRECATED("use Sendable::SetName() instead")
void AddActuator(const llvm::Twine& subsystem, const llvm::Twine& name,
void AddActuator(const wpi::Twine& subsystem, const wpi::Twine& name,
std::shared_ptr<Sendable> component);
WPI_DEPRECATED("use SensorBase::SetName() instead")
void AddSensor(const llvm::Twine& type, int channel, Sendable* component);
void AddSensor(const wpi::Twine& type, int channel, Sendable* component);
WPI_DEPRECATED("use SensorBase::SetName() instead")
void AddActuator(const llvm::Twine& type, int channel, Sendable* component);
void AddActuator(const wpi::Twine& type, int channel, Sendable* component);
WPI_DEPRECATED("use SensorBase::SetName() instead")
void AddActuator(const llvm::Twine& type, int module, int channel,
void AddActuator(const wpi::Twine& type, int module, int channel,
Sendable* component);
void Add(std::shared_ptr<Sendable> component);

6
wpilibc/src/main/native/include/LiveWindow/LiveWindowSendable.h
View File

@@ -9,7 +9,7 @@
#include <string>
#include <support/deprecated.h>
#include <wpi/deprecated.h>
#include "SmartDashboard/Sendable.h"
@@ -39,9 +39,9 @@ class WPI_DEPRECATED("use Sendable directly instead") LiveWindowSendable
virtual void StopLiveWindowMode() = 0;
std::string GetName() const override;
void SetName(const llvm::Twine& name) override;
void SetName(const wpi::Twine& name) override;
std::string GetSubsystem() const override;
void SetSubsystem(const llvm::Twine& subsystem) override;
void SetSubsystem(const wpi::Twine& subsystem) override;
void InitSendable(SendableBuilder& builder) override;
};

4
wpilibc/src/main/native/include/MotorSafety.h
View File

@@ -9,7 +9,7 @@
#define DEFAULT_SAFETY_EXPIRATION 0.1
#include <llvm/raw_ostream.h>
#include <wpi/raw_ostream.h>
namespace frc {
@@ -21,7 +21,7 @@ class MotorSafety {
virtual void StopMotor() = 0;
virtual void SetSafetyEnabled(bool enabled) = 0;
virtual bool IsSafetyEnabled() const = 0;
virtual void GetDescription(llvm::raw_ostream& desc) const = 0;
virtual void GetDescription(wpi::raw_ostream& desc) const = 0;
};
} // namespace frc

2
wpilibc/src/main/native/include/MotorSafetyHelper.h
View File

@@ -9,7 +9,7 @@
#include <set>
#include <support/mutex.h>
#include <wpi/mutex.h>
#include "ErrorBase.h"

2
wpilibc/src/main/native/include/NidecBrushless.h
View File

@@ -49,7 +49,7 @@ class NidecBrushless : public ErrorBase,
bool IsAlive() const override;
void SetSafetyEnabled(bool enabled) override;
bool IsSafetyEnabled() const override;
void GetDescription(llvm::raw_ostream& desc) const override;
void GetDescription(wpi::raw_ostream& desc) const override;
int GetChannel() const;

2
wpilibc/src/main/native/include/Notifier.h
View File

@@ -15,7 +15,7 @@
#include <utility>
#include <HAL/Notifier.h>
#include <support/mutex.h>
#include <wpi/mutex.h>
#include "ErrorBase.h"

4
wpilibc/src/main/native/include/PIDController.h
View File

@@ -10,8 +10,8 @@
#include <memory>
#include <string>
#include <support/deprecated.h>
#include <support/mutex.h>
#include <wpi/deprecated.h>
#include <wpi/mutex.h>
#include "Base.h"
#include "Controller.h"

28
wpilibc/src/main/native/include/Preferences.h
View File

@@ -38,20 +38,20 @@ class Preferences : public ErrorBase {
static Preferences* GetInstance();
std::vector<std::string> GetKeys();
std::string GetString(llvm::StringRef key, llvm::StringRef defaultValue = "");
int GetInt(llvm::StringRef key, int defaultValue = 0);
double GetDouble(llvm::StringRef key, double defaultValue = 0.0);
float GetFloat(llvm::StringRef key, float defaultValue = 0.0);
bool GetBoolean(llvm::StringRef key, bool defaultValue = false);
int64_t GetLong(llvm::StringRef key, int64_t defaultValue = 0);
void PutString(llvm::StringRef key, llvm::StringRef value);
void PutInt(llvm::StringRef key, int value);
void PutDouble(llvm::StringRef key, double value);
void PutFloat(llvm::StringRef key, float value);
void PutBoolean(llvm::StringRef key, bool value);
void PutLong(llvm::StringRef key, int64_t value);
bool ContainsKey(llvm::StringRef key);
void Remove(llvm::StringRef key);
std::string GetString(wpi::StringRef key, wpi::StringRef defaultValue = "");
int GetInt(wpi::StringRef key, int defaultValue = 0);
double GetDouble(wpi::StringRef key, double defaultValue = 0.0);
float GetFloat(wpi::StringRef key, float defaultValue = 0.0);
bool GetBoolean(wpi::StringRef key, bool defaultValue = false);
int64_t GetLong(wpi::StringRef key, int64_t defaultValue = 0);
void PutString(wpi::StringRef key, wpi::StringRef value);
void PutInt(wpi::StringRef key, int value);
void PutDouble(wpi::StringRef key, double value);
void PutFloat(wpi::StringRef key, float value);
void PutBoolean(wpi::StringRef key, bool value);
void PutLong(wpi::StringRef key, int64_t value);
bool ContainsKey(wpi::StringRef key);
void Remove(wpi::StringRef key);
protected:
Preferences();

4
wpilibc/src/main/native/include/Relay.h
View File

@@ -10,7 +10,7 @@
#include <memory>
#include <HAL/Types.h>
#include <llvm/raw_ostream.h>
#include <wpi/raw_ostream.h>
#include "ErrorBase.h"
#include "MotorSafety.h"
@@ -50,7 +50,7 @@ class Relay : public MotorSafety, public ErrorBase, public SendableBase {
void StopMotor() override;
bool IsSafetyEnabled() const override;
void SetSafetyEnabled(bool enabled) override;
void GetDescription(llvm::raw_ostream& desc) const override;
void GetDescription(wpi::raw_ostream& desc) const override;
void InitSendable(SendableBuilder& builder) override;

2
wpilibc/src/main/native/include/Resource.h
View File

@@ -13,7 +13,7 @@
#include <string>
#include <vector>
#include <support/mutex.h>
#include <wpi/mutex.h>
#include "ErrorBase.h"

24
wpilibc/src/main/native/include/RobotBase.h
View File

@@ -10,7 +10,7 @@
#include <thread>
#include <HAL/HAL.h>
#include <llvm/raw_ostream.h>
#include <wpi/raw_ostream.h>
#include "Base.h"
@@ -18,17 +18,17 @@ namespace frc {
class DriverStation;
#define START_ROBOT_CLASS(_ClassName_) \
int main() { \
if (!HAL_Initialize(500, 0)) { \
llvm::errs() << "FATAL ERROR: HAL could not be initialized\n"; \
return -1; \
} \
HAL_Report(HALUsageReporting::kResourceType_Language, \
HALUsageReporting::kLanguage_CPlusPlus); \
llvm::outs() << "\n********** Robot program starting **********\n"; \
static _ClassName_ robot; \
robot.StartCompetition(); \
#define START_ROBOT_CLASS(_ClassName_) \
int main() { \
if (!HAL_Initialize(500, 0)) { \
wpi::errs() << "FATAL ERROR: HAL could not be initialized\n"; \
return -1; \
} \
HAL_Report(HALUsageReporting::kResourceType_Language, \
HALUsageReporting::kLanguage_CPlusPlus); \
wpi::outs() << "\n********** Robot program starting **********\n"; \
static _ClassName_ robot; \
robot.StartCompetition(); \
}
/**

6
wpilibc/src/main/native/include/RobotDrive.h
View File

@@ -9,8 +9,8 @@
#include <memory>
#include <llvm/raw_ostream.h>
#include <support/deprecated.h>
#include <wpi/deprecated.h>
#include <wpi/raw_ostream.h>
#include "ErrorBase.h"
#include "MotorSafety.h"
@@ -105,7 +105,7 @@ class RobotDrive : public MotorSafety, public ErrorBase {
void StopMotor() override;
bool IsSafetyEnabled() const override;
void SetSafetyEnabled(bool enabled) override;
void GetDescription(llvm::raw_ostream& desc) const override;
void GetDescription(wpi::raw_ostream& desc) const override;
protected:
void InitRobotDrive();

4
wpilibc/src/main/native/include/SPI.h
View File

@@ -11,7 +11,7 @@
#include <memory>
#include <llvm/ArrayRef.h>
#include <wpi/ArrayRef.h>
#include "ErrorBase.h"
@@ -58,7 +58,7 @@ class SPI : public ErrorBase {
void InitAuto(int bufferSize);
void FreeAuto();
void SetAutoTransmitData(llvm::ArrayRef<uint8_t> dataToSend, int zeroSize);
void SetAutoTransmitData(wpi::ArrayRef<uint8_t> dataToSend, int zeroSize);
void StartAutoRate(double period);
void StartAutoTrigger(DigitalSource& source, bool rising, bool falling);
void StopAuto();

4
wpilibc/src/main/native/include/SafePWM.h
View File

@@ -9,7 +9,7 @@
#include <memory>
#include <llvm/raw_ostream.h>
#include <wpi/raw_ostream.h>
#include "MotorSafety.h"
#include "MotorSafetyHelper.h"
@@ -36,7 +36,7 @@ class SafePWM : public PWM, public MotorSafety {
void StopMotor();
bool IsSafetyEnabled() const;
void SetSafetyEnabled(bool enabled);
void GetDescription(llvm::raw_ostream& desc) const;
void GetDescription(wpi::raw_ostream& desc) const;
virtual void SetSpeed(double speed);

2
wpilibc/src/main/native/include/SampleRobot.h
View File

@@ -7,7 +7,7 @@
#pragma once
#include <support/deprecated.h>
#include <wpi/deprecated.h>
#include "RobotBase.h"

8
wpilibc/src/main/native/include/SerialPort.h
View File

@@ -9,8 +9,8 @@
#include <string>
#include <llvm/StringRef.h>
#include <support/deprecated.h>
#include <wpi/StringRef.h>
#include <wpi/deprecated.h>
#include "ErrorBase.h"
@@ -58,7 +58,7 @@ class SerialPort : public ErrorBase {
SerialPort(int baudRate, Port port = kOnboard, int dataBits = 8,
Parity parity = kParity_None, StopBits stopBits = kStopBits_One);
WPI_DEPRECATED("Will be removed for 2019")
SerialPort(int baudRate, llvm::StringRef portName, Port port = kOnboard,
SerialPort(int baudRate, wpi::StringRef portName, Port port = kOnboard,
int dataBits = 8, Parity parity = kParity_None,
StopBits stopBits = kStopBits_One);
~SerialPort();
@@ -72,7 +72,7 @@ class SerialPort : public ErrorBase {
int GetBytesReceived();
int Read(char* buffer, int count);
int Write(const char* buffer, int count);
int Write(llvm::StringRef buffer);
int Write(wpi::StringRef buffer);
void SetTimeout(double timeout);
void SetReadBufferSize(int size);
void SetWriteBufferSize(int size);

6
wpilibc/src/main/native/include/SmartDashboard/NamedSendable.h
View File

@@ -9,7 +9,7 @@
#include <string>
#include <support/deprecated.h>
#include <wpi/deprecated.h>
#include "SmartDashboard/Sendable.h"
@@ -23,9 +23,9 @@ namespace frc {
class WPI_DEPRECATED("use Sendable directly instead") NamedSendable
: public Sendable {
public:
void SetName(const llvm::Twine& name) override;
void SetName(const wpi::Twine& name) override;
std::string GetSubsystem() const override;
void SetSubsystem(const llvm::Twine& subsystem) override;
void SetSubsystem(const wpi::Twine& subsystem) override;
void InitSendable(SendableBuilder& builder) override;
};

8
wpilibc/src/main/native/include/SmartDashboard/Sendable.h
View File

@@ -9,7 +9,7 @@
#include <string>
#include <llvm/Twine.h>
#include <wpi/Twine.h>
namespace frc {
@@ -31,7 +31,7 @@ class Sendable {
*
* @param name name
*/
virtual void SetName(const llvm::Twine& name) = 0;
virtual void SetName(const wpi::Twine& name) = 0;
/**
* Sets both the subsystem name and device name of this Sendable object.
@@ -39,7 +39,7 @@ class Sendable {
* @param subsystem subsystem name
* @param name device name
*/
void SetName(const llvm::Twine& subsystem, const llvm::Twine& name) {
void SetName(const wpi::Twine& subsystem, const wpi::Twine& name) {
SetSubsystem(subsystem);
SetName(name);
}
@@ -56,7 +56,7 @@ class Sendable {
*
* @param subsystem subsystem name
*/
virtual void SetSubsystem(const llvm::Twine& subsystem) = 0;
virtual void SetSubsystem(const wpi::Twine& subsystem) = 0;
/**
* Initializes this Sendable object.

10
wpilibc/src/main/native/include/SmartDashboard/SendableBase.h
View File

@@ -10,7 +10,7 @@
#include <memory>
#include <string>
#include <support/mutex.h>
#include <wpi/mutex.h>
#include "Sendable.h"
@@ -24,16 +24,16 @@ class SendableBase : public Sendable {
using Sendable::SetName;
std::string GetName() const final;
void SetName(const llvm::Twine& name) final;
void SetName(const wpi::Twine& name) final;
std::string GetSubsystem() const final;
void SetSubsystem(const llvm::Twine& subsystem) final;
void SetSubsystem(const wpi::Twine& subsystem) final;
protected:
void AddChild(std::shared_ptr<Sendable> child);
void AddChild(void* child);
void SetName(const llvm::Twine& moduleType, int channel);
void SetName(const llvm::Twine& moduleType, int moduleNumber, int channel);
void SetName(const wpi::Twine& moduleType, int channel);
void SetName(const wpi::Twine& moduleType, int moduleNumber, int channel);
private:
mutable wpi::mutex m_mutex;

66
wpilibc/src/main/native/include/SmartDashboard/SendableBuilder.h
View File

@@ -12,11 +12,11 @@
#include <string>
#include <vector>
#include <llvm/ArrayRef.h>
#include <llvm/SmallVector.h>
#include <llvm/Twine.h>
#include <networktables/NetworkTableEntry.h>
#include <networktables/NetworkTableValue.h>
#include <wpi/ArrayRef.h>
#include <wpi/SmallVector.h>
#include <wpi/Twine.h>
namespace frc {
@@ -30,7 +30,7 @@ class SendableBuilder {
*
* @param type data type
*/
virtual void SetSmartDashboardType(const llvm::Twine& type) = 0;
virtual void SetSmartDashboardType(const wpi::Twine& type) = 0;
/**
* Set the function that should be called to set the Sendable into a safe
@@ -57,7 +57,7 @@ class SendableBuilder {
* @param key property name
* @return Network table entry
*/
virtual nt::NetworkTableEntry GetEntry(const llvm::Twine& key) = 0;
virtual nt::NetworkTableEntry GetEntry(const wpi::Twine& key) = 0;
/**
* Add a boolean property.
@@ -66,7 +66,7 @@ class SendableBuilder {
* @param getter getter function (returns current value)
* @param setter setter function (sets new value)
*/
virtual void AddBooleanProperty(const llvm::Twine& key,
virtual void AddBooleanProperty(const wpi::Twine& key,
std::function<bool()> getter,
std::function<void(bool)> setter) = 0;
@@ -77,7 +77,7 @@ class SendableBuilder {
* @param getter getter function (returns current value)
* @param setter setter function (sets new value)
*/
virtual void AddDoubleProperty(const llvm::Twine& key,
virtual void AddDoubleProperty(const wpi::Twine& key,
std::function<double()> getter,
std::function<void(double)> setter) = 0;
@@ -89,8 +89,8 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddStringProperty(
const llvm::Twine& key, std::function<std::string()> getter,
std::function<void(llvm::StringRef)> setter) = 0;
const wpi::Twine& key, std::function<std::string()> getter,
std::function<void(wpi::StringRef)> setter) = 0;
/**
* Add a boolean array property.
@@ -100,8 +100,8 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddBooleanArrayProperty(
const llvm::Twine& key, std::function<std::vector<int>()> getter,
std::function<void(llvm::ArrayRef<int>)> setter) = 0;
const wpi::Twine& key, std::function<std::vector<int>()> getter,
std::function<void(wpi::ArrayRef<int>)> setter) = 0;
/**
* Add a double array property.
@@ -111,8 +111,8 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddDoubleArrayProperty(
const llvm::Twine& key, std::function<std::vector<double>()> getter,
std::function<void(llvm::ArrayRef<double>)> setter) = 0;
const wpi::Twine& key, std::function<std::vector<double>()> getter,
std::function<void(wpi::ArrayRef<double>)> setter) = 0;
/**
* Add a string array property.
@@ -122,8 +122,8 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddStringArrayProperty(
const llvm::Twine& key, std::function<std::vector<std::string>()> getter,
std::function<void(llvm::ArrayRef<std::string>)> setter) = 0;
const wpi::Twine& key, std::function<std::vector<std::string>()> getter,
std::function<void(wpi::ArrayRef<std::string>)> setter) = 0;
/**
* Add a raw property.
@@ -132,9 +132,9 @@ class SendableBuilder {
* @param getter getter function (returns current value)
* @param setter setter function (sets new value)
*/
virtual void AddRawProperty(const llvm::Twine& key,
virtual void AddRawProperty(const wpi::Twine& key,
std::function<std::string()> getter,
std::function<void(llvm::StringRef)> setter) = 0;
std::function<void(wpi::StringRef)> setter) = 0;
/**
* Add a NetworkTableValue property.
@@ -144,7 +144,7 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddValueProperty(
const llvm::Twine& key,
const wpi::Twine& key,
std::function<std::shared_ptr<nt::Value>()> getter,
std::function<void(std::shared_ptr<nt::Value>)> setter) = 0;
@@ -156,9 +156,9 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddSmallStringProperty(
const llvm::Twine& key,
std::function<llvm::StringRef(llvm::SmallVectorImpl<char>& buf)> getter,
std::function<void(llvm::StringRef)> setter) = 0;
const wpi::Twine& key,
std::function<wpi::StringRef(wpi::SmallVectorImpl<char>& buf)> getter,
std::function<void(wpi::StringRef)> setter) = 0;
/**
* Add a boolean array property (SmallVector form).
@@ -168,10 +168,10 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddSmallBooleanArrayProperty(
const llvm::Twine& key,
std::function<llvm::ArrayRef<int>(llvm::SmallVectorImpl<int>& buf)>
const wpi::Twine& key,
std::function<wpi::ArrayRef<int>(wpi::SmallVectorImpl<int>& buf)>
getter,
std::function<void(llvm::ArrayRef<int>)> setter) = 0;
std::function<void(wpi::ArrayRef<int>)> setter) = 0;
/**
* Add a double array property (SmallVector form).
@@ -181,10 +181,10 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddSmallDoubleArrayProperty(
const llvm::Twine& key,
std::function<llvm::ArrayRef<double>(llvm::SmallVectorImpl<double>& buf)>
const wpi::Twine& key,
std::function<wpi::ArrayRef<double>(wpi::SmallVectorImpl<double>& buf)>
getter,
std::function<void(llvm::ArrayRef<double>)> setter) = 0;
std::function<void(wpi::ArrayRef<double>)> setter) = 0;
/**
* Add a string array property (SmallVector form).
@@ -194,11 +194,11 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddSmallStringArrayProperty(
const llvm::Twine& key,
const wpi::Twine& key,
std::function<
llvm::ArrayRef<std::string>(llvm::SmallVectorImpl<std::string>& buf)>
wpi::ArrayRef<std::string>(wpi::SmallVectorImpl<std::string>& buf)>
getter,
std::function<void(llvm::ArrayRef<std::string>)> setter) = 0;
std::function<void(wpi::ArrayRef<std::string>)> setter) = 0;
/**
* Add a raw property (SmallVector form).
@@ -208,9 +208,9 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddSmallRawProperty(
const llvm::Twine& key,
std::function<llvm::StringRef(llvm::SmallVectorImpl<char>& buf)> getter,
std::function<void(llvm::StringRef)> setter) = 0;
const wpi::Twine& key,
std::function<wpi::StringRef(wpi::SmallVectorImpl<char>& buf)> getter,
std::function<void(wpi::StringRef)> setter) = 0;
};
} // namespace frc

68
wpilibc/src/main/native/include/SmartDashboard/SendableBuilderImpl.h
View File

@@ -13,12 +13,12 @@
#include <utility>
#include <vector>
#include <llvm/ArrayRef.h>
#include <llvm/SmallVector.h>
#include <llvm/Twine.h>
#include <networktables/NetworkTable.h>
#include <networktables/NetworkTableEntry.h>
#include <networktables/NetworkTableValue.h>
#include <wpi/ArrayRef.h>
#include <wpi/SmallVector.h>
#include <wpi/Twine.h>
#include "SendableBuilder.h"
@@ -73,74 +73,74 @@ class SendableBuilderImpl : public SendableBuilder {
*/
void StopLiveWindowMode();
void SetSmartDashboardType(const llvm::Twine& type) override;
void SetSmartDashboardType(const wpi::Twine& type) override;
void SetSafeState(std::function<void()> func) override;
void SetUpdateTable(std::function<void()> func) override;
nt::NetworkTableEntry GetEntry(const llvm::Twine& key) override;
nt::NetworkTableEntry GetEntry(const wpi::Twine& key) override;
void AddBooleanProperty(const llvm::Twine& key, std::function<bool()> getter,
void AddBooleanProperty(const wpi::Twine& key, std::function<bool()> getter,
std::function<void(bool)> setter) override;
void AddDoubleProperty(const llvm::Twine& key, std::function<double()> getter,
void AddDoubleProperty(const wpi::Twine& key, std::function<double()> getter,
std::function<void(double)> setter) override;
void AddStringProperty(const llvm::Twine& key,
void AddStringProperty(const wpi::Twine& key,
std::function<std::string()> getter,
std::function<void(llvm::StringRef)> setter) override;
std::function<void(wpi::StringRef)> setter) override;
void AddBooleanArrayProperty(
const llvm::Twine& key, std::function<std::vector<int>()> getter,
std::function<void(llvm::ArrayRef<int>)> setter) override;
const wpi::Twine& key, std::function<std::vector<int>()> getter,
std::function<void(wpi::ArrayRef<int>)> setter) override;
void AddDoubleArrayProperty(
const llvm::Twine& key, std::function<std::vector<double>()> getter,
std::function<void(llvm::ArrayRef<double>)> setter) override;
const wpi::Twine& key, std::function<std::vector<double>()> getter,
std::function<void(wpi::ArrayRef<double>)> setter) override;
void AddStringArrayProperty(
const llvm::Twine& key, std::function<std::vector<std::string>()> getter,
std::function<void(llvm::ArrayRef<std::string>)> setter) override;
const wpi::Twine& key, std::function<std::vector<std::string>()> getter,
std::function<void(wpi::ArrayRef<std::string>)> setter) override;
void AddRawProperty(const llvm::Twine& key,
void AddRawProperty(const wpi::Twine& key,
std::function<std::string()> getter,
std::function<void(llvm::StringRef)> setter) override;
std::function<void(wpi::StringRef)> setter) override;
void AddValueProperty(
const llvm::Twine& key,
const wpi::Twine& key,
std::function<std::shared_ptr<nt::Value>()> getter,
std::function<void(std::shared_ptr<nt::Value>)> setter) override;
void AddSmallStringProperty(
const llvm::Twine& key,
std::function<llvm::StringRef(llvm::SmallVectorImpl<char>& buf)> getter,
std::function<void(llvm::StringRef)> setter) override;
const wpi::Twine& key,
std::function<wpi::StringRef(wpi::SmallVectorImpl<char>& buf)> getter,
std::function<void(wpi::StringRef)> setter) override;
void AddSmallBooleanArrayProperty(
const llvm::Twine& key,
std::function<llvm::ArrayRef<int>(llvm::SmallVectorImpl<int>& buf)>
const wpi::Twine& key,
std::function<wpi::ArrayRef<int>(wpi::SmallVectorImpl<int>& buf)>
getter,
std::function<void(llvm::ArrayRef<int>)> setter) override;
std::function<void(wpi::ArrayRef<int>)> setter) override;
void AddSmallDoubleArrayProperty(
const llvm::Twine& key,
std::function<llvm::ArrayRef<double>(llvm::SmallVectorImpl<double>& buf)>
const wpi::Twine& key,
std::function<wpi::ArrayRef<double>(wpi::SmallVectorImpl<double>& buf)>
getter,
std::function<void(llvm::ArrayRef<double>)> setter) override;
std::function<void(wpi::ArrayRef<double>)> setter) override;
void AddSmallStringArrayProperty(
const llvm::Twine& key,
const wpi::Twine& key,
std::function<
llvm::ArrayRef<std::string>(llvm::SmallVectorImpl<std::string>& buf)>
wpi::ArrayRef<std::string>(wpi::SmallVectorImpl<std::string>& buf)>
getter,
std::function<void(llvm::ArrayRef<std::string>)> setter) override;
std::function<void(wpi::ArrayRef<std::string>)> setter) override;
void AddSmallRawProperty(
const llvm::Twine& key,
std::function<llvm::StringRef(llvm::SmallVectorImpl<char>& buf)> getter,
std::function<void(llvm::StringRef)> setter) override;
const wpi::Twine& key,
std::function<wpi::StringRef(wpi::SmallVectorImpl<char>& buf)> getter,
std::function<void(wpi::StringRef)> setter) override;
private:
struct Property {
Property(nt::NetworkTable& table, const llvm::Twine& key)
Property(nt::NetworkTable& table, const wpi::Twine& key)
: entry(table.GetEntry(key)) {}
Property(const Property&) = delete;

10
wpilibc/src/main/native/include/SmartDashboard/SendableChooser.h
View File

@@ -9,8 +9,8 @@
#include <memory>
#include <llvm/StringMap.h>
#include <llvm/StringRef.h>
#include <wpi/StringMap.h>
#include <wpi/StringRef.h>
#include "SmartDashboard/SendableChooserBase.h"
@@ -31,7 +31,7 @@ namespace frc {
*/
template <class T>
class SendableChooser : public SendableChooserBase {
llvm::StringMap<T> m_choices;
wpi::StringMap<T> m_choices;
template <class U>
static U _unwrap_smart_ptr(const U& value);
@@ -45,8 +45,8 @@ class SendableChooser : public SendableChooserBase {
public:
~SendableChooser() override = default;
void AddObject(llvm::StringRef name, T object);
void AddDefault(llvm::StringRef name, T object);
void AddObject(wpi::StringRef name, T object);
void AddDefault(wpi::StringRef name, T object);
auto GetSelected() -> decltype(_unwrap_smart_ptr(m_choices[""]));

10
wpilibc/src/main/native/include/SmartDashboard/SendableChooser.inc
View File

@@ -13,7 +13,7 @@
#include <utility>
#include <vector>
#include <llvm/StringRef.h>
#include <wpi/StringRef.h>
#include "SendableBuilder.h"
@@ -29,7 +29,7 @@ namespace frc {
* @param object the option
*/
template <class T>
void SendableChooser<T>::AddObject(llvm::StringRef name, T object) {
void SendableChooser<T>::AddObject(wpi::StringRef name, T object) {
m_choices[name] = std::move(object);
}
@@ -43,7 +43,7 @@ void SendableChooser<T>::AddObject(llvm::StringRef name, T object) {
* @param object the option
*/
template <class T>
void SendableChooser<T>::AddDefault(llvm::StringRef name, T object) {
void SendableChooser<T>::AddDefault(wpi::StringRef name, T object) {
m_defaultChoice = name;
AddObject(name, std::move(object));
}
@@ -83,7 +83,7 @@ void SendableChooser<T>::InitSendable(SendableBuilder& builder) {
keys.push_back(choice.first());
}
// Unlike std::map, llvm::StringMap elements
// Unlike std::map, wpi::StringMap elements
// are not sorted
std::sort(keys.begin(), keys.end());
@@ -92,7 +92,7 @@ void SendableChooser<T>::InitSendable(SendableBuilder& builder) {
nullptr);
builder.AddSmallStringProperty(
kDefault,
[=](const llvm::SmallVectorImpl<char>&) -> llvm::StringRef {
[=](const wpi::SmallVectorImpl<char>&) -> wpi::StringRef {
return m_defaultChoice;
},
nullptr);

82
wpilibc/src/main/native/include/SmartDashboard/SmartDashboard.h
View File

@@ -23,66 +23,66 @@ class SmartDashboard : public SensorBase {
public:
static void init();
static bool ContainsKey(llvm::StringRef key);
static bool ContainsKey(wpi::StringRef key);
static std::vector<std::string> GetKeys(int types = 0);
static void SetPersistent(llvm::StringRef key);
static void ClearPersistent(llvm::StringRef key);
static bool IsPersistent(llvm::StringRef key);
static void SetPersistent(wpi::StringRef key);
static void ClearPersistent(wpi::StringRef key);
static bool IsPersistent(wpi::StringRef key);
static void SetFlags(llvm::StringRef key, unsigned int flags);
static void ClearFlags(llvm::StringRef key, unsigned int flags);
static unsigned int GetFlags(llvm::StringRef key);
static void SetFlags(wpi::StringRef key, unsigned int flags);
static void ClearFlags(wpi::StringRef key, unsigned int flags);
static unsigned int GetFlags(wpi::StringRef key);
static void Delete(llvm::StringRef key);
static void Delete(wpi::StringRef key);
static void PutData(llvm::StringRef key, Sendable* data);
static void PutData(wpi::StringRef key, Sendable* data);
static void PutData(Sendable* value);
static Sendable* GetData(llvm::StringRef keyName);
static Sendable* GetData(wpi::StringRef keyName);
static bool PutBoolean(llvm::StringRef keyName, bool value);
static bool SetDefaultBoolean(llvm::StringRef key, bool defaultValue);
static bool GetBoolean(llvm::StringRef keyName, bool defaultValue);
static bool PutBoolean(wpi::StringRef keyName, bool value);
static bool SetDefaultBoolean(wpi::StringRef key, bool defaultValue);
static bool GetBoolean(wpi::StringRef keyName, bool defaultValue);
static bool PutNumber(llvm::StringRef keyName, double value);
static bool SetDefaultNumber(llvm::StringRef key, double defaultValue);
static double GetNumber(llvm::StringRef keyName, double defaultValue);
static bool PutNumber(wpi::StringRef keyName, double value);
static bool SetDefaultNumber(wpi::StringRef key, double defaultValue);
static double GetNumber(wpi::StringRef keyName, double defaultValue);
static bool PutString(llvm::StringRef keyName, llvm::StringRef value);
static bool SetDefaultString(llvm::StringRef key,
llvm::StringRef defaultValue);
static std::string GetString(llvm::StringRef keyName,
llvm::StringRef defaultValue);
static bool PutString(wpi::StringRef keyName, wpi::StringRef value);
static bool SetDefaultString(wpi::StringRef key,
wpi::StringRef defaultValue);
static std::string GetString(wpi::StringRef keyName,
wpi::StringRef defaultValue);
static bool PutBooleanArray(llvm::StringRef key, llvm::ArrayRef<int> value);
static bool SetDefaultBooleanArray(llvm::StringRef key,
llvm::ArrayRef<int> defaultValue);
static std::vector<int> GetBooleanArray(llvm::StringRef key,
llvm::ArrayRef<int> defaultValue);
static bool PutBooleanArray(wpi::StringRef key, wpi::ArrayRef<int> value);
static bool SetDefaultBooleanArray(wpi::StringRef key,
wpi::ArrayRef<int> defaultValue);
static std::vector<int> GetBooleanArray(wpi::StringRef key,
wpi::ArrayRef<int> defaultValue);
static bool PutNumberArray(llvm::StringRef key, llvm::ArrayRef<double> value);
static bool SetDefaultNumberArray(llvm::StringRef key,
llvm::ArrayRef<double> defaultValue);
static bool PutNumberArray(wpi::StringRef key, wpi::ArrayRef<double> value);
static bool SetDefaultNumberArray(wpi::StringRef key,
wpi::ArrayRef<double> defaultValue);
static std::vector<double> GetNumberArray(
llvm::StringRef key, llvm::ArrayRef<double> defaultValue);
wpi::StringRef key, wpi::ArrayRef<double> defaultValue);
static bool PutStringArray(llvm::StringRef key,
llvm::ArrayRef<std::string> value);
static bool SetDefaultStringArray(llvm::StringRef key,
llvm::ArrayRef<std::string> defaultValue);
static bool PutStringArray(wpi::StringRef key,
wpi::ArrayRef<std::string> value);
static bool SetDefaultStringArray(wpi::StringRef key,
wpi::ArrayRef<std::string> defaultValue);
static std::vector<std::string> GetStringArray(
llvm::StringRef key, llvm::ArrayRef<std::string> defaultValue);
wpi::StringRef key, wpi::ArrayRef<std::string> defaultValue);
static bool PutRaw(llvm::StringRef key, llvm::StringRef value);
static bool SetDefaultRaw(llvm::StringRef key, llvm::StringRef defaultValue);
static std::string GetRaw(llvm::StringRef key, llvm::StringRef defaultValue);
static bool PutRaw(wpi::StringRef key, wpi::StringRef value);
static bool SetDefaultRaw(wpi::StringRef key, wpi::StringRef defaultValue);
static std::string GetRaw(wpi::StringRef key, wpi::StringRef defaultValue);
static bool PutValue(llvm::StringRef keyName,
static bool PutValue(wpi::StringRef keyName,
std::shared_ptr<nt::Value> value);
static bool SetDefaultValue(llvm::StringRef key,
static bool SetDefaultValue(wpi::StringRef key,
std::shared_ptr<nt::Value> defaultValue);
static std::shared_ptr<nt::Value> GetValue(llvm::StringRef keyName);
static std::shared_ptr<nt::Value> GetValue(wpi::StringRef keyName);
static void UpdateValues();

4
wpilibc/src/main/native/include/Timer.h
View File

@@ -7,8 +7,8 @@
#pragma once
#include <support/deprecated.h>
#include <support/mutex.h>
#include <wpi/deprecated.h>
#include <wpi/mutex.h>
#include "Base.h"

30
wpilibc/src/main/native/include/Utility.h
View File

@@ -15,9 +15,9 @@
#include <string>
#include <llvm/StringRef.h>
#include <llvm/Twine.h>
#include <support/deprecated.h>
#include <wpi/StringRef.h>
#include <wpi/Twine.h>
#include <wpi/deprecated.h>
#define wpi_assert(condition) \
wpi_assert_impl(condition, #condition, "", __FILE__, __LINE__, __FUNCTION__)
@@ -36,20 +36,20 @@
wpi_assertNotEqual_impl(a, b, #a, #b, message, __FILE__, __LINE__, \
__FUNCTION__)
bool wpi_assert_impl(bool conditionValue, const llvm::Twine& conditionText,
const llvm::Twine& message, llvm::StringRef fileName,
int lineNumber, llvm::StringRef funcName);
bool wpi_assert_impl(bool conditionValue, const wpi::Twine& conditionText,
const wpi::Twine& message, wpi::StringRef fileName,
int lineNumber, wpi::StringRef funcName);
bool wpi_assertEqual_impl(int valueA, int valueB,
const llvm::Twine& valueAString,
const llvm::Twine& valueBString,
const llvm::Twine& message, llvm::StringRef fileName,
int lineNumber, llvm::StringRef funcName);
const wpi::Twine& valueAString,
const wpi::Twine& valueBString,
const wpi::Twine& message, wpi::StringRef fileName,
int lineNumber, wpi::StringRef funcName);
bool wpi_assertNotEqual_impl(int valueA, int valueB,
const llvm::Twine& valueAString,
const llvm::Twine& valueBString,
const llvm::Twine& message,
llvm::StringRef fileName, int lineNumber,
llvm::StringRef funcName);
const wpi::Twine& valueAString,
const wpi::Twine& valueBString,
const wpi::Twine& message,
wpi::StringRef fileName, int lineNumber,
wpi::StringRef funcName);
void wpi_suspendOnAssertEnabled(bool enabled);