[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1226-g0816bb1

[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  0816bb1b49993140a3ba22a34b8cf64f119a14f4 (commit)
       via  e28ce2483dbdc620aa92e2ba0d86e8923dcdb296 (commit)
      from  ade68f4d99eea77080106c1aa472e3ded12039dd (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=0816bb1b49993140a3ba22a34b8cf64f119a14f4
commit 0816bb1b49993140a3ba22a34b8cf64f119a14f4
Merge: ade68f4 e28ce24
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Dec 5 15:23:42 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 5 15:23:42 2012 -0500

    Merge topic 'add-timestamp-subcommands' into next
    
    e28ce24 CMake: Fix dashboard test failure


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e28ce2483dbdc620aa92e2ba0d86e8923dcdb296
commit e28ce2483dbdc620aa92e2ba0d86e8923dcdb296
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Dec 5 15:16:22 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Dec 5 15:16:22 2012 -0500

    CMake: Fix dashboard test failure
    
    Eliminate the platform difference in calling stat. We call stat normally
    in other places in the CMake code base just fine. Works everywhere we
    work. Will hopefully also fix the Borland Continuous dashboard failure
    that is occurring with respect to correctly measuring the modification
    time of a freshly generated file.

diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index c3df495..22bb4b7 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -33,16 +33,10 @@ std::string cmTimestamp::CurrentTime(
 std::string cmTimestamp::FileModificationTime(const char* path,
   const std::string& formatString, bool utcFlag)
 {
-#ifdef _WIN32
-  #define STAT _stat
-#else
-  #define STAT stat
-#endif
-
-  struct STAT info;
+  struct stat info;
   std::memset(&info, 0, sizeof(info));
 
-  if(STAT(path, &info) != 0)
+  if(stat(path, &info) != 0)
     {
     return std::string();
     }

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

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


hooks/post-receive
-- 
CMake