haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix file version support build error on some platforms.

This commit is contained in:
Chris Pavlina 2016-05-27 14:38:51 -04:00 committed by Wayne Stambaugh
parent 91f34a9478
commit 2ffdc0d03d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcbnew/pcb_parser.cpp
View File

@ -175,7 +175,7 @@ int PCB_PARSER::parseVersion() throw( IO_ERROR, PARSE_ERROR )
if( NextTok() != T_version ) if( NextTok() != T_version )
Expecting( GetTokenText( T_version ) ); Expecting( GetTokenText( T_version ) );
int pcb_version = parseInt( FromUTF8() ); int pcb_version = parseInt( FromUTF8().mb_str( wxConvUTF8 ) );
NeedRIGHT(); NeedRIGHT();
@ -565,7 +565,7 @@ void PCB_PARSER::parseHeader() throw( IO_ERROR, PARSE_ERROR )
T tok = NextTok(); T tok = NextTok();
if( tok == T_version ) if( tok == T_version )
{ {
m_requiredVersion = parseInt( FromUTF8() ); m_requiredVersion = parseInt( FromUTF8().mb_str( wxConvUTF8 ) );
m_tooRecent = ( m_requiredVersion > SEXPR_BOARD_FILE_VERSION ); m_tooRecent = ( m_requiredVersion > SEXPR_BOARD_FILE_VERSION );
NeedRIGHT(); 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 // 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 // as of writing this comment we don't do that. Just in case, take the greater
// version. // version.
int this_version = parseInt( FromUTF8() ); int this_version = parseInt( FromUTF8().mb_str( wxConvUTF8 ) );
NeedRIGHT(); NeedRIGHT();
m_requiredVersion = std::max( m_requiredVersion, this_version ); m_requiredVersion = std::max( m_requiredVersion, this_version );
m_tooRecent = ( m_requiredVersion > SEXPR_BOARD_FILE_VERSION ); m_tooRecent = ( m_requiredVersion > SEXPR_BOARD_FILE_VERSION );