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

Fixed a hidden overloaded virtual function warning in PNS

This commit is contained in:
Maciej Suminski 2017-01-17 15:06:33 +01:00
parent ee2b1ac321
commit ee862e1db4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcbnew/router/pns_item.h
View File

@ -1,7 +1,7 @@
/* /*
* KiRouter - a push-and-(sometimes-)shove PCB router * 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. * Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors.
* Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch> * Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
* *
@ -298,12 +298,12 @@ public:
return NULL; return NULL;
} }
virtual void Mark(int aMarker) virtual void Mark( int aMarker )
{ {
m_marker = aMarker; m_marker = aMarker;
} }
virtual void Unmark(int aMarker = -1) virtual void Unmark( int aMarker = -1 )
{ {
m_marker &= ~aMarker; m_marker &= ~aMarker;
} }

6
pcbnew/router/pns_line.cpp
View File

@ -1,7 +1,7 @@
/* /*
* KiRouter - a push-and-(sometimes-)shove PCB router * 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. * Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors.
* Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch> * Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
* *
@ -93,10 +93,10 @@ void LINE::Mark( int aMarker )
} }
void LINE::Unmark() void LINE::Unmark( int aMarker )
{ {
for( SEGMENT* s : m_segmentRefs ) for( SEGMENT* s : m_segmentRefs )
s->Unmark(); s->Unmark( aMarker );
m_marker = 0; m_marker = 0;
} }

4
pcbnew/router/pns_line.h
View File

@ -1,7 +1,7 @@
/* /*
* KiRouter - a push-and-(sometimes-)shove PCB router * 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. * Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors.
* Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch> * Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
* *
@ -253,7 +253,7 @@ public:
const VIA& Via() const { return m_via; } const VIA& Via() const { return m_via; }
virtual void Mark( int aMarker ) override; virtual void Mark( int aMarker ) override;
virtual void Unmark (); virtual void Unmark( int aMarker = -1 ) override;
virtual int Marker() const override; virtual int Marker() const override;
void DragSegment( const VECTOR2I& aP, int aIndex, int aSnappingThreshold = 0 ); void DragSegment( const VECTOR2I& aP, int aIndex, int aSnappingThreshold = 0 );