diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-12 21:35:33 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-12 21:35:33 +0000 |
| commit | f743031b8b923efe8c534bd56b51bb566f36b9cf (patch) | |
| tree | ece5edadff5d28b161492d24c27869d4fafbab14 /lld/lib/ReaderWriter/ELF/PPC | |
| parent | d31b63e6ae3dfa9d28ef98e093fdbe5f5113161f (diff) | |
| download | bcm5719-llvm-f743031b8b923efe8c534bd56b51bb566f36b9cf.tar.gz bcm5719-llvm-f743031b8b923efe8c534bd56b51bb566f36b9cf.zip | |
More prefixing of error_code.
llvm-svn: 210831
Diffstat (limited to 'lld/lib/ReaderWriter/ELF/PPC')
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.cpp | 6 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.cpp b/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.cpp index f76b169da84..5f01b2d6f9c 100644 --- a/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.cpp +++ b/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.cpp @@ -35,7 +35,7 @@ static int relocB24PCREL(uint8_t *location, uint64_t P, uint64_t S, return 1; } -error_code PPCTargetRelocationHandler::applyRelocation( +std::error_code PPCTargetRelocationHandler::applyRelocation( ELFWriter &writer, llvm::FileOutputBuffer &buf, const lld::AtomLayout &atom, const Reference &ref) const { uint8_t *atomContent = buf.getBufferStart() + atom._fileOffset; @@ -44,7 +44,7 @@ error_code PPCTargetRelocationHandler::applyRelocation( uint64_t relocVAddress = atom._virtualAddr + ref.offsetInAtom(); if (ref.kindNamespace() != Reference::KindNamespace::ELF) - return error_code(); + return std::error_code(); assert(ref.kindArch() == Reference::KindArch::PowerPC); switch (ref.kindValue()) { case R_PPC_REL24: @@ -60,7 +60,7 @@ error_code PPCTargetRelocationHandler::applyRelocation( } } - return error_code(); + return std::error_code(); } PPCTargetHandler::PPCTargetHandler(PPCLinkingContext &context) diff --git a/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.h b/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.h index f27aed01d65..4c8b8c58124 100644 --- a/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.h @@ -30,9 +30,9 @@ public: PPCTargetLayout<PPCELFType> &layout) : _ppcContext(context), _ppcTargetLayout(layout) {} - virtual error_code applyRelocation(ELFWriter &, llvm::FileOutputBuffer &, - const lld::AtomLayout &, - const Reference &) const override; + virtual std::error_code applyRelocation(ELFWriter &, llvm::FileOutputBuffer &, + const lld::AtomLayout &, + const Reference &) const override; protected: PPCLinkingContext &_ppcContext; |

