diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-14 20:24:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-14 20:24:45 (GMT) |
| commit | c1f15e1c79251bc3fef4bae21020eb5f15437597 (patch) | |
| tree | d31430a6653e94254cae77b2fb7e8c9dd6cf36f8 /Source/cmGlobalGenerator.cxx | |
| parent | 877e7383b33600f313b1c958f6fc4ee10fb5bbe3 (diff) | |
| download | CMake-c1f15e1c79251bc3fef4bae21020eb5f15437597.zip CMake-c1f15e1c79251bc3fef4bae21020eb5f15437597.tar.gz CMake-c1f15e1c79251bc3fef4bae21020eb5f15437597.tar.bz2 | |
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.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 0bef710..37a2759 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; |