[Cmake-commits] CMake branch, next, updated. v3.0.1-4770-g98b9b0f

[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  98b9b0f7b436be12609b99fb7514c810bcff7124 (commit)
       via  c6acbc90630064aaac0d0c23ea4d7afaceac48db (commit)
       via  4ec6ff8f9f38d02e300b3fc6bf75c2743eb70f97 (commit)
      from  65fd43e000b469d063f1fac64f3c25c8eaab1224 (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=98b9b0f7b436be12609b99fb7514c810bcff7124
commit 98b9b0f7b436be12609b99fb7514c810bcff7124
Merge: 65fd43e c6acbc9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 6 09:17:55 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 6 09:17:55 2014 -0400

    Merge topic 'genex-context-makefile-non-null' into next
    
    c6acbc90 Genex: Remove unnecessary check of context->Makefile
    4ec6ff8f CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6acbc90630064aaac0d0c23ea4d7afaceac48db
commit c6acbc90630064aaac0d0c23ea4d7afaceac48db
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 6 09:11:41 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 6 09:11:41 2014 -0400

    Genex: Remove unnecessary check of context->Makefile
    
    The context->Makefile is never NULL, but our checks for it convince
    Clang scan-build that it might be NULL.  Then it warns about later
    unchecked uses.  Drop the unnecessary checks.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 35a9fcb..70f33b7 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -394,9 +394,8 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
                        cmGeneratorExpressionDAGChecker *,
                        const std::string &lang) const
   {
-    const char *compilerId = context->Makefile ?
-                              context->Makefile->GetSafeDefinition(
-                                      "CMAKE_" + lang + "_COMPILER_ID") : "";
+    const char *compilerId =
+      context->Makefile->GetSafeDefinition("CMAKE_" + lang + "_COMPILER_ID");
     if (parameters.size() == 0)
       {
       return compilerId ? compilerId : "";
@@ -500,9 +499,8 @@ struct CompilerVersionNode : public cmGeneratorExpressionNode
                        cmGeneratorExpressionDAGChecker *,
                        const std::string &lang) const
   {
-    const char *compilerVersion = context->Makefile ?
-                              context->Makefile->GetSafeDefinition(
-                                  "CMAKE_" + lang + "_COMPILER_VERSION") : "";
+    const char *compilerVersion = context->Makefile->GetSafeDefinition(
+        "CMAKE_" + lang + "_COMPILER_VERSION");
     if (parameters.size() == 0)
       {
       return compilerVersion ? compilerVersion : "";
@@ -583,9 +581,8 @@ struct PlatformIdNode : public cmGeneratorExpressionNode
                        const GeneratorExpressionContent *,
                        cmGeneratorExpressionDAGChecker *) const
   {
-    const char *platformId = context->Makefile ?
-                              context->Makefile->GetSafeDefinition(
-                        "CMAKE_SYSTEM_NAME") : "";
+    const char *platformId =
+      context->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME");
     if (parameters.size() == 0)
       {
       return platformId ? platformId : "";

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

Summary of changes:
 Source/CMakeVersion.cmake                 |    2 +-
 Source/cmGeneratorExpressionEvaluator.cxx |   15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake