diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-30 12:47:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-09-30 12:47:02 (GMT) |
| commit | e67e0155d9dfbcf9691b0863978b441545a89565 (patch) | |
| tree | 7291972a8ea0a3d4f39101eeab22274ad8ebe3b6 /Source/cmMakefile.cxx | |
| parent | 11733d2dae0a844c2cfa5824bb1cac7b6a405c16 (diff) | |
| download | CMake-e67e0155d9dfbcf9691b0863978b441545a89565.zip CMake-e67e0155d9dfbcf9691b0863978b441545a89565.tar.gz CMake-e67e0155d9dfbcf9691b0863978b441545a89565.tar.bz2 | |
cmMakefile: Avoid name conflict with Solaris global typedef
On Solaris there is a global typedef called 'single':
/usr/include/floatingpoint.h:77:15: note: shadowed declaration is here
typedef float single;
Avoid shadowing it by using a different name.
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index c70756a..077470d 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3218,7 +3218,7 @@ void cmMakefile::AddDefaultDefinitions() //---------------------------------------------------------------------------- std::string cmMakefile::GetConfigurations(std::vector<std::string>& configs, - bool single) const + bool singleConfig) const { if(this->GetGlobalGenerator()->IsMultiConfig()) { @@ -3232,7 +3232,7 @@ cmMakefile::GetConfigurations(std::vector<std::string>& configs, else { const std::string& buildType = this->GetSafeDefinition("CMAKE_BUILD_TYPE"); - if(single && !buildType.empty()) + if(singleConfig && !buildType.empty()) { configs.push_back(buildType); } |