aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-14 12:40:56 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-15 09:07:07 +0000
commit3ef82e86b9578a9e2de54b8b4032f9a610a57637 (patch)
tree93767d4018db7b24bb8508dcff139969af13ce3c /sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
parent93a9b331b6100679342e9b0f661bbb37de564d60 (diff)
shiboken2: Fix build with MSVC2019
std::string_view::iterator is not char *, apparently. Amends 1bfd77c92d78c3861d0c09068e6c353020a510f4. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: I5946bca2e71b82e1b30cdbfaff3bdfee875e60ca Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp')
-rw-r--r--sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
index ef3471d6a..83fcbbf3c 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
@@ -265,7 +265,7 @@ static QString msgCannotDetermineException(const std::string_view &snippetV)
const auto newLine = snippetV.find('\n'); // Multiline noexcept specifications have been found in Qt
const bool truncate = newLine != std::string::npos;
const qsizetype length = qsizetype(truncate ? newLine : snippetV.size());
- QString snippet = QString::fromUtf8(snippetV.cbegin(), length);
+ QString snippet = QString::fromUtf8(snippetV.data(), length);
if (truncate)
snippet += QStringLiteral("...");
@@ -627,8 +627,8 @@ QString BuilderPrivate::cursorValueExpression(BaseVisitor *bv, const CXCursor &c
if (equalSign == std::string::npos)
return QString();
++equalSign;
- return QString::fromLocal8Bit(snippet.cbegin() + equalSign,
- int(snippet.size() - equalSign)).trimmed();
+ return QString::fromLocal8Bit(snippet.data() + equalSign,
+ qsizetype(snippet.size() - equalSign)).trimmed();
}
// Resolve declaration and type of a base class