[Cmake-commits] CMake branch, next, updated. v2.8.8-3531-g65a15f6

[Peter Kuemmel]

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  65a15f64903df0b29173f6ce0865fad4ded9755f (commit)
       via  d569f3ef15cd05f3a42788dba26abd1e0846c59e (commit)
      from  6a7d666b26e0d71bd0a357f503a9b5bcfc80a907 (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=65a15f64903df0b29173f6ce0865fad4ded9755f
commit 65a15f64903df0b29173f6ce0865fad4ded9755f
Merge: 6a7d666 d569f3e
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Thu Jul 19 01:33:03 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 19 01:33:03 2012 -0400

    Merge topic 'ninja-fix-macosx' into next
    
    d569f3e Ninja: void function can't return a value


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d569f3ef15cd05f3a42788dba26abd1e0846c59e
commit d569f3ef15cd05f3a42788dba26abd1e0846c59e
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Thu Jul 19 07:32:03 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Thu Jul 19 07:32:03 2012 +0200

    Ninja: void function can't return a value

diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h
index 20b36e8..c450841 100644
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@@ -83,8 +83,8 @@ public:
 
   void ExpandRuleVariables(std::string& string,
                            const RuleVariables& replaceValues) {
-    return cmLocalGenerator::
-             ExpandRuleVariables(string, replaceValues); }
+    cmLocalGenerator::ExpandRuleVariables(string, replaceValues);
+  }
 
   std::string BuildCommandLine(const std::vector<std::string> &cmdLines);
 

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

Summary of changes:
 Source/cmLocalNinjaGenerator.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake