[Cmake-commits] CMake branch, next, updated. v2.8.9-1104-g0714361

[Stephen Kelly]

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  07143613c21480b27691358128de269495a724da (commit)
       via  81f91b2fbf47d31ef2c8b5b6419a67e8c90f7619 (commit)
      from  96d3377e3f15374adbe4141187cd8d037bb93683 (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=07143613c21480b27691358128de269495a724da
commit 07143613c21480b27691358128de269495a724da
Merge: 96d3377 81f91b2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 16 08:35:02 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 16 08:35:02 2012 -0400

    Merge topic 'fix-NOTFOUND-processing' into next
    
    81f91b2 Fix unused parameter warning.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81f91b2fbf47d31ef2c8b5b6419a67e8c90f7619
commit 81f91b2fbf47d31ef2c8b5b6419a67e8c90f7619
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 15 12:08:57 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 15 12:09:26 2012 +0200

    Fix unused parameter warning.
    
    The PreprocessContext enum will be expanded in the future.

diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 0dc09c0..7d8df37 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -13,6 +13,7 @@
 
 #include "cmMakefile.h"
 #include "cmTarget.h"
+#include "assert.h"
 
 #include <cmsys/String.h>
 
@@ -131,8 +132,14 @@ cmCompiledGeneratorExpression::~cmCompiledGeneratorExpression()
 }
 
 std::string cmGeneratorExpression::Preprocess(const std::string &input,
-                                              GenerateContext context)
+                                              PreprocessContext context)
 {
+  if (context != StripAllGeneratorExpressions)
+  {
+    assert(!"cmGeneratorExpression::Preprocess called with invalid args");
+    return std::string();
+  }
+
   std::string result;
   std::string::size_type pos = 0;
   std::string::size_type lastPos = pos;
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index f2e0465..29d3f44 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -48,12 +48,12 @@ public:
   const cmCompiledGeneratorExpression& Parse(std::string const& input);
   const cmCompiledGeneratorExpression& Parse(const char* input);
 
-  enum GenerateContext {
+  enum PreprocessContext {
     StripAllGeneratorExpressions
   };
 
   static std::string Preprocess(const std::string &input,
-                                GenerateContext context);
+                                PreprocessContext context);
 
 private:
   cmGeneratorExpression(const cmGeneratorExpression &);

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

Summary of changes:
 Source/cmGeneratorExpression.cxx |    9 ++++++++-
 Source/cmGeneratorExpression.h   |    4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake