[Cmake-commits] CMake branch, next, updated. v3.0.1-5033-g3fd22a9

[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  3fd22a9f35eea759b176f3255fbd9189f90eb666 (commit)
       via  54de7990f79fcb632e9b4ad6e3e53de49334dda8 (commit)
      from  6a64cba2814530ea13aa6625e95c8ddbc6419b0e (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=3fd22a9f35eea759b176f3255fbd9189f90eb666
commit 3fd22a9f35eea759b176f3255fbd9189f90eb666
Merge: 6a64cba 54de799
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Aug 26 02:36:45 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 26 02:36:45 2014 -0400

    Merge topic 'string-uuid' into next
    
    54de7990 StringUuid: Use global namespace memcpy


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54de7990f79fcb632e9b4ad6e3e53de49334dda8
commit 54de7990f79fcb632e9b4ad6e3e53de49334dda8
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Aug 26 08:35:38 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Aug 26 08:35:38 2014 +0200

    StringUuid: Use global namespace memcpy

diff --git a/Source/cmUuid.cxx b/Source/cmUuid.cxx
index a8149dd..e3d5393 100644
--- a/Source/cmUuid.cxx
+++ b/Source/cmUuid.cxx
@@ -12,7 +12,8 @@
 #include "cmUuid.h"
 
 #include <sstream>
-#include <cstring>
+
+#include <string.h>
 
 #include <cmsys/MD5.h>
 #include "cm_sha2.h"
@@ -71,7 +72,7 @@ void cmUuid::CreateHashInput(std::vector<unsigned char> const& uuidNamespace,
     {
     output.resize(output.size() + name.size());
 
-    std::memcpy(&output[0] + uuidNamespace.size(),
+    memcpy(&output[0] + uuidNamespace.size(),
       name.c_str(), name.size());
     }
 }
@@ -80,7 +81,7 @@ std::string cmUuid::FromDigest(
   const unsigned char* digest, int version) const
 {
   unsigned char uuid[16] = {0};
-  std::memcpy(uuid, digest, 16);
+  memcpy(uuid, digest, 16);
 
   uuid[6] &= 0xF;
   uuid[6] |= (version << 4);

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

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


hooks/post-receive
-- 
CMake