haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Post-rebase fixes

This commit is contained in:
Tomasz Wlostowski 2020-08-13 12:08:16 +02:00
parent 47919cdc54
commit 518a659185
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/libeval_compiler/libeval_compiler.cpp
View File

@ -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;
}

6
pcbnew/class_track.h
View File

@ -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;