[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1149-g2889094

[Brad King]

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  288909421dc5cc1556c3f51ca497bb87b738f971 (commit)
       via  9713a191222ae84f75820efff6618778ca7ce0a2 (commit)
      from  3d00a5ef75bd3626a82a762bcfed2f5b01e95539 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=288909421dc5cc1556c3f51ca497bb87b738f971
commit 288909421dc5cc1556c3f51ca497bb87b738f971
Merge: 3d00a5e 9713a19
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 12 13:57:43 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 12 13:57:43 2014 -0500

    Merge topic 'assert-no-string-conversion' into next
    
    9713a191 Fix some Clang -Wstring-conversion warnings


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9713a191222ae84f75820efff6618778ca7ce0a2
commit 9713a191222ae84f75820efff6618778ca7ce0a2
Author:     Sean McBride <sean at rogue-research.com>
AuthorDate: Fri Dec 12 12:21:54 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 12 13:03:37 2014 -0500

    Fix some Clang -Wstring-conversion warnings
    
    Some false positives, but some flagged faluty asserts
    where the ! was inside the string instead of outside.

diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index bff6f5f..b6fe414 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -447,7 +447,7 @@ std::string cmGeneratorExpression::Preprocess(const std::string &input,
     return stripExportInterface(input, context, resolveRelative);
     }
 
-  assert(!"cmGeneratorExpression::Preprocess called with invalid args");
+  assert(0 && "cmGeneratorExpression::Preprocess called with invalid args");
   return std::string();
 }
 
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 17adad7..7ddf4d0 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1429,7 +1429,7 @@ cmPolicies::PolicyStatus statusForTarget(cmTarget const* tgt,
 
 #undef RETURN_POLICY
 
-  assert("!Unreachable code. Not a valid policy");
+  assert(0 && "Unreachable code. Not a valid policy");
   return cmPolicies::WARN;
 }
 
@@ -1445,7 +1445,7 @@ cmPolicies::PolicyID policyForString(const char *policy_id)
 
 #undef RETURN_POLICY_ID
 
-  assert("!Unreachable code. Not a valid policy");
+  assert(0 && "Unreachable code. Not a valid policy");
   return cmPolicies::CMP0002;
 }
 
diff --git a/Source/cmGeneratorExpressionParser.cxx b/Source/cmGeneratorExpressionParser.cxx
index a41a6e5..ec15daf 100644
--- a/Source/cmGeneratorExpressionParser.cxx
+++ b/Source/cmGeneratorExpressionParser.cxx
@@ -292,11 +292,11 @@ void cmGeneratorExpressionParser::ParseContent(
         }
       else
         {
-          assert(!"Got unexpected syntax token.");
+          assert(0 && "Got unexpected syntax token.");
         }
       assert(this->it != this->Tokens.end());
       ++this->it;
       return;
     }
-    assert(!"Unhandled token in generator expression.");
+    assert(0 && "Unhandled token in generator expression.");
 }
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index d689c89..bb346fb 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -95,7 +95,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
     case cmTarget::INTERFACE_LIBRARY:
       // Not reachable. We never create a cmInstallTargetGenerator for
       // an INTERFACE_LIBRARY.
-      assert(!"INTERFACE_LIBRARY targets have no installable outputs.");
+      assert(0 && "INTERFACE_LIBRARY targets have no installable outputs.");
       break;
     case cmTarget::OBJECT_LIBRARY:
     case cmTarget::UTILITY:
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;
 }
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGeneratorExpression.cxx          |    2 +-
 Source/cmGeneratorExpressionEvaluator.cxx |    4 ++--
 Source/cmGeneratorExpressionParser.cxx    |    4 ++--
 Source/cmInstallTargetGenerator.cxx       |    2 +-
 Source/cmTarget.cxx                       |   12 ++++++------
 5 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake