From efcca9353f9af919625727a68b2f9c77995aed7f Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 3 May 2015 11:05:27 +0200 Subject: cmMakefile: Simplify GetCMakeInstance implementation. No callers handle the possibility that it can return null, and that is no longer possible anyway. --- Source/cmMakefile.cxx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 5686b1b..925554b 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3693,11 +3693,7 @@ bool cmMakefile::GetIsSourceFileTryCompile() const cmake *cmMakefile::GetCMakeInstance() const { - if ( this->LocalGenerator && this->LocalGenerator->GetGlobalGenerator() ) - { - return this->LocalGenerator->GetGlobalGenerator()->GetCMakeInstance(); - } - return 0; + return this->LocalGenerator->GetGlobalGenerator()->GetCMakeInstance(); } #ifdef CMAKE_BUILD_WITH_CMAKE -- cgit v0.12