diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-24 17:38:32 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-10-24 17:38:32 (GMT) |
| commit | 0c3ddf8b652311ec2a9447a9e6303691841628b4 (patch) | |
| tree | 79965c9e0285edd13cc17474a89afe817c76f898 /Source/cmMakefile.cxx | |
| parent | 9c4551f274d4d502590c4728aeba112c92c13385 (diff) | |
| parent | d1b62185d6b66b27a3ef31b79d4cff1c5126793e (diff) | |
| download | CMake-0c3ddf8b652311ec2a9447a9e6303691841628b4.zip CMake-0c3ddf8b652311ec2a9447a9e6303691841628b4.tar.gz CMake-0c3ddf8b652311ec2a9447a9e6303691841628b4.tar.bz2 | |
Merge branch 'revert-definition-map-lookup' into releasev3.1.0-rc1
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 8806205..0bd1624 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4476,7 +4476,7 @@ void cmMakefile::RaiseScope(const std::string& var, const char *varDef) if(cmDefinitions* up = cur.GetParent()) { // First localize the definition in the current scope. - cur.Pull(var); + cur.Get(var); // Now update the definition in the parent scope. up->Set(var, varDef); |