Skip to content

Commit 9f20fa7

Browse files
committed
Update to beta-4
1 parent bceafd3 commit 9f20fa7

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

commands2/src/include/frc2/command/Command.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,9 @@ safe) semantics.
363363
* Transfers ownership of this command to a unique pointer. Used for
364364
* decorator methods.
365365
*/
366+
/*
366367
virtual CommandPtr ToPtr() && = 0;
368+
*/
367369

368370
protected:
369371
/**

commands2/src/include/frc2/command/CommandHelper.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ class CommandHelper : public Base {
2727
public:
2828
CommandHelper() = default;
2929

30+
/*
3031
CommandPtr ToPtr() && override {
3132
return CommandPtr(
3233
std::make_unique<CRTP>(std::move(*static_cast<CRTP*>(this))));
3334
}
35+
*/
3436

3537
protected:
3638
std::unique_ptr<Command> TransferOwnership() && override {

commands2/src/include/frc2/command/button/Trigger.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -515,10 +515,6 @@ class Trigger {
515515
return m_event.operator&&(rhs).CastTo<Trigger>();
516516
}
517517

518-
Trigger operator&&(Trigger &rhs) {
519-
return (m_event && rhs.m_event).CastTo<Trigger>();
520-
}
521-
522518
/**
523519
* Composes two triggers with logical AND.
524520
*
@@ -537,10 +533,6 @@ class Trigger {
537533
return m_event.operator||(rhs).CastTo<Trigger>();
538534
}
539535

540-
Trigger operator||(Trigger &rhs) {
541-
return (m_event || rhs.m_event).CastTo<Trigger>();
542-
}
543-
544536
/**
545537
* Composes two triggers with logical OR.
546538
*

gen/Command.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,5 @@ classes:
5050
RunsWhenDisabled:
5151
GetInterruptionBehavior:
5252
GetName:
53+
ToPtr:
54+
ignore: true

0 commit comments

Comments
 (0)