summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2005-01-27 16:01:56 (GMT)
committerKen Martin <ken.martin@kitware.com>2005-01-27 16:01:56 (GMT)
commitbf3d7746458af539536a1438c88608897be71ce2 (patch)
tree98365ed8a4439ff8443c200d6674ff75947847e1 /Source
parent6fd51bc29d6d59fe1923e2dd8695ef3717bbe7a8 (diff)
downloadCMake-bf3d7746458af539536a1438c88608897be71ce2.zip
CMake-bf3d7746458af539536a1438c88608897be71ce2.tar.gz
CMake-bf3d7746458af539536a1438c88608897be71ce2.tar.bz2
COMP: fix some compiler warnings/errors
Diffstat (limited to 'Source')
-rw-r--r--Source/CTest/cmCTestRunScriptCommand.cxx2
-rw-r--r--Source/CTest/cmCTestScriptHandler.cxx4
-rw-r--r--Source/CTest/cmCTestScriptHandler.h2
-rw-r--r--Source/CTest/cmCTestSleepCommand.cxx1
4 files changed, 5 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestRunScriptCommand.cxx b/Source/CTest/cmCTestRunScriptCommand.cxx
index 53ce3d4..274778a 100644
--- a/Source/CTest/cmCTestRunScriptCommand.cxx
+++ b/Source/CTest/cmCTestRunScriptCommand.cxx
@@ -22,7 +22,7 @@ bool cmCTestRunScriptCommand::InitialPass(std::vector<std::string> const& args)
{
if(args.size() < 1 )
{
- m_CTestScriptHandler->RunCurrentScript(m_CTest);
+ m_CTestScriptHandler->RunCurrentScript();
return true;
}
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index f34b45b..410d11d 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -365,12 +365,12 @@ int cmCTestScriptHandler::RunConfigurationScript(cmCTest* ctest,
}
if (!m_ScriptHasRun)
{
- return this->RunCurrentScript(ctest);
+ return this->RunCurrentScript();
}
return result;
}
-int cmCTestScriptHandler::RunCurrentScript(cmCTest* ctest)
+int cmCTestScriptHandler::RunCurrentScript()
{
int result;
diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h
index 7b96350..4c2eb83 100644
--- a/Source/CTest/cmCTestScriptHandler.h
+++ b/Source/CTest/cmCTestScriptHandler.h
@@ -86,7 +86,7 @@ public:
* Run a script
*/
static bool RunScript(cmCTest* ctest, const char *script);
- int RunCurrentScript(cmCTest* ctest);
+ int RunCurrentScript();
/*
* Empty Binary Directory
diff --git a/Source/CTest/cmCTestSleepCommand.cxx b/Source/CTest/cmCTestSleepCommand.cxx
index ec585f1..d3f0c6f 100644
--- a/Source/CTest/cmCTestSleepCommand.cxx
+++ b/Source/CTest/cmCTestSleepCommand.cxx
@@ -17,6 +17,7 @@
#include "cmCTestSleepCommand.h"
#include "cmCTestScriptHandler.h"
+#include <stdlib.h> // required for atoi
bool cmCTestSleepCommand::InitialPass(
std::vector<std::string> const& args)