From 518a65918525163197c26541b04a16faa391d224 Mon Sep 17 00:00:00 2001 From: Tomasz Wlostowski Date: Thu, 13 Aug 2020 12:08:16 +0200 Subject: [PATCH] Post-rebase fixes --- common/libeval_compiler/libeval_compiler.cpp | 3 ++- pcbnew/class_track.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/common/libeval_compiler/libeval_compiler.cpp b/common/libeval_compiler/libeval_compiler.cpp index 38b4f22849..471cd62486 100644 --- a/common/libeval_compiler/libeval_compiler.cpp +++ b/common/libeval_compiler/libeval_compiler.cpp @@ -703,8 +703,9 @@ bool COMPILER::generateUCode( UCODE* aCode, CONTEXT* aPreflightContext ) if( !m_tree ) { + std::unique_ptr 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; } diff --git a/pcbnew/class_track.h b/pcbnew/class_track.h index 898421e1f3..142c4cb5e4 100644 --- a/pcbnew/class_track.h +++ b/pcbnew/class_track.h @@ -322,6 +322,9 @@ public: return wxT( "ARC" ); } + // @copydoc BOARD_ITEM::GetEffectiveShape + virtual std::shared_ptr 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 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;