[Cmake-commits] CMake branch, next, updated. v2.8.9-1071-gc1d14a8

[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  c1d14a8bcd6f5c7acd2448ab2d4eb21f4440a9ed (commit)
       via  a573a856581118d7a9d8dd7be1f613ba7b1ddb04 (commit)
      from  37e760e7ec7b86f6a16299521bde09e5ce22b985 (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=c1d14a8bcd6f5c7acd2448ab2d4eb21f4440a9ed
commit c1d14a8bcd6f5c7acd2448ab2d4eb21f4440a9ed
Merge: 37e760e a573a85
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 11 16:33:26 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 11 16:33:26 2012 -0400

    Merge topic 'suncc-compile-fix' into next
    
    a573a85 Attempt to fix the compile of cmake on Sun CC.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a573a856581118d7a9d8dd7be1f613ba7b1ddb04
commit a573a856581118d7a9d8dd7be1f613ba7b1ddb04
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 11 22:31:35 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 11 22:31:35 2012 +0200

    Attempt to fix the compile of cmake on Sun CC.
    
    The problem may be that the reportError method is static, so make
    it non-static on that platform.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 92e2052..287066a 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -17,7 +17,10 @@
 #include "cmGeneratorExpression.h"
 
 //----------------------------------------------------------------------------
-static void reportError(cmGeneratorExpressionContext *context,
+#if !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x510
+static
+#endif
+void reportError(cmGeneratorExpressionContext *context,
                         const std::string &expr, const std::string &result)
 {
   context->HadError = true;

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

Summary of changes:
 Source/cmGeneratorExpressionEvaluator.cxx |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake