kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMakefile: Avoid name conflict with Solaris global typedef

Browse Source 
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.
This commit is contained in:
Brad King 2015-09-30 08:47:02 -04:00
parent 11733d2dae
commit e67e0155d9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmMakefile.cxx
View File

@ -3218,7 +3218,7 @@ void cmMakefile::AddDefaultDefinitions()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string std::string
cmMakefile::GetConfigurations(std::vector<std::string>& configs, cmMakefile::GetConfigurations(std::vector<std::string>& configs,
bool single) const bool singleConfig) const
{ {
if(this->GetGlobalGenerator()->IsMultiConfig()) if(this->GetGlobalGenerator()->IsMultiConfig())
{ {
@ -3232,7 +3232,7 @@ cmMakefile::GetConfigurations(std::vector<std::string>& configs,
else else
{ {
const std::string& buildType = this->GetSafeDefinition("CMAKE_BUILD_TYPE"); const std::string& buildType = this->GetSafeDefinition("CMAKE_BUILD_TYPE");
if(single && !buildType.empty()) if(singleConfig && !buildType.empty())
{ {
configs.push_back(buildType); configs.push_back(buildType);
} }