diff options
| author | Rui Ueyama <ruiu@google.com> | 2016-09-17 02:10:15 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2016-09-17 02:10:15 +0000 |
| commit | 027a9e8787b328a8c2ddcf3d2845a42b90a826ce (patch) | |
| tree | 74dec043fff6cf2f43ffe0991ac09e794352b674 /lld/ELF/LinkerScript.cpp | |
| parent | 7b1dc2c9834fb98455159e49eded58536d0f524a (diff) | |
| download | bcm5719-llvm-027a9e8787b328a8c2ddcf3d2845a42b90a826ce.tar.gz bcm5719-llvm-027a9e8787b328a8c2ddcf3d2845a42b90a826ce.zip | |
Remove unnecessary namespace specifiers.
llvm-svn: 281801
Diffstat (limited to 'lld/ELF/LinkerScript.cpp')
| -rw-r--r-- | lld/ELF/LinkerScript.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp index 8b186ecdd24..c5633a14d04 100644 --- a/lld/ELF/LinkerScript.cpp +++ b/lld/ELF/LinkerScript.cpp @@ -109,8 +109,8 @@ bool LinkerScript<ELFT>::shouldKeep(InputSectionBase<ELFT> *S) { return false; } -static bool fileMatches(const llvm::Regex &FileRe, - const llvm::Regex &ExcludedFileRe, StringRef Filename) { +static bool fileMatches(const Regex &FileRe, const Regex &ExcludedFileRe, + StringRef Filename) { return const_cast<Regex &>(FileRe).match(Filename) && !const_cast<Regex &>(ExcludedFileRe).match(Filename); } @@ -165,7 +165,7 @@ static bool matchConstraints(ArrayRef<InputSectionBase<ELFT> *> Sections, // Compute and remember which sections the InputSectionDescription matches. template <class ELFT> void LinkerScript<ELFT>::computeInputSections(InputSectionDescription *I) { - for (const std::pair<llvm::Regex, llvm::Regex> &V : I->SectionsVec) { + for (const std::pair<Regex, Regex> &V : I->SectionsVec) { for (ObjectFile<ELFT> *F : Symtab<ELFT>::X->getObjectFiles()) { if (fileMatches(I->FileRe, V.first, sys::path::filename(F->getName()))) { Regex &Re = const_cast<Regex &>(V.second); @@ -1062,7 +1062,7 @@ static void selectSortKind(InputSectionDescription *Cmd) { // a following form: ((EXCLUDE_FILE(file_pattern+))? section_pattern+)+ // Example: *(.foo.1 EXCLUDE_FILE (*a.o) .foo.2 EXCLUDE_FILE (*b.o) .foo.3) void ScriptParser::readSectionExcludes(InputSectionDescription *Cmd) { - llvm::Regex ExcludeFileRe; + Regex ExcludeFileRe; std::vector<StringRef> V; while (!Error) { @@ -1102,10 +1102,10 @@ ScriptParser::readInputSectionRules(StringRef FilePattern) { if (K2 != SortSectionPolicy::Default) { Cmd->SortInner = K2; expect("("); - Cmd->SectionsVec.push_back({llvm::Regex(), readFilePatterns()}); + Cmd->SectionsVec.push_back({Regex(), readFilePatterns()}); expect(")"); } else { - Cmd->SectionsVec.push_back({llvm::Regex(), readFilePatterns()}); + Cmd->SectionsVec.push_back({Regex(), readFilePatterns()}); } expect(")"); selectSortKind(Cmd); @@ -1126,7 +1126,7 @@ ScriptParser::readInputSectionDescription(StringRef Tok) { StringRef FilePattern = next(); InputSectionDescription *Cmd = readInputSectionRules(FilePattern); expect(")"); - for (std::pair<llvm::Regex, llvm::Regex> &Regex : Cmd->SectionsVec) + for (std::pair<Regex, Regex> &Regex : Cmd->SectionsVec) Opt.KeptSections.push_back(&Regex.second); return Cmd; } |

