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

Fix compile errors in MSVC

This commit is contained in:
Roberto Fernandez Bautista 2020-10-07 18:32:07 +01:00
parent 809f4c2ffb
commit 9faccda68d
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/drc_proto/drc_proto.cpp
View File

@ -81,7 +81,7 @@ PROJECT_CONTEXT loadKicadProject( wxString filename, OPT<wxString> rulesFilePath
manager.LoadProject( pro.GetFullPath() );
rv.project = &manager.Prj();
rv.board.reset( KI_TEST::ReadBoardFromFileOrStream( (const char *) brdName.GetFullPath() ).release() );
rv.board.reset( KI_TEST::ReadBoardFromFileOrStream( std::string( brdName.GetFullPath().ToUTF8() ) ).release() );
rv.board->SetProject( rv.project );
if( rulesFilePath )

12
qa/qa_utils/mocks.cpp
View File

@ -538,7 +538,7 @@ PCBNEW_SELECTION& SELECTION_TOOL::RequestSelection( CLIENT_SELECTION_FILTER aCli
const GENERAL_COLLECTORS_GUIDE SELECTION_TOOL::getCollectorsGuide() const
{
return GENERAL_COLLECTORS_GUIDE( LSET(), PCB_LAYER_ID::UNDEFINED_LAYER, nullptr );
}
@ -881,7 +881,9 @@ void PCB_TOOL_BASE::setTransitions()
const PCB_DISPLAY_OPTIONS& PCB_TOOL_BASE::displayOptions() const
{
static PCB_DISPLAY_OPTIONS disp;
return disp;
}
PCB_DRAW_PANEL_GAL* PCB_TOOL_BASE::canvas() const
@ -892,11 +894,17 @@ PCB_DRAW_PANEL_GAL* PCB_TOOL_BASE::canvas() const
const PCBNEW_SELECTION& PCB_TOOL_BASE::selection() const
{
static PCBNEW_SELECTION sel;
return sel;
}
PCBNEW_SELECTION& PCB_TOOL_BASE::selection()
{
static PCBNEW_SELECTION sel;
return sel;
}