commit 027a9e8787b328a8c2ddcf3d2845a42b90a826ce
author Rui Ueyama <ruiu@google.com> Sat Sep 17 02:10:15 2016 +0000
committer Rui Ueyama <ruiu@google.com> Sat Sep 17 02:10:15 2016 +0000
tree 74dec043fff6cf2f43ffe0991ac09e794352b674
parent 7b1dc2c9834fb98455159e49eded58536d0f524a

Remove unnecessary namespace specifiers.

llvm-svn: 281801

lld/ELF/LinkerScript.cpp

diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index 8b186ec..c5633a1 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -109,8 +109,8 @@
   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 @@
 // 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 @@
 // 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 @@
     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 @@
     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;
   }