diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-06 20:24:06 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-06 20:24:06 +0000 |
| commit | 95ec533a1d8c450f6c6c5e84fe85423960e13382 (patch) | |
| tree | bfe77b0dccd50ed2f4b4e6299d4bc4eaafced6e7 /contrib/llvm/tools/lld/ELF/InputSection.h | |
| parent | 2b532af82919b9141e7fd04becf354a0a7dfa813 (diff) | |
| parent | 7e7b6700743285c0af506ac6299ddf82ebd434b9 (diff) | |
Merge llvm, clang, lld and lldb trunk r291274, and resolve conflicts.
Notes
Notes:
svn path=/projects/clang400-import/; revision=311544
Diffstat (limited to 'contrib/llvm/tools/lld/ELF/InputSection.h')
| -rw-r--r-- | contrib/llvm/tools/lld/ELF/InputSection.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/llvm/tools/lld/ELF/InputSection.h b/contrib/llvm/tools/lld/ELF/InputSection.h index adbc1e1e3829..fc7a7fb60973 100644 --- a/contrib/llvm/tools/lld/ELF/InputSection.h +++ b/contrib/llvm/tools/lld/ELF/InputSection.h @@ -318,10 +318,9 @@ private: }; template <class ELFT> InputSection<ELFT> InputSection<ELFT>::Discarded; - -template <class ELFT> std::string toString(const InputSectionBase<ELFT> *); - } // namespace elf + +template <class ELFT> std::string toString(const elf::InputSectionBase<ELFT> *); } // namespace lld #endif |