diff options
author | David Cole <david.cole@kitware.com> | 2012-12-06 12:20:12 (GMT) |
---|---|---|
committer | David Cole <david.cole@kitware.com> | 2012-12-06 12:20:12 (GMT) |
commit | 12d87c04253bd203a9b8a510b1772291527d441c (patch) | |
tree | 4345a367248bdfb1846b2f77ea7660a4e057bedc /Source | |
parent | e28ce2483dbdc620aa92e2ba0d86e8923dcdb296 (diff) | |
download | CMake-12d87c04253bd203a9b8a510b1772291527d441c.zip CMake-12d87c04253bd203a9b8a510b1772291527d441c.tar.gz CMake-12d87c04253bd203a9b8a510b1772291527d441c.tar.bz2 |
CMake: Fix dashboard build errors and warnings
memset is not in std:: for VS6, and though quite silly, 0 is not a char
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmTimestamp.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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) { |