[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1908-g3685969

Rolf Eike Beer eike at sf-mail.de
Fri Apr 4 17:27:56 EDT 2014


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  36859695634d22a803b6f7c7df265872a435b160 (commit)
       via  539b6c58f5d9fa9487f8d831f11320517e4dae47 (commit)
      from  3ab31f719bdfb8eedf5270e5821e45fccaa79980 (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=36859695634d22a803b6f7c7df265872a435b160
commit 36859695634d22a803b6f7c7df265872a435b160
Merge: 3ab31f7 539b6c5
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Apr 4 17:27:55 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 4 17:27:55 2014 -0400

    Merge topic 'aix-compile' into next
    
    539b6c58 Fix build on AIX failing because of access to string elements


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=539b6c58f5d9fa9487f8d831f11320517e4dae47
commit 539b6c58f5d9fa9487f8d831f11320517e4dae47
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Apr 4 23:25:33 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Apr 4 23:25:33 2014 +0200

    Fix build on AIX failing because of access to string elements
    
    The compilation failed with this error message:
    
    .../Source/cmCryptoHash.cxx: In method `string cmCryptoHash::HashString (const string &)':
    .../Source/cmCryptoHash.cxx:41: non-lvalue in unary `&'
    
    This was introduced in 77f60392d93f41a8828d3db1d7b76d45f1535d07 (stringapi:
    Accept strings when MD5 hashing data).

diff --git a/Source/cmCryptoHash.cxx b/Source/cmCryptoHash.cxx
index 0d3c6bb..74e17b6 100644
--- a/Source/cmCryptoHash.cxx
+++ b/Source/cmCryptoHash.cxx
@@ -38,7 +38,7 @@ cmsys::auto_ptr<cmCryptoHash> cmCryptoHash::New(const char* algo)
 std::string cmCryptoHash::HashString(const std::string& input)
 {
   this->Initialize();
-  this->Append(reinterpret_cast<unsigned char const*>(&input[0]),
+  this->Append(reinterpret_cast<unsigned char const*>(input.c_str()),
                static_cast<int>(input.size()));
   return this->Finalize();
 }

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

Summary of changes:
 Source/cmCryptoHash.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list