diff options
| -rw-r--r-- | lib/Sema/SemaCodeComplete.cpp | 8 | ||||
| -rw-r--r-- | tools/libclang/CIndexCodeCompletion.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/Sema/SemaCodeComplete.cpp b/lib/Sema/SemaCodeComplete.cpp index 01e95174e2..f91d690796 100644 --- a/lib/Sema/SemaCodeComplete.cpp +++ b/lib/Sema/SemaCodeComplete.cpp @@ -2490,7 +2490,7 @@ CodeCompletionResult::CreateCodeCompletionString(Sema &S, if (Idx > StartParameter) Result.AddChunk(CodeCompletionString::CK_HorizontalSpace); if (IdentifierInfo *II = Sel.getIdentifierInfoForSlot(Idx)) - Keyword += II->getName().str(); + Keyword += II->getName(); Keyword += ":"; if (Idx < StartParameter || AllParametersAreInformative) Result.AddInformativeChunk(Result.getAllocator().CopyString(Keyword)); @@ -2511,7 +2511,7 @@ CodeCompletionResult::CreateCodeCompletionString(Sema &S, Arg = "(" + Arg + ")"; if (IdentifierInfo *II = (*P)->getIdentifier()) if (DeclaringEntity || AllParametersAreInformative) - Arg += II->getName().str(); + Arg += II->getName(); } if (Method->isVariadic() && (P + 1) == PEnd) @@ -5203,7 +5203,7 @@ void Sema::CodeCompleteObjCSelector(Scope *S, IdentifierInfo **SelIdents, } } - Accumulator += Sel.getNameForSlot(I).str(); + Accumulator += Sel.getNameForSlot(I); Accumulator += ':'; } Builder.AddTypedTextChunk(Builder.getAllocator().CopyString( Accumulator)); @@ -5530,7 +5530,7 @@ void Sema::CodeCompleteObjCPropertySynthesizeIvar(Scope *S, bool SawSimilarlyNamedIvar = false; std::string NameWithPrefix; NameWithPrefix += '_'; - NameWithPrefix += PropertyName->getName().str(); + NameWithPrefix += PropertyName->getName(); std::string NameWithSuffix = PropertyName->getName().str(); NameWithSuffix += '_'; for(; Class; Class = Class->getSuperClass()) { diff --git a/tools/libclang/CIndexCodeCompletion.cpp b/tools/libclang/CIndexCodeCompletion.cpp index 84050b2cfd..9dbc7fa2a8 100644 --- a/tools/libclang/CIndexCodeCompletion.cpp +++ b/tools/libclang/CIndexCodeCompletion.cpp @@ -508,7 +508,7 @@ namespace { IdentifierInfo *selIdent = Context.getSelIdents()[i]; if (selIdent != NULL) { StringRef selectorString = Context.getSelIdents()[i]->getName(); - AllocatedResults.Selector += selectorString.str(); + AllocatedResults.Selector += selectorString; } AllocatedResults.Selector += ":"; } |