pcbnew: fix post-rebase errors

pcbnew/pcb_edit_frame.cpp

@@ -90,6 +90,7 @@
 #include <tools/position_relative_tool.h>
 #include <tools/zone_filler_tool.h>
 #include <tools/pcb_actions.h>
+#include <tools/multichannel_tool.h>
 #include <router/router_tool.h>
 #include <autorouter/autoplace_tool.h>
 #include <python/scripting/pcb_scripting_tool.h>

pcbnew/tools/multichannel_tool.cpp

@@ -148,10 +148,10 @@ const SHAPE_LINE_CHAIN MULTICHANNEL_TOOL::buildRAOutline( std::set<FOOTPRINT*>&
         auto bb = fp->GetBoundingBox( false, false );
         bb.Inflate( aMargin );
 
-        bbCorners.push_back( { bb.GetX(), bb.GetY() } );
-        bbCorners.push_back( { bb.GetX() + bb.GetWidth(), bb.GetY() } );
-        bbCorners.push_back( { bb.GetX() + bb.GetWidth(), bb.GetY() + bb.GetHeight() } );
-        bbCorners.push_back( { bb.GetX(), bb.GetY() + bb.GetHeight() } );
+        bbCorners.push_back( VECTOR2I( bb.GetX(), bb.GetY() ) );
+        bbCorners.push_back( VECTOR2I( bb.GetX() + bb.GetWidth(), bb.GetY() ) );
+        bbCorners.push_back( VECTOR2I( bb.GetX() + bb.GetWidth(), bb.GetY() + bb.GetHeight() ) );
+        bbCorners.push_back( VECTOR2I( bb.GetX(), bb.GetY() + bb.GetHeight() ) );
     }
 
     BuildConvexHull( hullVertices, bbCorners );

pcbnew/zone.cpp

@@ -1394,6 +1394,17 @@ void ZONE::TransformSolidAreasShapesToPolygon( PCB_LAYER_ID aLayer, SHAPE_POLY_S
 
 
 bool ZONE::operator==( const BOARD_ITEM& aOther ) const
+{
+    if( aOther.Type() != Type() )
+        return false;
+
+    const ZONE& other = static_cast<const ZONE&>( aOther );
+    return *this == other;
+}
+
+
+bool ZONE::operator==( const ZONE& aOther ) const
+
 {
     if( aOther.Type() != Type() )
         return false;