diff options
Diffstat (limited to 'Source/kwsys/SystemTools.cxx')
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 4c9bbb4b51..d16d4d3c1b 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -237,10 +237,10 @@ SystemTools::GetTime(void) struct timeval t; #ifdef GETTIMEOFDAY_NO_TZ if (gettimeofday(&t) == 0) - return (double)t.tv_sec + t.tv_usec*0.000001; + return static_cast<double>(t.tv_sec) + t.tv_usec*0.000001; #else /* !GETTIMEOFDAY_NO_TZ */ - if (gettimeofday(&t, (struct timezone *)NULL) == 0) - return (double)t.tv_sec + t.tv_usec*0.000001; + if (gettimeofday(&t, static_cast<struct timezone *>(NULL)) == 0) + return static_cast<double>(t.tv_sec) + t.tv_usec*0.000001; #endif /* !GETTIMEOFDAY_NO_TZ */ } #endif /* !HAVE_GETTIMEOFDAY */ @@ -248,11 +248,12 @@ SystemTools::GetTime(void) #if defined(HAVE_FTIME) struct TIMEB t; ::FTIME(&t); - return (double)t.time + (double)t.millitm * (double)0.001; + return static_cast<double>(t.time) + + static_cast<double>(t.millitm) * static_cast<double>(0.001); #else /* !HAVE_FTIME */ time_t secs; time(&secs); - return (double)secs; + return static_cast<double>(secs); #endif /* !HAVE_FTIME */ } } @@ -1246,7 +1247,7 @@ int SystemTools::EstimateFormatLength(const char *format, va_list ap) } } - return (int)length; + return static_cast<int>(length); } kwsys_stl::string SystemTools::EscapeChars( @@ -1506,7 +1507,8 @@ bool SystemTools::FilesDiffer(const char* source, } // If this block differs the file differs. - if(memcmp((const void*)source_buf, (const void*)dest_buf, nnext) != 0) + if(memcmp(static_cast<const void*>(source_buf), + static_cast<const void*>(dest_buf), nnext) != 0) { return true; } @@ -1736,7 +1738,7 @@ long int SystemTools::ModifiedTime(const char* filename) } else { - return (long int)fs.st_mtime; + return static_cast<long int>(fs.st_mtime); } } @@ -1750,7 +1752,7 @@ long int SystemTools::CreationTime(const char* filename) } else { - return fs.st_ctime >= 0 ? (long int)fs.st_ctime : 0; + return fs.st_ctime >= 0 ? static_cast<long int>(fs.st_ctime) : 0; } } @@ -2237,7 +2239,7 @@ bool SystemTools::FileIsDirectory(const char* name) struct stat fs; if(stat(name, &fs) == 0) { -#if _WIN32 +#if defined( _WIN32 ) return ((fs.st_mode & _S_IFDIR) != 0); #else return S_ISDIR(fs.st_mode); @@ -2251,7 +2253,7 @@ bool SystemTools::FileIsDirectory(const char* name) bool SystemTools::FileIsSymlink(const char* name) { -#if _WIN32 +#if defined( _WIN32 ) (void)name; return false; #else @@ -3076,7 +3078,8 @@ SystemTools::DetectFileType(const char *filename, delete [] buffer; double current_percent_bin = - ((double)(read_length - text_count) / (double)read_length); + (static_cast<double>(read_length - text_count) / + static_cast<double>(read_length)); if (current_percent_bin >= percent_bin) { @@ -3106,14 +3109,14 @@ bool SystemTools::LocateFileInDir(const char *filename, kwsys_stl::string real_dir; if (!SystemTools::FileIsDirectory(dir)) { -#if _WIN32 +#if defined( _WIN32 ) size_t dir_len = strlen(dir); if (dir_len < 2 || dir[dir_len - 1] != ':') { #endif real_dir = SystemTools::GetFilenamePath(dir); dir = real_dir.c_str(); -#if _WIN32 +#if defined( _WIN32 ) } #endif } @@ -3154,7 +3157,7 @@ bool SystemTools::LocateFileInDir(const char *filename, { filename_dir = SystemTools::GetFilenamePath(filename_dir); filename_dir_base = SystemTools::GetFilenameName(filename_dir); -#if _WIN32 +#if defined( _WIN32 ) if (!filename_dir_base.size() || filename_dir_base[filename_dir_base.size() - 1] == ':') #else @@ -3416,7 +3419,7 @@ int SystemTools::GetTerminalWidth() t = strtol(columns, &endptr, 0); if(endptr && !*endptr && (t>0) && (t<1000)) { - width = (int)t; + width = static_cast<int>(t); } } if ( width < 9 ) |