From d1ed4665de23b0239b0fbe9077148d9b360ee131 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sun, 16 Jun 2019 01:06:18 +0100 Subject: [PATCH] OSX compiler didn't like the other syntax. (cherry picked from commit f14e41133bf4a8c5926c3ddf33e638e534d6652a) --- pcbnew/import_gfx/dxf_import_plugin.h | 3 ++- pcbnew/import_gfx/svg_import_plugin.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pcbnew/import_gfx/dxf_import_plugin.h b/pcbnew/import_gfx/dxf_import_plugin.h index fb7b1541c8..e774ed2c8b 100644 --- a/pcbnew/import_gfx/dxf_import_plugin.h +++ b/pcbnew/import_gfx/dxf_import_plugin.h @@ -148,7 +148,8 @@ public: const wxArrayString GetFileExtensions() const override { - return wxArrayString( 1, formatWildcardExt( "dxf" ) ); + static wxString wildcardExt = formatWildcardExt( "dxf" ); + return wxArrayString( 1, &wildcardExt ); } bool Load( const wxString& aFileName ) override; diff --git a/pcbnew/import_gfx/svg_import_plugin.h b/pcbnew/import_gfx/svg_import_plugin.h index bbd441cdc6..78e49b8b35 100644 --- a/pcbnew/import_gfx/svg_import_plugin.h +++ b/pcbnew/import_gfx/svg_import_plugin.h @@ -45,8 +45,8 @@ public: const wxArrayString GetFileExtensions() const override { - - return wxArrayString( 1, formatWildcardExt( "svg" ) ); + static wxString wildcardExt = formatWildcardExt( "svg" ); + return wxArrayString( 1, &wildcardExt ); } /**