diff options
author | Chris Lattner <sabre@nondot.org> | 2011-07-23 10:55:15 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2011-07-23 10:55:15 +0000 |
commit | 5f9e272e632e951b1efe824cd16acb4d96077930 (patch) | |
tree | 3268557d12b85d0c2e72de5329ec83d4fc0bca48 /lib/Driver/ArgList.cpp | |
parent | d47d3b0cfeb7e8564ff77f48130fe63282b6d127 (diff) |
remove unneeded llvm:: namespace qualifiers on some core types now that LLVM.h imports
them into the clang namespace.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135852 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/ArgList.cpp')
-rw-r--r-- | lib/Driver/ArgList.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/lib/Driver/ArgList.cpp b/lib/Driver/ArgList.cpp index b8af9cc47e..86da885a40 100644 --- a/lib/Driver/ArgList.cpp +++ b/lib/Driver/ArgList.cpp @@ -117,8 +117,8 @@ bool ArgList::hasFlag(OptSpecifier Pos, OptSpecifier Neg, bool Default) const { return Default; } -llvm::StringRef ArgList::getLastArgValue(OptSpecifier Id, - llvm::StringRef Default) const { +StringRef ArgList::getLastArgValue(OptSpecifier Id, + StringRef Default) const { if (Arg *A = getLastArg(Id)) return A->getValue(*this); return Default; @@ -129,7 +129,7 @@ int ArgList::getLastArgIntValue(OptSpecifier Id, int Default, int Res = Default; if (Arg *A = getLastArg(Id)) { - if (llvm::StringRef(A->getValue(*this)).getAsInteger(10, Res)) + if (StringRef(A->getValue(*this)).getAsInteger(10, Res)) Diags.Report(diag::err_drv_invalid_int_value) << A->getAsString(*this) << A->getValue(*this); } @@ -138,7 +138,7 @@ int ArgList::getLastArgIntValue(OptSpecifier Id, int Default, } std::vector<std::string> ArgList::getAllArgValues(OptSpecifier Id) const { - llvm::SmallVector<const char *, 16> Values; + SmallVector<const char *, 16> Values; AddAllArgValues(Values, Id); return std::vector<std::string>(Values.begin(), Values.end()); } @@ -177,7 +177,7 @@ void ArgList::AddAllArgsTranslated(ArgStringList &Output, OptSpecifier Id0, (*it)->claim(); if (Joined) { - Output.push_back(MakeArgString(llvm::StringRef(Translation) + + Output.push_back(MakeArgString(StringRef(Translation) + (*it)->getValue(*this, 0))); } else { Output.push_back(Translation); @@ -192,16 +192,16 @@ void ArgList::ClaimAllArgs(OptSpecifier Id0) const { (*it)->claim(); } -const char *ArgList::MakeArgString(const llvm::Twine &T) const { +const char *ArgList::MakeArgString(const Twine &T) const { llvm::SmallString<256> Str; T.toVector(Str); return MakeArgString(Str.str()); } const char *ArgList::GetOrMakeJoinedArgString(unsigned Index, - llvm::StringRef LHS, - llvm::StringRef RHS) const { - llvm::StringRef Cur = getArgString(Index); + StringRef LHS, + StringRef RHS) const { + StringRef Cur = getArgString(Index); if (Cur.size() == LHS.size() + RHS.size() && Cur.startswith(LHS) && Cur.endswith(RHS)) return Cur.data(); @@ -223,7 +223,7 @@ InputArgList::~InputArgList() { delete *it; } -unsigned InputArgList::MakeIndex(llvm::StringRef String0) const { +unsigned InputArgList::MakeIndex(StringRef String0) const { unsigned Index = ArgStrings.size(); // Tuck away so we have a reliable const char *. @@ -233,8 +233,8 @@ unsigned InputArgList::MakeIndex(llvm::StringRef String0) const { return Index; } -unsigned InputArgList::MakeIndex(llvm::StringRef String0, - llvm::StringRef String1) const { +unsigned InputArgList::MakeIndex(StringRef String0, + StringRef String1) const { unsigned Index0 = MakeIndex(String0); unsigned Index1 = MakeIndex(String1); assert(Index0 + 1 == Index1 && "Unexpected non-consecutive indices!"); @@ -242,7 +242,7 @@ unsigned InputArgList::MakeIndex(llvm::StringRef String0, return Index0; } -const char *InputArgList::MakeArgString(llvm::StringRef Str) const { +const char *InputArgList::MakeArgString(StringRef Str) const { return getArgString(MakeIndex(Str)); } @@ -259,7 +259,7 @@ DerivedArgList::~DerivedArgList() { delete *it; } -const char *DerivedArgList::MakeArgString(llvm::StringRef Str) const { +const char *DerivedArgList::MakeArgString(StringRef Str) const { return BaseArgs.MakeArgString(Str); } @@ -270,7 +270,7 @@ Arg *DerivedArgList::MakeFlagArg(const Arg *BaseArg, const Option *Opt) const { } Arg *DerivedArgList::MakePositionalArg(const Arg *BaseArg, const Option *Opt, - llvm::StringRef Value) const { + StringRef Value) const { unsigned Index = BaseArgs.MakeIndex(Value); Arg *A = new Arg(Opt, Index, BaseArgs.getArgString(Index), BaseArg); SynthesizedArgs.push_back(A); @@ -278,7 +278,7 @@ Arg *DerivedArgList::MakePositionalArg(const Arg *BaseArg, const Option *Opt, } Arg *DerivedArgList::MakeSeparateArg(const Arg *BaseArg, const Option *Opt, - llvm::StringRef Value) const { + StringRef Value) const { unsigned Index = BaseArgs.MakeIndex(Opt->getName(), Value); Arg *A = new Arg(Opt, Index, BaseArgs.getArgString(Index + 1), BaseArg); SynthesizedArgs.push_back(A); @@ -286,7 +286,7 @@ Arg *DerivedArgList::MakeSeparateArg(const Arg *BaseArg, const Option *Opt, } Arg *DerivedArgList::MakeJoinedArg(const Arg *BaseArg, const Option *Opt, - llvm::StringRef Value) const { + StringRef Value) const { unsigned Index = BaseArgs.MakeIndex(Opt->getName().str() + Value.str()); Arg *A = new Arg(Opt, Index, BaseArgs.getArgString(Index) + Opt->getName().size(), |