This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 15fd34c75455508eb1d7cc95c2ed475b6cc503a1 (commit)
via 1d8f0dd7836889944fd491c639e4010e97bc5e84 (commit)
from 0cfcc2e3e5b7eb312b82ceddeabf1e696feea2d4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15fd34c75455508eb1d7cc95c2ed475b6cc503a1
commit 15fd34c75455508eb1d7cc95c2ed475b6cc503a1
Merge: 0cfcc2e 1d8f0dd
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Sun Dec 11 15:24:58 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Dec 11 15:24:58 2016 -0500
Merge topic 'clang-tidy' into next
1d8f0dd7 fixup! clang-tidy: apply modernize-use-bool-literals fixes
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d8f0dd7836889944fd491c639e4010e97bc5e84
commit 1d8f0dd7836889944fd491c639e4010e97bc5e84
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Sun Dec 11 21:22:58 2016 +0100
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Sun Dec 11 21:22:58 2016 +0100
fixup! clang-tidy: apply modernize-use-bool-literals fixes
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 43b18dd..e70bbfe 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -351,7 +351,8 @@ std::string cmGeneratorExpression::Preprocess(const
std::string& input,
return stripExportInterface(input, context, resolveRelative);
}
- assert(!"cmGeneratorExpression::Preprocess called with invalid args");
+ assert(false &&
+ "cmGeneratorExpression::Preprocess called with invalid args");
return std::string();
}
diff --git a/Source/cmGeneratorExpressionNode.cxx
b/Source/cmGeneratorExpressionNode.cxx
index 9623e27..398f95b 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1377,7 +1377,7 @@ cmPolicies::PolicyStatus
statusForTarget(cmGeneratorTarget const* tgt,
#undef RETURN_POLICY
- assert(!"Unreachable code. Not a valid policy");
+ assert(false && "Unreachable code. Not a valid policy");
return cmPolicies::WARN;
}
@@ -1392,7 +1392,7 @@ cmPolicies::PolicyID policyForString(const char*
policy_id)
#undef RETURN_POLICY_ID
- assert(!"Unreachable code. Not a valid policy");
+ assert(false && "Unreachable code. Not a valid policy");
return cmPolicies::CMP0002;
}
diff --git a/Source/cmGeneratorExpressionParser.cxx
b/Source/cmGeneratorExpressionParser.cxx
index 25a0176..c33349a 100644
--- a/Source/cmGeneratorExpressionParser.cxx
+++ b/Source/cmGeneratorExpressionParser.cxx
@@ -242,11 +242,11 @@ void cmGeneratorExpressionParser::ParseContent(
if (this->NestingLevel == 0) {
extendText(result, this->it);
} else {
- assert(!"Got unexpected syntax token.");
+ assert(false && "Got unexpected syntax token.");
}
assert(this->it != this->Tokens.end());
++this->it;
return;
}
- assert(!"Unhandled token in generator expression.");
+ assert(false && "Unhandled token in generator expression.");
}
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index ccd3bfa..b6db0d6 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3389,7 +3389,8 @@ const char*
getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt,
{
switch (t) {
case BoolType:
- assert(!"String compatibility check function called for boolean");
+ assert(false &&
+ "String compatibility check function called for boolean");
return CM_NULLPTR;
case StringType:
return tgt->GetLinkInterfaceDependentStringProperty(prop, config);
@@ -3398,7 +3399,7 @@ const char*
getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt,
case NumberMaxType:
return tgt->GetLinkInterfaceDependentNumberMaxProperty(prop, config);
}
- assert(!"Unreachable!");
+ assert(false && "Unreachable!");
return CM_NULLPTR;
}
@@ -3589,7 +3590,7 @@ std::string compatibilityType(CompatibleType t)
case NumberMinType:
return "Numeric minimum compatibility";
}
- assert(!"Unreachable!");
+ assert(false && "Unreachable!");
return "";
}
@@ -3603,7 +3604,7 @@ std::string compatibilityAgree(CompatibleType t, bool
dominant)
case NumberMinType:
return dominant ? "(Dominant)\n" : "(Ignored)\n";
}
- assert(!"Unreachable!");
+ assert(false && "Unreachable!");
return "";
}
@@ -3713,7 +3714,7 @@ std::pair<bool, const char*> consistentProperty(const
char* lhs,
switch (t) {
case BoolType:
- assert(!"consistentProperty for strings called with BoolType");
+ assert(false && "consistentProperty for strings called with BoolType");
return std::pair<bool, const char*>(false, null_ptr);
case StringType:
return consistentStringProperty(lhs, rhs);
@@ -3721,7 +3722,7 @@ std::pair<bool, const char*> consistentProperty(const
char* lhs,
case NumberMaxType:
return consistentNumberProperty(lhs, rhs, t);
}
- assert(!"Unreachable!");
+ assert(false && "Unreachable!");
return std::pair<bool, const char*>(false, null_ptr);
}
diff --git a/Source/cmInstallTargetGenerator.cxx
b/Source/cmInstallTargetGenerator.cxx
index bdfc304..88fcc56 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -97,7 +97,8 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(
case cmStateEnums::INTERFACE_LIBRARY:
// Not reachable. We never create a cmInstallTargetGenerator for
// an INTERFACE_LIBRARY.
- assert(!"INTERFACE_LIBRARY targets have no installable outputs.");
+ assert(false &&
+ "INTERFACE_LIBRARY targets have no installable outputs.");
break;
case cmStateEnums::OBJECT_LIBRARY:
case cmStateEnums::UTILITY:
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx
b/Source/cmNinjaNormalTargetGenerator.cxx
index 5eb0a10..0db5687 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -538,7 +538,7 @@ std::vector<std::string>
cmNinjaNormalTargetGenerator::ComputeLinkCmd()
case cmStateEnums::EXECUTABLE:
break;
default:
- assert(!"Unexpected target type");
+ assert(false && "Unexpected target type");
}
return std::vector<std::string>();
}
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index b2d8d25..18d5ea1 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -58,7 +58,7 @@ const char*
cmState::GetTargetTypeName(cmStateEnums::TargetType targetType)
case cmStateEnums::UNKNOWN_LIBRARY:
return "UNKNOWN_LIBRARY";
}
- assert(!"Unexpected target type");
+ assert(false && "Unexpected target type");
return CM_NULLPTR;
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorExpression.cxx | 3 ++-
Source/cmGeneratorExpressionNode.cxx | 4 ++--
Source/cmGeneratorExpressionParser.cxx | 4 ++--
Source/cmGeneratorTarget.cxx | 13 +++++++------
Source/cmInstallTargetGenerator.cxx | 3 ++-
Source/cmNinjaNormalTargetGenerator.cxx | 2 +-
Source/cmState.cxx | 2 +-
7 files changed, 17 insertions(+), 14 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
