Commit 0e0d190b authored by Tomasz Wlostowski's avatar Tomasz Wlostowski

Post-rebase fixes

parent 22222268
......@@ -703,8 +703,9 @@ bool COMPILER::generateUCode( UCODE* aCode, CONTEXT* aPreflightContext )
if( !m_tree )
{
std::unique_ptr<VALUE> val( new VALUE( 1.0 ) );
// Empty expression returns true
aCode->AddOp( makeUop( TR_UOP_PUSH_VALUE, 1.0 ) );
aCode->AddOp( new UOP( TR_UOP_PUSH_VALUE, std::move(val) ) );
return true;
}
......
......@@ -322,6 +322,9 @@ public:
return wxT( "ARC" );
}
// @copydoc BOARD_ITEM::GetEffectiveShape
virtual std::shared_ptr<SHAPE> GetEffectiveShape( PCB_LAYER_ID aLayer = UNDEFINED_LAYER ) const override;
//TODO(snh): Add GetSelectMenuText() and GetMsgPanelInfoBase()
/**
......@@ -509,6 +512,9 @@ public:
virtual void SwapData( BOARD_ITEM* aImage ) override;
// @copydoc BOARD_ITEM::GetEffectiveShape
virtual std::shared_ptr<SHAPE> GetEffectiveShape( PCB_LAYER_ID aLayer = UNDEFINED_LAYER ) const override;
private:
/// The bottom layer of the via (the top layer is in m_Layer)
PCB_LAYER_ID m_BottomLayer;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment