From 82c1c92a178b6ca18d1d78e7fd5564ab924b7895 Mon Sep 17 00:00:00 2001
From: Puyan Lotfi <puyan@puyan.org>
Date: Fri, 30 Aug 2019 20:09:55 +0000
Subject: [PATCH] [IFS][NFC] llvm-ifs: Fixing build bot error due to commit
 conflicts.

r370510 and r370504

Again only on gcc.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@370517 91177308-0d34-0410-b5e6-96231b3b80d8
---
 tools/llvm-ifs/llvm-ifs.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tools/llvm-ifs/llvm-ifs.cpp b/tools/llvm-ifs/llvm-ifs.cpp
index 41f504a13ea..63f774f3751 100644
--- a/tools/llvm-ifs/llvm-ifs.cpp
+++ b/tools/llvm-ifs/llvm-ifs.cpp
@@ -85,8 +85,6 @@ struct IFSSymbol {
   bool operator<(const IFSSymbol &RHS) const { return Name < RHS.Name; }
 };
 
-namespace llvm {
-namespace yaml {
 /// YAML traits for IFSSymbolType.
 template <> struct llvm::yaml::ScalarEnumerationTraits<IFSSymbolType> {
   static void enumeration(IO &IO, IFSSymbolType &SymbolType) {
@@ -154,8 +152,6 @@ template <> struct llvm::yaml::CustomMappingTraits<std::set<IFSSymbol>> {
       IO.mapRequired(Sym.Name.c_str(), const_cast<IFSSymbol &>(Sym));
   }
 };
-} // End yaml namespace
-} // End llvm namespace
 
 // A cumulative representation of ELF stubs.
 // Both textual and binary stubs will read into and write from this object.
@@ -181,8 +177,6 @@ public:
         Symbols(std::move(Stub.Symbols)) {}
 };
 
-namespace llvm {
-namespace yaml {
 /// YAML traits for IFSStub objects.
 template <> struct llvm::yaml::MappingTraits<IFSStub> {
   static void mapping(IO &IO, IFSStub &Stub) {
@@ -196,8 +190,6 @@ template <> struct llvm::yaml::MappingTraits<IFSStub> {
     IO.mapRequired("Symbols", Stub.Symbols);
   }
 };
-} // End yaml namespace
-} // End llvm namespace
 
 static Expected<std::unique_ptr<IFSStub>> readInputFile(StringRef FilePath) {
   // Read in file.
-- 
2.50.1