diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-03-30 18:49:56 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-03-30 18:49:56 (GMT) |
commit | 5a2668b326471874ca69357af831cdcf1575c621 (patch) | |
tree | 92f40c9de267766f0533df44212ec2df6415aa47 /Source/CTest | |
parent | 08b14163ee2cc9cced08d80b2c81b29c83072229 (diff) | |
download | CMake-5a2668b326471874ca69357af831cdcf1575c621.zip CMake-5a2668b326471874ca69357af831cdcf1575c621.tar.gz CMake-5a2668b326471874ca69357af831cdcf1575c621.tar.bz2 |
ENH: add support for win64 for visual studio 2005 ide and nmake, also fix warnings produced by building for win64
Diffstat (limited to 'Source/CTest')
-rw-r--r-- | Source/CTest/cmCTestHandlerCommand.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestMemCheckHandler.cxx | 6 | ||||
-rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx index 25662cb..89420bf 100644 --- a/Source/CTest/cmCTestHandlerCommand.cxx +++ b/Source/CTest/cmCTestHandlerCommand.cxx @@ -38,7 +38,7 @@ cmCTestHandlerCommand::cmCTestHandlerCommand() bool cmCTestHandlerCommand::InitialPass( std::vector<std::string> const& args) { - if ( !this->ProcessArguments(args, this->Last, &*this->Arguments.begin(), + if ( !this->ProcessArguments(args, (unsigned int)this->Last, &*this->Arguments.begin(), this->Values) ) { return false; diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index 51954ba..e9b6c09 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -211,9 +211,9 @@ void cmCTestMemCheckHandler::GenerateDartOutput(std::ostream& os) os << "\t</TestList>\n"; cmCTestLog(this->CTest, HANDLER_OUTPUT, "-- Processing memory checking output: "); - unsigned int total = this->TestResults.size(); - unsigned int step = total / 10; - unsigned int current = 0; + size_t total = this->TestResults.size(); + size_t step = total / 10; + size_t current = 0; for ( cc = 0; cc < this->TestResults.size(); cc ++ ) { cmCTestTestResult *result = &this->TestResults[cc]; diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 2524f16..8d5effa 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -39,7 +39,7 @@ static size_t cmCTestSubmitHandlerWriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data) { - register int realsize = size * nmemb; + register int realsize = (int)(size * nmemb); cmCTestSubmitHandlerVectorOfChar *vec = static_cast<cmCTestSubmitHandlerVectorOfChar*>(data); |