diff options
author | Puyan Lotfi <puyan@puyan.org> | 2019-08-30 20:09:55 +0000 |
---|---|---|
committer | Puyan Lotfi <puyan@puyan.org> | 2019-08-30 20:09:55 +0000 |
commit | 7e9dd09db8a4331a7ab843e205acf748cfcb11a8 (patch) | |
tree | 406d05df4730af1172ce3fb783c3f5d64669e859 /llvm/tools/llvm-ifs/llvm-ifs.cpp | |
parent | b83b4e94056a458c5e5297d8192619f6d3ed62e1 (diff) | |
download | bcm5719-llvm-7e9dd09db8a4331a7ab843e205acf748cfcb11a8.tar.gz bcm5719-llvm-7e9dd09db8a4331a7ab843e205acf748cfcb11a8.zip |
[IFS][NFC] llvm-ifs: Fixing build bot error due to commit conflicts.
r370510 and r370504
Again only on gcc.
llvm-svn: 370517
Diffstat (limited to 'llvm/tools/llvm-ifs/llvm-ifs.cpp')
-rw-r--r-- | llvm/tools/llvm-ifs/llvm-ifs.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/llvm/tools/llvm-ifs/llvm-ifs.cpp b/llvm/tools/llvm-ifs/llvm-ifs.cpp index 41f504a13ea..63f774f3751 100644 --- a/llvm/tools/llvm-ifs/llvm-ifs.cpp +++ b/llvm/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. |