From 95ea4f6cc596aad54f57711d3b96bd0082030485 Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Sun, 13 Apr 2014 07:48:58 -0500 Subject: [PATCH] remove a static wxString constructor which was out of sequence with another dependent one, at least with one toolchain. --- pcbnew/class_netclass.cpp | 2 +- pcbnew/class_netclass.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pcbnew/class_netclass.cpp b/pcbnew/class_netclass.cpp index 655595a41d..73729324ef 100644 --- a/pcbnew/class_netclass.cpp +++ b/pcbnew/class_netclass.cpp @@ -36,7 +36,7 @@ // This will get mapped to "kicad_default" in the specctra_export. -const wxString NETCLASS::Default = wxT("Default"); +const wxChar NETCLASS::Default[] = wxT( "Default" ); // Initial values for netclass initialization int NETCLASS::DEFAULT_CLEARANCE = DMils2iu( 100 ); // track to track and track to pads clearance diff --git a/pcbnew/class_netclass.h b/pcbnew/class_netclass.h index 5780a83203..d5e0005357 100644 --- a/pcbnew/class_netclass.h +++ b/pcbnew/class_netclass.h @@ -80,7 +80,7 @@ protected: public: - static const wxString Default; ///< the name of the default NETCLASS + static const wxChar Default[]; ///< the name of the default NETCLASS /** * Constructor