feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CDB: Output std::wstring with compiler option -Zc:wchar_t-.

Browse Source 
std::wstring is then based on wchar_t instead of ushort.

Change-Id: I4dd3ef29069b8375e7003deba3162537a0d01784
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2012-08-01 16:22:49 +02:00
committed by hjk
parent a93e24fd0d
commit 467a08127d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
View File

@@ -928,6 +928,8 @@ static inline void formatMilliSeconds(std::wostream &str, int milliSecs)
static const char stdStringTypeC[] = "std::basic_string<char,std::char_traits<char>,std::allocator<char> >"; static const char stdStringTypeC[] = "std::basic_string<char,std::char_traits<char>,std::allocator<char> >";
static const char stdWStringTypeC[] = "std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> >"; static const char stdWStringTypeC[] = "std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> >";
// Compiler option: -Zc:wchar_t-:
static const char stdWStringWCharTypeC[] = "std::basic_string<wchar_t,std::char_traits<wchar_t>,std::allocator<wchar_t> >";
static KnownType knownPODTypeHelper(const std::string &type, std::string::size_type endPos) static KnownType knownPODTypeHelper(const std::string &type, std::string::size_type endPos)
{ {
@@ -1028,7 +1030,8 @@ static KnownType knownClassTypeHelper(const std::string &type,
// STL strings // STL strings
if (!type.compare(pos, endPos - pos, stdStringTypeC)) if (!type.compare(pos, endPos - pos, stdStringTypeC))
return KT_StdString; return KT_StdString;
if (!type.compare(pos, endPos - pos, stdWStringTypeC)) if (!type.compare(pos, endPos - pos, stdWStringTypeC)
|| !type.compare(pos, endPos - pos, stdWStringWCharTypeC))
return KT_StdWString; return KT_StdWString;
return KT_Unknown; return KT_Unknown;
} // std::sth } // std::sth