From 977a70b3ea76f44d73e9d3a3176d7214e2ed4e4e Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 29 Sep 2013 09:01:07 +0300
Subject: [PATCH] Fix MSVC compilation
symbolgroupnode.obj:-1: error: LNK2019: unresolved external symbol
"char const * const stdWStringWCharTypeC" (?stdWStringWCharTypeC@@3PBDB)
referenced in function "public: static class std::map<class std::basic_string
<char,struct std::char_traits<char>,class std::allocator<char> >,int,
struct std::less<class std::basic_string<char,struct std::char_traits<char>,
class std::allocator<char> > >,class std::allocator<struct std::pair<class std::basic_string
<char,struct std::char_traits<char>,class std::allocator<char> > const ,int> > >
__cdecl DumpParameters::decodeFormatArgument(class std::basic_string<char,struct std::char_traits<char>,
class std::allocator<char> > const &,bool)"
(?decodeFormatArgument@DumpParameters@@SA?AV?$map@V?$basic_string@DU?$char_traits@D@std@@V?$
allocator@D@2@@std@@HU?$less@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$
allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@std@@@2@@
std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@_N@Z)
Change-Id: I64b1bc2b07df5da199a14c743f919fca4c0c22b3
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
src/libs/qtcreatorcdbext/symbolgroupvalue.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
index 6864a25ae4d..47168746fd6 100644
--- a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
+++ b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
@@ -980,10 +980,10 @@ static inline void getDateFromJulianDay(unsigned julianDay, int *year, int *mont
*day = d;
}
-const char stdStringTypeC[] = "std::basic_string<char,std::char_traits<char>,std::allocator<char> >";
-const char stdWStringTypeC[] = "std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> >";
+const char *stdStringTypeC = "std::basic_string<char,std::char_traits<char>,std::allocator<char> >";
+const char *stdWStringTypeC = "std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> >";
// Compiler option: -Zc:wchar_t-:
-const char stdWStringWCharTypeC[] = "std::basic_string<wchar_t,std::char_traits<wchar_t>,std::allocator<wchar_t> >";
+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)
{
--
GitLab