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

Clean up Command container iteration code (#73)

Browse Source
This commit is contained in:
Tyler Veness
2018-06-23 19:41:45 -05:00
committed by Peter Johnson
parent ea7d11b1db
commit b7807bf9d2
9 changed files with 198 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,7 +195,7 @@ class Command : public ErrorBase, public SendableBase {
* @return The requirements (as an std::set of Subsystem pointers) of this
* command
*/
SubsystemSet GetRequirements() const;
const SubsystemSet& GetRequirements() const;
/**
* Returns the CommandGroup that this command is a part of.

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

@@ -7,7 +7,6 @@
#pragma once
#include <list>
#include <vector>
#include <wpi/Twine.h>
@@ -169,7 +168,7 @@ class CommandGroup : public Command {
std::vector<CommandGroupEntry> m_commands;
// The active children in this group (stored in entries)
std::list<CommandGroupEntry> m_children;
std::vector<CommandGroupEntry*> m_children;
// The current command, -1 signifies that none have been run
int m_currentCommandIndex = -1;

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

@@ -97,7 +97,7 @@ class Scheduler : public ErrorBase, public SendableBase {
Command::SubsystemSet m_subsystems;
wpi::mutex m_buttonsMutex;
typedef std::vector<ButtonScheduler*> ButtonVector;
typedef std::vector<std::unique_ptr<ButtonScheduler>> ButtonVector;
ButtonVector m_buttons;
typedef std::vector<Command*> CommandVector;
wpi::mutex m_additionsMutex;