COMP: fix some compiler warnings/errors
This commit is contained in:
parent
6fd51bc29d
commit
bf3d774645
@ -22,7 +22,7 @@ bool cmCTestRunScriptCommand::InitialPass(std::vector<std::string> const& args)
|
|||||||
{
|
{
|
||||||
if(args.size() < 1 )
|
if(args.size() < 1 )
|
||||||
{
|
{
|
||||||
m_CTestScriptHandler->RunCurrentScript(m_CTest);
|
m_CTestScriptHandler->RunCurrentScript();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -365,12 +365,12 @@ int cmCTestScriptHandler::RunConfigurationScript(cmCTest* ctest,
|
|||||||
}
|
}
|
||||||
if (!m_ScriptHasRun)
|
if (!m_ScriptHasRun)
|
||||||
{
|
{
|
||||||
return this->RunCurrentScript(ctest);
|
return this->RunCurrentScript();
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
int cmCTestScriptHandler::RunCurrentScript(cmCTest* ctest)
|
int cmCTestScriptHandler::RunCurrentScript()
|
||||||
{
|
{
|
||||||
int result;
|
int result;
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ public:
|
|||||||
* Run a script
|
* Run a script
|
||||||
*/
|
*/
|
||||||
static bool RunScript(cmCTest* ctest, const char *script);
|
static bool RunScript(cmCTest* ctest, const char *script);
|
||||||
int RunCurrentScript(cmCTest* ctest);
|
int RunCurrentScript();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Empty Binary Directory
|
* Empty Binary Directory
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
#include "cmCTestSleepCommand.h"
|
#include "cmCTestSleepCommand.h"
|
||||||
|
|
||||||
#include "cmCTestScriptHandler.h"
|
#include "cmCTestScriptHandler.h"
|
||||||
|
#include <stdlib.h> // required for atoi
|
||||||
|
|
||||||
bool cmCTestSleepCommand::InitialPass(
|
bool cmCTestSleepCommand::InitialPass(
|
||||||
std::vector<std::string> const& args)
|
std::vector<std::string> const& args)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user