From 1bc3dfef1085f4677f004eedaa6e61c790f6aa5f Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sun, 28 Jan 2018 22:13:40 +0100 Subject: [PATCH] fix compil issue in kicad.i and a minor compil warning --- common/swig/kicad.i | 4 ++-- pcbnew/ratsnest_data.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/swig/kicad.i b/common/swig/kicad.i index 53c2c28840..531026ff7f 100644 --- a/common/swig/kicad.i +++ b/common/swig/kicad.i @@ -91,7 +91,7 @@ principle should be easily implemented by adapting the current STL containers. #include #include - #include + #include #include #include %} @@ -109,7 +109,7 @@ principle should be easily implemented by adapting the current STL containers. %include class_title_block.h %include gal/color4d.h %include class_colors_design_settings.h -%include class_marker_base.h +%include marker_base.h %include eda_text.h diff --git a/pcbnew/ratsnest_data.cpp b/pcbnew/ratsnest_data.cpp index c7628a8e24..cddeec7870 100644 --- a/pcbnew/ratsnest_data.cpp +++ b/pcbnew/ratsnest_data.cpp @@ -185,7 +185,7 @@ private: const auto p0 = aNodes[0]->Pos(); const auto v0 = aNodes[1]->Pos() - p0; - for( int i = 2; i < aNodes.size(); i++ ) + for( unsigned i = 2; i < aNodes.size(); i++ ) { const auto v1 = aNodes[i]->Pos() - p0; @@ -285,7 +285,7 @@ public: // special case: all nodes are on the same line - there's no // triangulation for such set. In this case, we sort along any coordinate // and chain the nodes together. - for(int i = 0; i < triNodes.size() - 1; i++ ) + for(int i = 0; i < (int)triNodes.size() - 1; i++ ) { auto src = m_allNodes[ triNodes[i]->Id() ]; auto dst = m_allNodes[ triNodes[i + 1]->Id() ];