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

UTF8: Fix MSVC builds 

MSVC does not support variable length arrays.  Substitute a std::vector
instead.

(cherry picked from commit 6d8a759c75)
This commit is contained in:
Seth Hillbrand 2018-10-18 06:11:41 -07:00
parent 6106210c87
commit 43987cc50c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/utf8.cpp
View File

@ -26,6 +26,7 @@
#include <ki_exception.h> #include <ki_exception.h>
#include <wx/strconv.h> #include <wx/strconv.h>
#include <wx/buffer.h> #include <wx/buffer.h>
#include <vector>
/* THROW_IO_ERROR needs this, but it includes this file, so until some /* THROW_IO_ERROR needs this, but it includes this file, so until some
factoring of THROW_IO_ERROR into a separate header, defer and use the asserts. factoring of THROW_IO_ERROR into a separate header, defer and use the asserts.
@ -203,10 +204,9 @@ UTF8::UTF8( const wchar_t* txt )
{ {
try try
{ {
size_t len = wcslen( txt ) * 4 + 1; std::vector< char > temp( wcslen( txt ) * 4 + 1 );
char temp[len]; wxConvUTF8.WC2MB( temp.data(), txt, temp.size() );
wxConvUTF8.WC2MB( temp, txt, len ); m_s.assign( temp.data() );
m_s.assign( temp );
} }
catch(...) catch(...)
{ {