aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Frontend/ASTUnit.cpp4
-rw-r--r--lib/Sema/SemaCodeComplete.cpp4
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp
index c7d47309cf..14ff75d5c6 100644
--- a/lib/Frontend/ASTUnit.cpp
+++ b/lib/Frontend/ASTUnit.cpp
@@ -276,9 +276,7 @@ void ASTUnit::CacheCodeCompletionResults() {
| (1 << (CodeCompletionContext::CCC_ClassStructUnion - 1))
| (1 << (CodeCompletionContext::CCC_Statement - 1))
| (1 << (CodeCompletionContext::CCC_Expression - 1))
- | (1 << (CodeCompletionContext::CCC_ObjCMessageReceiver - 1))
- | (1 << (CodeCompletionContext::CCC_Name - 1))
- | (1 << (CodeCompletionContext::CCC_PotentiallyQualifiedName - 1));
+ | (1 << (CodeCompletionContext::CCC_ObjCMessageReceiver - 1));
CachedResult.Priority = Results[I].Priority;
CachedResult.Kind = Results[I].CursorKind;
diff --git a/lib/Sema/SemaCodeComplete.cpp b/lib/Sema/SemaCodeComplete.cpp
index bdcc3ac546..61c17c89bd 100644
--- a/lib/Sema/SemaCodeComplete.cpp
+++ b/lib/Sema/SemaCodeComplete.cpp
@@ -2296,10 +2296,6 @@ void Sema::CodeCompleteDeclarator(Scope *S,
}
Results.ExitScope();
- // Allow macros for names.
- if (CodeCompleter->includeMacros())
- AddMacroResults(PP, Results);
-
HandleCodeCompleteResults(this, CodeCompleter,
AllowNestedNameSpecifiers
? CodeCompletionContext::CCC_PotentiallyQualifiedName