[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1228-g3587b97

[David Cole]

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  3587b972b651ecc4fc14a55b13b00e97997f2d33 (commit)
       via  12d87c04253bd203a9b8a510b1772291527d441c (commit)
      from  0816bb1b49993140a3ba22a34b8cf64f119a14f4 (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=3587b972b651ecc4fc14a55b13b00e97997f2d33
commit 3587b972b651ecc4fc14a55b13b00e97997f2d33
Merge: 0816bb1 12d87c0
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Dec 6 07:26:45 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 6 07:26:45 2012 -0500

    Merge topic 'add-timestamp-subcommands' into next
    
    12d87c0 CMake: Fix dashboard build errors and warnings


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12d87c04253bd203a9b8a510b1772291527d441c
commit 12d87c04253bd203a9b8a510b1772291527d441c
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Dec 6 07:20:12 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Dec 6 07:20:12 2012 -0500

    CMake: Fix dashboard build errors and warnings
    
    memset is not in std:: for VS6, and though quite silly, 0 is not a char

diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index 22bb4b7..ac26503 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -34,7 +34,7 @@ std::string cmTimestamp::FileModificationTime(const char* path,
   const std::string& formatString, bool utcFlag)
 {
   struct stat info;
-  std::memset(&info, 0, sizeof(info));
+  memset(&info, 0, sizeof(info));
 
   if(stat(path, &info) != 0)
     {
@@ -58,7 +58,7 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT,
     }
 
   struct tm timeStruct;
-  std::memset(&timeStruct, 0, sizeof(timeStruct));
+  memset(&timeStruct, 0, sizeof(timeStruct));
 
   struct tm* ptr = (struct tm*) 0;
   if(utcFlag)
@@ -82,7 +82,7 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT,
     {
     char c1 = formatString[i];
     char c2 = (i+1 < formatString.size()) ?
-      formatString[i+1] : 0;
+      formatString[i+1] : static_cast<char>(0);
 
     if(c1 == '%' && c2 != 0)
       {

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

Summary of changes:
 Source/cmTimestamp.cxx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake