diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-12-01 18:46:19 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-12-01 18:46:19 +0000 |
| commit | 4dbdceb6fc4e2abb4861e04d5f36ed953f32a2be (patch) | |
| tree | 9186ee37bfaf539f788aee581ae949ce34dbb7f3 | |
| parent | 4808c6d064fd2408a35de72e7285dd30acd87c92 (diff) | |
| download | bcm5719-llvm-4dbdceb6fc4e2abb4861e04d5f36ed953f32a2be.tar.gz bcm5719-llvm-4dbdceb6fc4e2abb4861e04d5f36ed953f32a2be.zip | |
Use a forwarding constructor instead of an init method.
llvm-svn: 254435
| -rw-r--r-- | llvm/include/llvm/Linker/Linker.h | 1 | ||||
| -rw-r--r-- | llvm/lib/Linker/LinkModules.cpp | 15 |
2 files changed, 5 insertions, 11 deletions
diff --git a/llvm/include/llvm/Linker/Linker.h b/llvm/include/llvm/Linker/Linker.h index 3f6c7b6c694..7ac457856a1 100644 --- a/llvm/include/llvm/Linker/Linker.h +++ b/llvm/include/llvm/Linker/Linker.h @@ -93,7 +93,6 @@ public: unsigned Flags = Flags::None); private: - void init(Module *M, DiagnosticHandlerFunction DiagnosticHandler); Module *Composite; IdentifiedStructTypeSet IdentifiedStructTypes; diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp index c57c70e322a..9aff43f3199 100644 --- a/llvm/lib/Linker/LinkModules.cpp +++ b/llvm/lib/Linker/LinkModules.cpp @@ -2032,7 +2032,7 @@ bool Linker::IdentifiedStructTypeSet::hasType(StructType *Ty) { return *I == Ty; } -void Linker::init(Module *M, DiagnosticHandlerFunction DiagnosticHandler) { +Linker::Linker(Module *M, DiagnosticHandlerFunction DiagnosticHandler) { this->Composite = M; this->DiagnosticHandler = DiagnosticHandler; @@ -2046,15 +2046,10 @@ void Linker::init(Module *M, DiagnosticHandlerFunction DiagnosticHandler) { } } -Linker::Linker(Module *M, DiagnosticHandlerFunction DiagnosticHandler) { - init(M, DiagnosticHandler); -} - -Linker::Linker(Module *M) { - init(M, [this](const DiagnosticInfo &DI) { - Composite->getContext().diagnose(DI); - }); -} +Linker::Linker(Module *M) + : Linker(M, [this](const DiagnosticInfo &DI) { + Composite->getContext().diagnose(DI); + }) {} void Linker::deleteModule() { delete Composite; |

