diff options
author | Eike Ziller <eike.ziller@qt.io> | 2024-01-30 09:00:47 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2024-01-30 09:19:06 +0100 |
commit | 30d048a256282c50e081d27dec25f37c5a5dfcd6 (patch) | |
tree | 31b6d6d1a977cad30021c91111e3ef0381f6b9d6 /src/libs/3rdparty/cplusplus | |
parent | 7e8aac5f3c332bc1bc3e947dedad3157cdc43fcd (diff) | |
parent | 79e323afbfc8c4a43580a993fb668215387c9564 (diff) |
Merge remote-tracking branch 'origin/12.0'
Conflicts:
src/plugins/cppeditor/cppfilesettingspage.cpp
src/plugins/haskell/haskellplugin.h
Change-Id: I880693c2e4986853b7aa600a5b7d6c09ad14634e
Diffstat (limited to 'src/libs/3rdparty/cplusplus')
-rw-r--r-- | src/libs/3rdparty/cplusplus/TranslationUnit.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libs/3rdparty/cplusplus/TranslationUnit.cpp b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp index 848f61285c..e680ee2660 100644 --- a/src/libs/3rdparty/cplusplus/TranslationUnit.cpp +++ b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp @@ -27,6 +27,7 @@ #include "Literals.h" #include "DiagnosticClient.h" +#include "cppassert.h" #include <utils/textutils.h> #include <stack> @@ -87,6 +88,7 @@ int TranslationUnit::sourceLength() const void TranslationUnit::setSource(const char *source, int size) { + CPP_CHECK(source); _firstSourceChar = source; _lastSourceChar = source + size; } |