[Cmake-commits] CMake branch, next, updated. v3.0.1-5048-gcd0500a

[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  cd0500a9b401ce035f8f711f0bdef54de3d9ca06 (commit)
       via  c158564fee9b65b35d8943a0e83fc092faaa885f (commit)
      from  f35fb48df07d557ffe883962cf8c56458e583d96 (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=cd0500a9b401ce035f8f711f0bdef54de3d9ca06
commit cd0500a9b401ce035f8f711f0bdef54de3d9ca06
Merge: f35fb48 c158564
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Aug 27 09:07:51 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 27 09:07:51 2014 -0400

    Merge topic 'string-uuid' into next
    
    c158564f StringUuid: Try to work around mangling issues


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c158564fee9b65b35d8943a0e83fc092faaa885f
commit c158564fee9b65b35d8943a0e83fc092faaa885f
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Aug 27 15:07:29 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Wed Aug 27 15:07:29 2014 +0200

    StringUuid: Try to work around mangling issues

diff --git a/Source/cmUuid.cxx b/Source/cmUuid.cxx
index 8f208e4..8728020 100644
--- a/Source/cmUuid.cxx
+++ b/Source/cmUuid.cxx
@@ -11,8 +11,6 @@
 ============================================================================*/
 #include "cmUuid.h"
 
-#include <sstream>
-
 #include <string.h>
 
 #include <cmsys/MD5.h>
diff --git a/Source/cmUuid.h b/Source/cmUuid.h
index 10b5c96..678d652 100644
--- a/Source/cmUuid.h
+++ b/Source/cmUuid.h
@@ -12,8 +12,7 @@
 #ifndef cmUuid_h
 #define cmUuid_h
 
-#include <string>
-#include <vector>
+#include "cmStandardIncludes.h"
 
 /** \class cmUuid
  * \brief Utility class to generate UUIDs as defined by RFC4122

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

Summary of changes:
 Source/cmUuid.cxx |    2 --
 Source/cmUuid.h   |    3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)


hooks/post-receive
-- 
CMake