[Cmake-commits] CMake branch, next, updated. v3.2.3-1485-g7a802ef

[Nils Gladitz]

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  7a802efbf4512c9038083a786be910078f058f7a (commit)
       via  a3e776782e41fd6c26ac13319434a9027c010b0e (commit)
      from  eb672500311c81c1922399cf6095852a0612bbef (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=7a802efbf4512c9038083a786be910078f058f7a
commit 7a802efbf4512c9038083a786be910078f058f7a
Merge: eb67250 a3e7767
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Jun 4 11:57:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 4 11:57:00 2015 -0400

    Merge topic 'vs-deterministic-guid' into next
    
    a3e77678 VS: Remove unintended assert


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3e776782e41fd6c26ac13319434a9027c010b0e
commit a3e776782e41fd6c26ac13319434a9027c010b0e
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Jun 4 17:55:28 2015 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Thu Jun 4 17:55:28 2015 +0200

    VS: Remove unintended assert

diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 35760d7..0ced245 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -958,8 +958,8 @@ std::string cmGlobalVisualStudio7Generator::GetGUID(std::string const& name)
   cmUuid uuidGenerator;
 
   std::vector<unsigned char> uuidNamespace;
-  assert(uuidGenerator.StringToBinary(
-    "ee30c4be-5192-4fb0-b335-722a2dffe760", uuidNamespace));
+  uuidGenerator.StringToBinary(
+    "ee30c4be-5192-4fb0-b335-722a2dffe760", uuidNamespace);
 
   std::string guid = uuidGenerator.FromMd5(uuidNamespace, input);
 

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

Summary of changes:
 Source/cmGlobalVisualStudio7Generator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake