diff options
Diffstat (limited to 'llvm/lib/Option')
-rw-r--r-- | llvm/lib/Option/Arg.cpp | 2 | ||||
-rw-r--r-- | llvm/lib/Option/ArgList.cpp | 2 | ||||
-rw-r--r-- | llvm/lib/Option/OptTable.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/Option/Arg.cpp b/llvm/lib/Option/Arg.cpp index ea382b347345b..2da32bfacf306 100644 --- a/llvm/lib/Option/Arg.cpp +++ b/llvm/lib/Option/Arg.cpp @@ -81,7 +81,7 @@ std::string Arg::getAsString(const ArgList &Args) const { OS << *it; } - return OS.str(); + return std::string(OS.str()); } void Arg::renderAsInput(const ArgList &Args, ArgStringList &Output) const { diff --git a/llvm/lib/Option/ArgList.cpp b/llvm/lib/Option/ArgList.cpp index 09e921502eb67..ad7be5fbec190 100644 --- a/llvm/lib/Option/ArgList.cpp +++ b/llvm/lib/Option/ArgList.cpp @@ -209,7 +209,7 @@ unsigned InputArgList::MakeIndex(StringRef String0) const { unsigned Index = ArgStrings.size(); // Tuck away so we have a reliable const char *. - SynthesizedStrings.push_back(String0); + SynthesizedStrings.push_back(std::string(String0)); ArgStrings.push_back(SynthesizedStrings.back().c_str()); return Index; diff --git a/llvm/lib/Option/OptTable.cpp b/llvm/lib/Option/OptTable.cpp index 5833d03069f86..926eb8e0437f6 100644 --- a/llvm/lib/Option/OptTable.cpp +++ b/llvm/lib/Option/OptTable.cpp @@ -219,7 +219,7 @@ OptTable::suggestValueCompletions(StringRef Option, StringRef Arg) const { std::vector<std::string> Result; for (StringRef Val : Candidates) if (Val.startswith(Arg) && Arg.compare(Val)) - Result.push_back(Val); + Result.push_back(std::string(Val)); return Result; } return {}; @@ -283,10 +283,10 @@ unsigned OptTable::findNearest(StringRef Option, std::string &NearestString, StringRef LHS, RHS; char Last = CandidateName.back(); bool CandidateHasDelimiter = Last == '=' || Last == ':'; - std::string NormalizedName = Option; + std::string NormalizedName = std::string(Option); if (CandidateHasDelimiter) { std::tie(LHS, RHS) = Option.split(Last); - NormalizedName = LHS; + NormalizedName = std::string(LHS); if (Option.find(Last) == LHS.size()) NormalizedName += Last; } |