From 35fe82739be7fa830f56cc5ca931d0548d910b59 Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Tue, 10 May 2016 14:35:36 +0200 Subject: [PATCH] Commented out 'override' keyword due to problems with older swig versions (see bug lp:1579042). --- pcbnew/class_module.h | 4 ++-- pcbnew/class_track.h | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pcbnew/class_module.h b/pcbnew/class_module.h index 8d5c59b463..dd1e5efe10 100644 --- a/pcbnew/class_module.h +++ b/pcbnew/class_module.h @@ -238,7 +238,7 @@ public: #define MODULE_PADS_LOCKED 0x08 ///< In autoplace: module waiting for autoplace - bool IsLocked() const override + bool IsLocked() const // override { return ( m_ModuleStatus & MODULE_is_LOCKED ) != 0; } @@ -248,7 +248,7 @@ public: * sets the MODULE_is_LOCKED bit in the m_ModuleStatus * @param isLocked When true means turn on locked status, else unlock */ - void SetLocked( bool isLocked ) override + void SetLocked( bool isLocked ) // override { if( isLocked ) m_ModuleStatus |= MODULE_is_LOCKED; diff --git a/pcbnew/class_track.h b/pcbnew/class_track.h index ad171c356f..be8c36352b 100644 --- a/pcbnew/class_track.h +++ b/pcbnew/class_track.h @@ -132,8 +132,15 @@ public: // Virtual function const EDA_RECT GetBoundingBox() const; - bool IsLocked() const override { return GetState( TRACK_LOCKED ); } - void SetLocked( bool aLocked ) override { return SetState( TRACK_LOCKED, aLocked ); } + bool IsLocked() const // override + { + return GetState( TRACK_LOCKED ); + } + + void SetLocked( bool aLocked ) // override + { + return SetState( TRACK_LOCKED, aLocked ); + } /** * Function GetBestInsertPoint