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

Merge topic 'assert-no-string-conversion' 

2e92570b Fix some Clang -Wstring-conversion warnings
This commit is contained in:
Brad King 2014-12-15 11:06:49 -05:00 committed by CMake Topic Stage
parent 526c34b240 2e92570bda
commit 872ad7a26d
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGeneratorExpression.cxx
View File

@ -447,7 +447,7 @@ std::string cmGeneratorExpression::Preprocess(const std::string &input,
return stripExportInterface(input, context, resolveRelative); return stripExportInterface(input, context, resolveRelative);
} }
assert(!"cmGeneratorExpression::Preprocess called with invalid args"); assert(0 && "cmGeneratorExpression::Preprocess called with invalid args");
return std::string(); return std::string();
} }

4
Source/cmGeneratorExpressionEvaluator.cxx
View File

@ -1429,7 +1429,7 @@ cmPolicies::PolicyStatus statusForTarget(cmTarget const* tgt,
#undef RETURN_POLICY #undef RETURN_POLICY
assert("!Unreachable code. Not a valid policy"); assert(0 && "Unreachable code. Not a valid policy");
return cmPolicies::WARN; return cmPolicies::WARN;
} }
@ -1445,7 +1445,7 @@ cmPolicies::PolicyID policyForString(const char *policy_id)
#undef RETURN_POLICY_ID #undef RETURN_POLICY_ID
assert("!Unreachable code. Not a valid policy"); assert(0 && "Unreachable code. Not a valid policy");
return cmPolicies::CMP0002; return cmPolicies::CMP0002;
} }

4
Source/cmGeneratorExpressionParser.cxx
View File

@ -292,11 +292,11 @@ void cmGeneratorExpressionParser::ParseContent(
} }
else else
{ {
assert(!"Got unexpected syntax token."); assert(0 && "Got unexpected syntax token.");
} }
assert(this->it != this->Tokens.end()); assert(this->it != this->Tokens.end());
++this->it; ++this->it;
return; return;
} }
assert(!"Unhandled token in generator expression."); assert(0 && "Unhandled token in generator expression.");
} }

2
Source/cmInstallTargetGenerator.cxx
View File

@ -95,7 +95,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
case cmTarget::INTERFACE_LIBRARY: case cmTarget::INTERFACE_LIBRARY:
// Not reachable. We never create a cmInstallTargetGenerator for // Not reachable. We never create a cmInstallTargetGenerator for
// an INTERFACE_LIBRARY. // an INTERFACE_LIBRARY.
assert(!"INTERFACE_LIBRARY targets have no installable outputs."); assert(0 && "INTERFACE_LIBRARY targets have no installable outputs.");
break; break;
case cmTarget::OBJECT_LIBRARY: case cmTarget::OBJECT_LIBRARY:
case cmTarget::UTILITY: case cmTarget::UTILITY:

12
Source/cmTarget.cxx
View File

@ -4856,7 +4856,7 @@ std::pair<bool, const char*> consistentProperty(const char *lhs,
switch(t) switch(t)
{ {
case BoolType: case BoolType:
assert(!"consistentProperty for strings called with BoolType"); assert(0 && "consistentProperty for strings called with BoolType");
return std::pair<bool, const char*>(false, null_ptr); return std::pair<bool, const char*>(false, null_ptr);
case StringType: case StringType:
return consistentStringProperty(lhs, rhs); return consistentStringProperty(lhs, rhs);
@ -4864,7 +4864,7 @@ std::pair<bool, const char*> consistentProperty(const char *lhs,
case NumberMaxType: case NumberMaxType:
return consistentNumberProperty(lhs, rhs, t); return consistentNumberProperty(lhs, rhs, t);
} }
assert(!"Unreachable!"); assert(0 && "Unreachable!");
return std::pair<bool, const char*>(false, null_ptr); return std::pair<bool, const char*>(false, null_ptr);
} }
@ -4949,7 +4949,7 @@ std::string compatibilityType(CompatibleType t)
case NumberMinType: case NumberMinType:
return "Numeric minimum compatibility"; return "Numeric minimum compatibility";
} }
assert(!"Unreachable!"); assert(0 && "Unreachable!");
return ""; return "";
} }
@ -4965,7 +4965,7 @@ std::string compatibilityAgree(CompatibleType t, bool dominant)
case NumberMinType: case NumberMinType:
return dominant ? "(Dominant)\n" : "(Ignored)\n"; return dominant ? "(Dominant)\n" : "(Ignored)\n";
} }
assert(!"Unreachable!"); assert(0 && "Unreachable!");
return ""; return "";
} }
@ -6578,7 +6578,7 @@ const char * getLinkInterfaceDependentProperty(cmTarget const* tgt,
switch(t) switch(t)
{ {
case BoolType: case BoolType:
assert(!"String compatibility check function called for boolean"); assert(0 && "String compatibility check function called for boolean");
return 0; return 0;
case StringType: case StringType:
return tgt->GetLinkInterfaceDependentStringProperty(prop, config); return tgt->GetLinkInterfaceDependentStringProperty(prop, config);
@ -6587,7 +6587,7 @@ const char * getLinkInterfaceDependentProperty(cmTarget const* tgt,
case NumberMaxType: case NumberMaxType:
return tgt->GetLinkInterfaceDependentNumberMaxProperty(prop, config); return tgt->GetLinkInterfaceDependentNumberMaxProperty(prop, config);
} }
assert(!"Unreachable!"); assert(0 && "Unreachable!");
return 0; return 0;
} }