[llvm] r370517 - [IFS][NFC] llvm-ifs: Fixing build bot error due to commit conflicts.

[Puyan Lotfi via llvm-commits]

Author: zer0
Date: Fri Aug 30 13:09:55 2019
New Revision: 370517

URL: http://llvm.org/viewvc/llvm-project?rev=370517&view=rev
Log:
[IFS][NFC] llvm-ifs: Fixing build bot error due to commit conflicts.

r370510 and r370504

Again only on gcc.

Modified:
    llvm/trunk/tools/llvm-ifs/llvm-ifs.cpp

Modified: llvm/trunk/tools/llvm-ifs/llvm-ifs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-ifs/llvm-ifs.cpp?rev=370517&r1=370516&r2=370517&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-ifs/llvm-ifs.cpp (original)
+++ llvm/trunk/tools/llvm-ifs/llvm-ifs.cpp Fri Aug 30 13:09:55 2019
@@ -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::CustomMap
       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::MappingTr
     IO.mapRequired("Symbols", Stub.Symbols);
   }
 };
-} // End yaml namespace
-} // End llvm namespace
 
 static Expected<std::unique_ptr<IFSStub>> readInputFile(StringRef FilePath) {
   // Read in file.