diff options
author | Sean McBride <sean@rogue-research.com> | 2014-12-12 17:21:54 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-12-12 19:38:23 (GMT) |
commit | 2e92570bdaacfd5791c37e0fc302e05f095c3901 (patch) | |
tree | 184df9daf37a6f865847026bee49a3d2cbc50859 /Source/cmTarget.cxx | |
parent | a829f09bdd5cf28c59eeebd39d1652be2bd23283 (diff) | |
download | CMake-2e92570bdaacfd5791c37e0fc302e05f095c3901.zip CMake-2e92570bdaacfd5791c37e0fc302e05f095c3901.tar.gz CMake-2e92570bdaacfd5791c37e0fc302e05f095c3901.tar.bz2 |
Fix some Clang -Wstring-conversion warnings
Some false positives, but some flagged faulty asserts
where the ! was inside the string instead of outside.
Diffstat (limited to 'Source/cmTarget.cxx')
-rw-r--r-- | Source/cmTarget.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index f0957d0..37aa26e 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -4856,7 +4856,7 @@ std::pair<bool, const char*> consistentProperty(const char *lhs, switch(t) { 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); case StringType: return consistentStringProperty(lhs, rhs); @@ -4864,7 +4864,7 @@ std::pair<bool, const char*> consistentProperty(const char *lhs, case NumberMaxType: return consistentNumberProperty(lhs, rhs, t); } - assert(!"Unreachable!"); + assert(0 && "Unreachable!"); return std::pair<bool, const char*>(false, null_ptr); } @@ -4949,7 +4949,7 @@ std::string compatibilityType(CompatibleType t) case NumberMinType: return "Numeric minimum compatibility"; } - assert(!"Unreachable!"); + assert(0 && "Unreachable!"); return ""; } @@ -4965,7 +4965,7 @@ std::string compatibilityAgree(CompatibleType t, bool dominant) case NumberMinType: return dominant ? "(Dominant)\n" : "(Ignored)\n"; } - assert(!"Unreachable!"); + assert(0 && "Unreachable!"); return ""; } @@ -6578,7 +6578,7 @@ const char * getLinkInterfaceDependentProperty(cmTarget const* tgt, switch(t) { case BoolType: - assert(!"String compatibility check function called for boolean"); + assert(0 && "String compatibility check function called for boolean"); return 0; case StringType: return tgt->GetLinkInterfaceDependentStringProperty(prop, config); @@ -6587,7 +6587,7 @@ const char * getLinkInterfaceDependentProperty(cmTarget const* tgt, case NumberMaxType: return tgt->GetLinkInterfaceDependentNumberMaxProperty(prop, config); } - assert(!"Unreachable!"); + assert(0 && "Unreachable!"); return 0; } |