From e67e0155d9dfbcf9691b0863978b441545a89565 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 30 Sep 2015 08:47:02 -0400 Subject: 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. --- Source/cmMakefile.cxx | 4 ++-- 1 file 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& configs, - bool single) const + bool singleConfig) const { if(this->GetGlobalGenerator()->IsMultiConfig()) { @@ -3232,7 +3232,7 @@ cmMakefile::GetConfigurations(std::vector& configs, else { const std::string& buildType = this->GetSafeDefinition("CMAKE_BUILD_TYPE"); - if(single && !buildType.empty()) + if(singleConfig && !buildType.empty()) { configs.push_back(buildType); } -- cgit v0.12 From f90acf522b1a03af9b5a7bea1d3f50285504fce8 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 30 Sep 2015 08:53:09 -0400 Subject: cmVisualStudio10TargetGenerator: Fix unsigned integer constant type Add a 'u' suffix to FILETIME component integer constant initializers. This avoids warnings about the range of the signed constant value. --- Source/cmVisualStudio10TargetGenerator.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 6c71313..fcd8f2a 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -3475,7 +3475,7 @@ bool cmVisualStudio10TargetGenerator::ForceOld(const std::string& source) const return false; } - FILETIME const ftime_20010101 = { 3365781504, 29389701 }; + FILETIME const ftime_20010101 = { 3365781504u, 29389701u }; if (!SetFileTime(h, &ftime_20010101, &ftime_20010101, &ftime_20010101)) { CloseHandle(h); -- cgit v0.12