diff options
author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-03-10 20:03:09 (GMT) |
---|---|---|
committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-03-10 20:03:09 (GMT) |
commit | 862f5df25c509e2df59d00597b0c4b4d14cf5eaa (patch) | |
tree | 79e19e06c0961f43690788cac9c2f23b4931a2cf /Source/CTest/cmCTestHandlerCommand.cxx | |
parent | c0161e9e57321f283fc88812779d627fb722a40a (diff) | |
download | CMake-862f5df25c509e2df59d00597b0c4b4d14cf5eaa.zip CMake-862f5df25c509e2df59d00597b0c4b4d14cf5eaa.tar.gz CMake-862f5df25c509e2df59d00597b0c4b4d14cf5eaa.tar.bz2 |
STYLE: Fix some style issues
Diffstat (limited to 'Source/CTest/cmCTestHandlerCommand.cxx')
-rw-r--r-- | Source/CTest/cmCTestHandlerCommand.cxx | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx index e030a5f..91bcb6c 100644 --- a/Source/CTest/cmCTestHandlerCommand.cxx +++ b/Source/CTest/cmCTestHandlerCommand.cxx @@ -23,23 +23,23 @@ cmCTestHandlerCommand::cmCTestHandlerCommand() { const size_t INIT_SIZE = 100; size_t cc; - m_Arguments.reserve(INIT_SIZE); + this->Arguments.reserve(INIT_SIZE); for ( cc = 0; cc < INIT_SIZE; ++ cc ) { - m_Arguments.push_back(0); + this->Arguments.push_back(0); } - m_Arguments[ct_RETURN_VALUE] = "RETURN_VALUE"; - m_Arguments[ct_SOURCE] = "SOURCE"; - m_Arguments[ct_BUILD] = "BUILD"; - m_Arguments[ct_SUBMIT_INDEX] = "SUBMIT_INDEX"; - m_Last = ct_LAST; + this->Arguments[ct_RETURN_VALUE] = "RETURN_VALUE"; + this->Arguments[ct_SOURCE] = "SOURCE"; + this->Arguments[ct_BUILD] = "BUILD"; + this->Arguments[ct_SUBMIT_INDEX] = "SUBMIT_INDEX"; + this->Last = ct_LAST; } bool cmCTestHandlerCommand::InitialPass( std::vector<std::string> const& args) { - if ( !this->ProcessArguments(args, m_Last, &*m_Arguments.begin(), - m_Values) ) + if ( !this->ProcessArguments(args, this->Last, &*this->Arguments.begin(), + this->Values) ) { return false; } @@ -51,15 +51,16 @@ bool cmCTestHandlerCommand::InitialPass( return false; } - if ( m_Values[ct_BUILD] ) + if ( this->Values[ct_BUILD] ) { - m_CTest->SetCTestConfiguration("BuildDirectory", m_Values[ct_BUILD]); + this->CTest->SetCTestConfiguration("BuildDirectory", + this->Values[ct_BUILD]); } - if ( m_Values[ct_SUBMIT_INDEX] ) + if ( this->Values[ct_SUBMIT_INDEX] ) { - if ( m_CTest->GetDartVersion() <= 1 ) + if ( this->CTest->GetDartVersion() <= 1 ) { - cmCTestLog(m_CTest, ERROR_MESSAGE, + cmCTestLog(this->CTest, ERROR_MESSAGE, "Dart before version 2.0 does not support collecting submissions." << std::endl << "Please upgrade the server to Dart 2 or higher, or do not use " @@ -67,20 +68,21 @@ bool cmCTestHandlerCommand::InitialPass( } else { - handler->SetSubmitIndex(atoi(m_Values[ct_SUBMIT_INDEX])); + handler->SetSubmitIndex(atoi(this->Values[ct_SUBMIT_INDEX])); } } std::string current_dir = cmSystemTools::GetCurrentWorkingDirectory(); cmSystemTools::ChangeDirectory( - m_CTest->GetCTestConfiguration("BuildDirectory").c_str()); + this->CTest->GetCTestConfiguration("BuildDirectory").c_str()); int res = handler->ProcessHandler(); - if ( m_Values[ct_RETURN_VALUE] && *m_Values[ct_RETURN_VALUE]) + if ( this->Values[ct_RETURN_VALUE] && *this->Values[ct_RETURN_VALUE]) { cmOStringStream str; str << res; - m_Makefile->AddDefinition(m_Values[ct_RETURN_VALUE], str.str().c_str()); + m_Makefile->AddDefinition( + this->Values[ct_RETURN_VALUE], str.str().c_str()); } cmSystemTools::ChangeDirectory(current_dir.c_str()); return true; @@ -103,8 +105,7 @@ bool cmCTestHandlerCommand::ProcessArguments( if ( state > 0 && state < last ) { values[state] = args[i].c_str(); -#undef cerr - cmCTestLog(m_CTest, DEBUG, "Set " << strings[state] << " to " + cmCTestLog(this->CTest, DEBUG, "Set " << strings[state] << " to " << args[i].c_str() << std::endl); state = 0; } |