From 12d87c04253bd203a9b8a510b1772291527d441c Mon Sep 17 00:00:00 2001 From: David Cole Date: Thu, 6 Dec 2012 07:20:12 -0500 Subject: CMake: Fix dashboard build errors and warnings memset is not in std:: for VS6, and though quite silly, 0 is not a char --- Source/cmTimestamp.cxx | 6 +++--- 1 file 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(0); if(c1 == '%' && c2 != 0) { -- cgit v0.12