Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-01 02:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make C++ IterativeRobotBase and RobotBase constructor and destructor public (#2242)

Browse Source
This commit is contained in:
Peter Johnson
2020-01-08 23:17:12 -08:00
committed by GitHub
parent 790dc552ca
commit 10e8fdb724
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibc/src/main/native/include/frc/IterativeRobotBase.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-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. */
@@ -138,7 +138,6 @@ class IterativeRobotBase : public RobotBase {
*/
virtual void TestPeriodic();
protected:
/**
* Constructor for IterativeRobotBase.
*
@@ -156,6 +155,7 @@ class IterativeRobotBase : public RobotBase {
virtual ~IterativeRobotBase() = default;
protected:
IterativeRobotBase(IterativeRobotBase&&) = default;
IterativeRobotBase& operator=(IterativeRobotBase&&) = default;

4
wpilibc/src/main/native/include/frc/RobotBase.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2008-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. */
@@ -176,7 +176,6 @@ class RobotBase {
static constexpr bool IsSimulation() { return !IsReal(); }
protected:
/**
* Constructor for a generic robot program.
*
@@ -192,6 +191,7 @@ class RobotBase {
virtual ~RobotBase();
protected:
// m_ds isn't moved in these because DriverStation is a singleton; every
// instance of RobotBase has a reference to the same object.
RobotBase(RobotBase&&) noexcept;