[Cmake-commits] CMake branch, master, updated. v2.8.5-139-g5f0eba4

KWSys Robot kwrobot at kitware.com
Thu Aug 4 08:30:13 EDT 2011


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, master has been updated
       via  5f0eba49f2978b65b39b0c2bb9079be53c5c7d47 (commit)
      from  f31def8c6225bc1cbb716c1d3e0fdc6b71afa55c (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=5f0eba49f2978b65b39b0c2bb9079be53c5c7d47
commit 5f0eba49f2978b65b39b0c2bb9079be53c5c7d47
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 4 08:29:30 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 4 08:30:05 2011 -0400

    KWSys: Avoid conversion warning in SystemTools::GetTime
    
    Convert struct timeval members to double explicitly to avoid a GCC
    warning with -Wconversion.

diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx
index d1f1591..c4aff4a 100644
--- a/Source/kwsys/SystemTools.cxx
+++ b/Source/kwsys/SystemTools.cxx
@@ -296,7 +296,7 @@ double SystemTools::GetTime(void)
 #else
   struct timeval t;
   gettimeofday(&t, 0);
-  return 1.0*t.tv_sec + 0.000001*t.tv_usec;
+  return 1.0*double(t.tv_sec) + 0.000001*double(t.tv_usec);
 #endif
 }
 

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list