diff options
| author | Rui Ueyama <ruiu@google.com> | 2016-07-16 18:55:47 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2016-07-16 18:55:47 +0000 |
| commit | 818bb2f8dc90907c550ae89bdb61f0f637133e87 (patch) | |
| tree | 99d32f7ff5b89f15e2eb4fa851962f2cfb75dade | |
| parent | 962b277d2d6433ea057ec7f35d22a36739e656b8 (diff) | |
| download | bcm5719-llvm-818bb2f8dc90907c550ae89bdb61f0f637133e87.tar.gz bcm5719-llvm-818bb2f8dc90907c550ae89bdb61f0f637133e87.zip | |
Remove redundant namespace specifiers.
llvm-svn: 275694
| -rw-r--r-- | lld/ELF/DriverUtils.cpp | 4 | ||||
| -rw-r--r-- | lld/ELF/InputFiles.cpp | 8 | ||||
| -rw-r--r-- | lld/ELF/LTO.cpp | 8 | ||||
| -rw-r--r-- | lld/ELF/OutputSections.cpp | 6 | ||||
| -rw-r--r-- | lld/ELF/SymbolTable.cpp | 8 | ||||
| -rw-r--r-- | lld/ELF/Writer.cpp | 2 |
6 files changed, 18 insertions, 18 deletions
diff --git a/lld/ELF/DriverUtils.cpp b/lld/ELF/DriverUtils.cpp index a864c8136c4..034d7a26003 100644 --- a/lld/ELF/DriverUtils.cpp +++ b/lld/ELF/DriverUtils.cpp @@ -128,13 +128,13 @@ std::string elf::relativeToRoot(StringRef Path) { return Res.str(); } -CpioFile::CpioFile(std::unique_ptr<llvm::raw_fd_ostream> OS, StringRef S) +CpioFile::CpioFile(std::unique_ptr<raw_fd_ostream> OS, StringRef S) : OS(std::move(OS)), Basename(S) {} CpioFile *CpioFile::create(StringRef OutputPath) { std::string Path = (OutputPath + ".cpio").str(); std::error_code EC; - auto OS = llvm::make_unique<raw_fd_ostream>(Path, EC, fs::F_None); + auto OS = make_unique<raw_fd_ostream>(Path, EC, fs::F_None); if (EC) { error(EC, "--reproduce: failed to open " + Path); return nullptr; diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp index e5311e64f78..6055d088c5f 100644 --- a/lld/ELF/InputFiles.cpp +++ b/lld/ELF/InputFiles.cpp @@ -807,10 +807,10 @@ template void ArchiveFile::parse<ELF32BE>(); template void ArchiveFile::parse<ELF64LE>(); template void ArchiveFile::parse<ELF64BE>(); -template void BitcodeFile::parse<ELF32LE>(llvm::DenseSet<StringRef> &); -template void BitcodeFile::parse<ELF32BE>(llvm::DenseSet<StringRef> &); -template void BitcodeFile::parse<ELF64LE>(llvm::DenseSet<StringRef> &); -template void BitcodeFile::parse<ELF64BE>(llvm::DenseSet<StringRef> &); +template void BitcodeFile::parse<ELF32LE>(DenseSet<StringRef> &); +template void BitcodeFile::parse<ELF32BE>(DenseSet<StringRef> &); +template void BitcodeFile::parse<ELF64LE>(DenseSet<StringRef> &); +template void BitcodeFile::parse<ELF64BE>(DenseSet<StringRef> &); template void LazyObjectFile::parse<ELF32LE>(); template void LazyObjectFile::parse<ELF32BE>(); diff --git a/lld/ELF/LTO.cpp b/lld/ELF/LTO.cpp index 8ba61262de8..0a2e636a08e 100644 --- a/lld/ELF/LTO.cpp +++ b/lld/ELF/LTO.cpp @@ -144,7 +144,7 @@ static bool shouldInternalize(const SmallPtrSet<GlobalValue *, 8> &Used, } BitcodeCompiler::BitcodeCompiler() - : Combined(new llvm::Module("ld-temp.o", Driver->Context)) {} + : Combined(new Module("ld-temp.o", Driver->Context)) {} static void undefine(Symbol *S) { replaceBody<Undefined>(S, S->body()->getName(), STV_DEFAULT, S->body()->Type); @@ -224,10 +224,10 @@ void BitcodeCompiler::add(BitcodeFile &F) { switch (GV->getLinkage()) { default: break; - case llvm::GlobalValue::LinkOnceAnyLinkage: + case GlobalValue::LinkOnceAnyLinkage: GV->setLinkage(GlobalValue::WeakAnyLinkage); break; - case llvm::GlobalValue::LinkOnceODRLinkage: + case GlobalValue::LinkOnceODRLinkage: GV->setLinkage(GlobalValue::WeakODRLinkage); break; } @@ -238,7 +238,7 @@ void BitcodeCompiler::add(BitcodeFile &F) { IRMover Mover(*Combined); if (Error E = Mover.move(Obj->takeModule(), Keep, [](GlobalValue &, IRMover::ValueAdder) {})) { - handleAllErrors(std::move(E), [&](const llvm::ErrorInfoBase &EIB) { + handleAllErrors(std::move(E), [&](const ErrorInfoBase &EIB) { fatal("failed to link module " + F.getName() + ": " + EIB.message()); }); } diff --git a/lld/ELF/OutputSections.cpp b/lld/ELF/OutputSections.cpp index 0192d853454..6fa01833934 100644 --- a/lld/ELF/OutputSections.cpp +++ b/lld/ELF/OutputSections.cpp @@ -1185,7 +1185,7 @@ template <class ELFT> MergeOutputSection<ELFT>::MergeOutputSection(StringRef Name, uint32_t Type, uintX_t Flags, uintX_t Alignment) : OutputSectionBase<ELFT>(Name, Type, Flags), - Builder(llvm::StringTableBuilder::RAW, Alignment) {} + Builder(StringTableBuilder::RAW, Alignment) {} template <class ELFT> void MergeOutputSection<ELFT>::writeTo(uint8_t *Buf) { if (shouldTailMerge()) { @@ -1666,7 +1666,7 @@ void BuildIdFnv1<ELFT>::writeBuildId(ArrayRef<ArrayRef<uint8_t>> Bufs) { template <class ELFT> void BuildIdMd5<ELFT>::writeBuildId(ArrayRef<ArrayRef<uint8_t>> Bufs) { - llvm::MD5 Hash; + MD5 Hash; for (ArrayRef<uint8_t> Buf : Bufs) Hash.update(Buf); MD5::MD5Result Res; @@ -1676,7 +1676,7 @@ void BuildIdMd5<ELFT>::writeBuildId(ArrayRef<ArrayRef<uint8_t>> Bufs) { template <class ELFT> void BuildIdSha1<ELFT>::writeBuildId(ArrayRef<ArrayRef<uint8_t>> Bufs) { - llvm::SHA1 Hash; + SHA1 Hash; for (ArrayRef<uint8_t> Buf : Bufs) Hash.update(Buf); memcpy(this->HashBuf, Hash.final().data(), 20); diff --git a/lld/ELF/SymbolTable.cpp b/lld/ELF/SymbolTable.cpp index ad78b4c7790..5ebfe8a864a 100644 --- a/lld/ELF/SymbolTable.cpp +++ b/lld/ELF/SymbolTable.cpp @@ -69,7 +69,7 @@ void SymbolTable<ELFT>::addFile(std::unique_ptr<InputFile> File) { } if (Config->Trace) - llvm::outs() << getFilename(FileP) << "\n"; + outs() << getFilename(FileP) << "\n"; // .so file if (auto *F = dyn_cast<SharedFile<ELFT>>(FileP)) { @@ -117,7 +117,7 @@ template <class ELFT> void SymbolTable<ELFT>::addCombinedLtoObject() { for (auto &IF : IFs) { ObjectFile<ELFT> *Obj = cast<ObjectFile<ELFT>>(IF.release()); - llvm::DenseSet<StringRef> DummyGroups; + DenseSet<StringRef> DummyGroups; Obj->parse(DummyGroups); ObjectFiles.emplace_back(Obj); } @@ -481,8 +481,8 @@ std::vector<SymbolBody *> SymbolTable<ELFT>::findAll(StringRef Pattern) { } template <class ELFT> -void SymbolTable<ELFT>::addLazyArchive( - ArchiveFile *F, const llvm::object::Archive::Symbol Sym) { +void SymbolTable<ELFT>::addLazyArchive(ArchiveFile *F, + const object::Archive::Symbol Sym) { Symbol *S; bool WasInserted; std::tie(S, WasInserted) = insert(Sym.getName()); diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp index ee5ce5bb00d..455a1363f92 100644 --- a/lld/ELF/Writer.cpp +++ b/lld/ELF/Writer.cpp @@ -83,7 +83,7 @@ private: void addCommonSymbols(std::vector<DefinedCommon *> &Syms); - std::unique_ptr<llvm::FileOutputBuffer> Buffer; + std::unique_ptr<FileOutputBuffer> Buffer; BumpPtrAllocator Alloc; std::vector<OutputSectionBase<ELFT> *> OutputSections; |

