From c8ea2705a7115208f59839828a82b42a58293576 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 29 Jun 2010 10:01:59 -0400 Subject: Use same type in both cases of '?:' operator Both possible result values need to be convertible to the same type. Some compilers fail to recognize that they can construct std::string from the empty string literal, so state it explicitly. --- Source/cmCoreTryCompile.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index fcec3e9..b8a0c95 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -178,7 +178,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector const& argv) const char* rulesOverrideBase = "CMAKE_USER_MAKE_RULES_OVERRIDE"; std::string rulesOverrideLang = - rulesOverrideBase + (lang ? std::string("_") + lang : ""); + rulesOverrideBase + (lang ? std::string("_") + lang : std::string("")); if(const char* rulesOverridePath = this->Makefile->GetDefinition(rulesOverrideLang.c_str())) { -- cgit v0.12