[Cmake-commits] CMake branch, next, updated. v2.8.8-2735-g47a6819

[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  47a68194525d19e8ad014364d03f0a8c862996fd (commit)
       via  db1bfee3c320b1efe1208d1ee8ffaf90c272d1a8 (commit)
      from  1464e43554b942ecacaff46b48712854d95c5d7a (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=47a68194525d19e8ad014364d03f0a8c862996fd
commit 47a68194525d19e8ad014364d03f0a8c862996fd
Merge: 1464e43 db1bfee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 27 08:11:44 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 27 08:11:44 2012 -0400

    Merge topic 'kwsys-environ-cleanup' into next
    
    db1bfee KWSys: Make set<> ordering functor const


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db1bfee3c320b1efe1208d1ee8ffaf90c272d1a8
commit db1bfee3c320b1efe1208d1ee8ffaf90c272d1a8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 27 08:09:45 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 27 08:10:24 2012 -0400

    KWSys: Make set<> ordering functor const
    
    Address compilation error
    
     error C3848: expression having type 'const cmsys::kwsysEnvCompare'
     would lose some const-volatile qualifiers in order to call 'bool
     cmsys::kwsysEnvCompare::operator ()(const char *,const char *)'

diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx
index 7c85fd4..8ab580f 100644
--- a/Source/kwsys/SystemTools.cxx
+++ b/Source/kwsys/SystemTools.cxx
@@ -520,7 +520,7 @@ bool SystemTools::UnPutEnv(const char* env)
 /* Order by environment key only (VAR from VAR=VALUE).  */
 struct kwsysEnvCompare
 {
-  bool operator() (const char* l, const char* r)
+  bool operator() (const char* l, const char* r) const
     {
     const char* leq = strchr(l, '=');
     const char* req = strchr(r, '=');

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

Summary of changes:
 Source/kwsys/SystemTools.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake