summaryrefslogtreecommitdiff
path: root/Source/cmGlobalGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-06-14 16:24:45 -0400
committerBrad King <brad.king@kitware.com>2017-06-14 16:24:45 -0400
commitc1f15e1c79251bc3fef4bae21020eb5f15437597 (patch)
treed31430a6653e94254cae77b2fb7e8c9dd6cf36f8 /Source/cmGlobalGenerator.cxx
parent877e7383b33600f313b1c958f6fc4ee10fb5bbe3 (diff)
downloadcmake-c1f15e1c79251bc3fef4bae21020eb5f15437597.tar.gz
cmGlobalGenerator: Rename member to avoid shadowing
The `CurrentMakefile` member is shadowed by a generate-time member of the same name in `cmGlobalXCodeGenerator`. Rename our member to clarify its configure-time role and avoid the shadow.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r--Source/cmGlobalGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 0bef710716..37a2759a4c 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -90,7 +90,7 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
this->TryCompileTimeout = 0;
this->ExtraGenerator = CM_NULLPTR;
- this->CurrentMakefile = CM_NULLPTR;
+ this->CurrentConfigureMakefile = CM_NULLPTR;
this->TryCompileOuterMakefile = CM_NULLPTR;
this->ConfigureDoneCMP0026AndCMP0024 = false;