kicad-developers team mailing list archive

[yann jautard <bricofoy@xxxxxxx>]

just FYI, 5084 does not compile any more.

/home/yann/kicad_sources/kicad.bzr/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp: 
In member function ‘virtual void 
DIALOG_MODULE_BOARD_EDITOR::OnCancelClick(wxCommandEvent&)’:
/home/yann/kicad_sources/kicad.bzr/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:185:1: 
error: expected primary-expression before ‘<<’ token
 <<<<<<< TREE
 ^
/home/yann/kicad_sources/kicad.bzr/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:185:3: 
error: expected primary-expression before ‘<<’ token
 <<<<<<< TREE
   ^

and at least 50 more lines similar to this one.

looking at the problematic file, found some pretty strange syntax wich I 
guess it is not c++ :

void DIALOG_MODULE_BOARD_EDITOR::OnCancelClick( wxCommandEvent& event )
{
<<<<<<< TREE
    EndQuasiModal( -1 );
=======
    ENDQUASIMODAL( -1 );
>>>>>>> MERGE-SOURCE
}



looks like some patching as not finished properly or something similar.