CppEditor: Add very first include after include guard

...when adding an include for an undefined identifier.

Change-Id: Ia338e924901262a847d3bd7ed9733d8e66c631dd
Task-number: QTCREATORBUG-10391
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

2 files changed, 9 insertions, 1 deletions

diff --git a/src/libs/cplusplus/FastPreprocessor.cpp b/src/libs/cplusplus/FastPreprocessor.cpp
index 3c5b4312ce..6c8c0ab2d5 100644
--- a/src/libs/cplusplus/FastPreprocessor.cpp
+++ b/src/libs/cplusplus/FastPreprocessor.cpp
@@ -151,3 +151,11 @@ void FastPreprocessor::startExpandingMacro(unsigned bytesOffset, unsigned utf16c
                              utf16charsOffset, macro.nameToQString().size(),
                              line, actuals);
 }
+
+void FastPreprocessor::markAsIncludeGuard(const QByteArray &macroName)
+{
+    if (!_currentDoc)
+        return;
+
+    _currentDoc->setIncludeGuardMacroName(macroName);
+}
diff --git a/src/libs/cplusplus/FastPreprocessor.h b/src/libs/cplusplus/FastPreprocessor.h
index b4a14cfdb4..7b28f303cd 100644
--- a/src/libs/cplusplus/FastPreprocessor.h
+++ b/src/libs/cplusplus/FastPreprocessor.h
@@ -73,7 +73,7 @@ public:
                                      const Macro &,
                                      const QVector<MacroArgumentReference> &);
     virtual void stopExpandingMacro(unsigned, const Macro &) {}
-    virtual void markAsIncludeGuard(const QByteArray &) {}
+    virtual void markAsIncludeGuard(const QByteArray &macroName);
 
     virtual void startSkippingBlocks(unsigned) {}
     virtual void stopSkippingBlocks(unsigned) {}