From ee862e1db4280f65f38c8e2b2faa98c19a4f55cd Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Tue, 17 Jan 2017 15:06:33 +0100 Subject: [PATCH] Fixed a hidden overloaded virtual function warning in PNS --- pcbnew/router/pns_item.h | 6 +++--- pcbnew/router/pns_line.cpp | 6 +++--- pcbnew/router/pns_line.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pcbnew/router/pns_item.h b/pcbnew/router/pns_item.h index edd07825d1..b02a455b14 100644 --- a/pcbnew/router/pns_item.h +++ b/pcbnew/router/pns_item.h @@ -1,7 +1,7 @@ /* * KiRouter - a push-and-(sometimes-)shove PCB router * - * Copyright (C) 2013-2014 CERN + * Copyright (C) 2013-2017 CERN * Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors. * Author: Tomasz Wlostowski * @@ -298,12 +298,12 @@ public: return NULL; } - virtual void Mark(int aMarker) + virtual void Mark( int aMarker ) { m_marker = aMarker; } - virtual void Unmark(int aMarker = -1) + virtual void Unmark( int aMarker = -1 ) { m_marker &= ~aMarker; } diff --git a/pcbnew/router/pns_line.cpp b/pcbnew/router/pns_line.cpp index ac0d9968d4..24e457e02a 100644 --- a/pcbnew/router/pns_line.cpp +++ b/pcbnew/router/pns_line.cpp @@ -1,7 +1,7 @@ /* * KiRouter - a push-and-(sometimes-)shove PCB router * - * Copyright (C) 2013-2014 CERN + * Copyright (C) 2013-2017 CERN * Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors. * Author: Tomasz Wlostowski * @@ -93,10 +93,10 @@ void LINE::Mark( int aMarker ) } -void LINE::Unmark() +void LINE::Unmark( int aMarker ) { for( SEGMENT* s : m_segmentRefs ) - s->Unmark(); + s->Unmark( aMarker ); m_marker = 0; } diff --git a/pcbnew/router/pns_line.h b/pcbnew/router/pns_line.h index 872dcde0b4..5a0e2bfa7c 100644 --- a/pcbnew/router/pns_line.h +++ b/pcbnew/router/pns_line.h @@ -1,7 +1,7 @@ /* * KiRouter - a push-and-(sometimes-)shove PCB router * - * Copyright (C) 2013-2014 CERN + * Copyright (C) 2013-2017 CERN * Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors. * Author: Tomasz Wlostowski * @@ -253,7 +253,7 @@ public: const VIA& Via() const { return m_via; } virtual void Mark( int aMarker ) override; - virtual void Unmark (); + virtual void Unmark( int aMarker = -1 ) override; virtual int Marker() const override; void DragSegment( const VECTOR2I& aP, int aIndex, int aSnappingThreshold = 0 );