From 5044fc57993e531cab11c17ea4240652cb16b1c7 Mon Sep 17 00:00:00 2001 From: Chris Pavlina Date: Tue, 10 May 2016 18:57:10 -0400 Subject: [PATCH] Fix build error on some platforms from r6788 r6788 = git f9386fc --- pcbnew/pcb_parser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pcbnew/pcb_parser.cpp b/pcbnew/pcb_parser.cpp index 09240bf0e8..3c6ca00d6e 100644 --- a/pcbnew/pcb_parser.cpp +++ b/pcbnew/pcb_parser.cpp @@ -175,7 +175,7 @@ int PCB_PARSER::parseVersion() throw( IO_ERROR, PARSE_ERROR ) if( NextTok() != T_version ) Expecting( GetTokenText( T_version ) ); - int pcb_version = parseInt( FromUTF8() ); + int pcb_version = parseInt( FromUTF8().mb_str( wxConvUTF8 ) ); NeedRIGHT(); @@ -565,7 +565,7 @@ void PCB_PARSER::parseHeader() throw( IO_ERROR, PARSE_ERROR ) T tok = NextTok(); if( tok == T_version ) { - m_requiredVersion = parseInt( FromUTF8() ); + m_requiredVersion = parseInt( FromUTF8().mb_str( wxConvUTF8 ) ); m_tooRecent = ( m_requiredVersion > SEXPR_BOARD_FILE_VERSION ); NeedRIGHT(); @@ -1774,7 +1774,7 @@ MODULE* PCB_PARSER::parseMODULE_unchecked( wxArrayString* aInitialComments ) // Theoretically a module nested in a PCB could declare its own version, though // as of writing this comment we don't do that. Just in case, take the greater // version. - int this_version = parseInt( FromUTF8() ); + int this_version = parseInt( FromUTF8().mb_str( wxConvUTF8 ) ); NeedRIGHT(); m_requiredVersion = std::max( m_requiredVersion, this_version ); m_tooRecent = ( m_requiredVersion > SEXPR_BOARD_FILE_VERSION );