mirror of
https://github.com/TomHarte/CLK.git
synced 2024-11-22 12:33:29 +00:00
Fix ambiguous using
.
This commit is contained in:
parent
2913368a06
commit
ca7d34ad04
@ -338,9 +338,9 @@ enum class MoveType {
|
|||||||
template <MoveType type> struct Move: public Rectangle<type == MoveType::Logical, true> {
|
template <MoveType type> struct Move: public Rectangle<type == MoveType::Logical, true> {
|
||||||
static constexpr bool is_logical = type == MoveType::Logical;
|
static constexpr bool is_logical = type == MoveType::Logical;
|
||||||
static constexpr bool is_y_only = type == MoveType::YOnly;
|
static constexpr bool is_y_only = type == MoveType::YOnly;
|
||||||
using Rectangle = Rectangle<is_logical, true>;
|
using RectangleBase = Rectangle<is_logical, true>;
|
||||||
|
|
||||||
Move(CommandContext &context) : Rectangle(context) {
|
Move(CommandContext &context) : RectangleBase(context) {
|
||||||
Command::access = is_logical ? Command::AccessType::CopyPoint : Command::AccessType::CopyByte;
|
Command::access = is_logical ? Command::AccessType::CopyPoint : Command::AccessType::CopyByte;
|
||||||
Command::cycles = is_y_only ? 0 : 64;
|
Command::cycles = is_y_only ? 0 : 64;
|
||||||
Command::y_only = is_y_only;
|
Command::y_only = is_y_only;
|
||||||
@ -348,7 +348,7 @@ template <MoveType type> struct Move: public Rectangle<type == MoveType::Logical
|
|||||||
|
|
||||||
void advance(int pixels_per_byte) final {
|
void advance(int pixels_per_byte) final {
|
||||||
Command::cycles = is_y_only ? 40 : 64;
|
Command::cycles = is_y_only ? 40 : 64;
|
||||||
if(Rectangle::advance_pixel(pixels_per_byte)) {
|
if(RectangleBase::advance_pixel(pixels_per_byte)) {
|
||||||
Command::cycles += is_y_only ? 0 : 64;
|
Command::cycles += is_y_only ? 0 : 64;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user