diff --git a/common/gal/cursors.cpp b/common/gal/cursors.cpp index 90bb6a22c0..c4ce8f1a89 100644 --- a/common/gal/cursors.cpp +++ b/common/gal/cursors.cpp @@ -340,7 +340,9 @@ const wxCursorBundle& CURSOR_STORE::storeGetBundle( KICURSOR aIdKey ) const wxASSERT_MSG( false, wxString::Format( "Could not find cursor bundle with ID %d", static_cast( aIdKey ) ) ); - return wxCursorBundle(); + static const wxCursorBundle invalid; + + return invalid; } #else const wxCursor& CURSOR_STORE::storeGetCursor( KICURSOR aIdKey, bool aHiDPI ) const diff --git a/common/paths.cpp b/common/paths.cpp index d67b85d44a..476cc5a4cb 100644 --- a/common/paths.cpp +++ b/common/paths.cpp @@ -151,6 +151,7 @@ wxString PATHS::GetDefaultUserProjectsPath() } +#if !defined( __WXMAC__ ) && !defined( __WXMSW__ ) /** * Get the CMake build root directory for the current executable * (which assumes the executable is in a build directory). @@ -191,6 +192,7 @@ static wxString getBuildDirectoryRoot() return fn.GetPath(); } +#endif wxString PATHS::GetStockDataPath( bool aRespectRunFromBuildDir ) diff --git a/eeschema/sim/kibis/kibis.cpp b/eeschema/sim/kibis/kibis.cpp index 236e6a8d16..514565015c 100644 --- a/eeschema/sim/kibis/kibis.cpp +++ b/eeschema/sim/kibis/kibis.cpp @@ -713,7 +713,7 @@ void KIBIS_PIN::getKuKdFromFile( const std::string& aSimul ) i = ( i + 1 ) % 3; } } - catch( const std::exception& e ) + catch( const std::exception& ) { Report( _( "Error while reading temporary file" ), RPT_SEVERITY_ERROR ); } diff --git a/pcbnew/router/pns_meander.cpp b/pcbnew/router/pns_meander.cpp index 18efeaa8cf..7c187cc038 100644 --- a/pcbnew/router/pns_meander.cpp +++ b/pcbnew/router/pns_meander.cpp @@ -669,8 +669,9 @@ bool MEANDER_SHAPE::Fit( MEANDER_TYPE aType, const SEG& aSeg, const VECTOR2I& aP { const MEANDER_SETTINGS& st = Settings(); - bool checkMode = false; - MEANDER_TYPE prim1, prim2; + bool checkMode = false; + MEANDER_TYPE prim1 = MT_EMPTY; + MEANDER_TYPE prim2 = MT_EMPTY; if( aType == MT_CHECK_START ) {