diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/CTest/cmCTestMultiProcessHandler.h | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Source/CTest/cmCTestMultiProcessHandler.h')
-rw-r--r-- | Source/CTest/cmCTestMultiProcessHandler.h | 52 |
1 files changed, 32 insertions, 20 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h index 64e56e6..cb709cc 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.h +++ b/Source/CTest/cmCTestMultiProcessHandler.h @@ -24,12 +24,21 @@ class cmCTestMultiProcessHandler { friend class TestComparator; + public: - struct TestSet : public std::set<int> {}; - struct TestMap : public std::map<int, TestSet> {}; - struct TestList : public std::vector<int> {}; - struct PropertiesMap : public - std::map<int, cmCTestTestHandler::cmCTestTestProperties*> {}; + struct TestSet : public std::set<int> + { + }; + struct TestMap : public std::map<int, TestSet> + { + }; + struct TestList : public std::vector<int> + { + }; + struct PropertiesMap + : public std::map<int, cmCTestTestHandler::cmCTestTestProperties*> + { + }; cmCTestMultiProcessHandler(); virtual ~cmCTestMultiProcessHandler(); @@ -44,20 +53,23 @@ public: void SetPassFailVectors(std::vector<std::string>* passed, std::vector<std::string>* failed) - { + { this->Passed = passed; this->Failed = failed; - } + } void SetTestResults(std::vector<cmCTestTestHandler::cmCTestTestResult>* r) - { this->TestResults = r; } + { + this->TestResults = r; + } - void SetCTest(cmCTest* ctest) { this->CTest = ctest;} + void SetCTest(cmCTest* ctest) { this->CTest = ctest; } - void SetTestHandler(cmCTestTestHandler * handler) - { this->TestHandler = handler; } + void SetTestHandler(cmCTestTestHandler* handler) + { + this->TestHandler = handler; + } - cmCTestTestHandler * GetTestHandler() - { return this->TestHandler; } + cmCTestTestHandler* GetTestHandler() { return this->TestHandler; } void SetQuiet(bool b) { this->Quiet = b; } protected: @@ -88,9 +100,9 @@ protected: // check all running processes for output and exit case bool CheckOutput(); void RemoveTest(int index); - //Check if we need to resume an interrupted test set + // Check if we need to resume an interrupted test set void CheckResume(); - //Check if there are any circular dependencies + // Check if there are any circular dependencies bool CheckCycles(); int FindMaxIndex(); inline size_t GetProcessorsUsed(int index); @@ -101,13 +113,13 @@ protected: // map from test number to set of depend tests TestMap Tests; TestList SortedTests; - //Total number of tests we'll be running + // Total number of tests we'll be running size_t Total; - //Number of tests that are complete + // Number of tests that are complete size_t Completed; size_t RunningCount; bool StopTimePassed; - //list of test properties (indices concurrent to the test map) + // list of test properties (indices concurrent to the test map) PropertiesMap Properties; std::map<int, bool> TestRunningMap; std::map<int, bool> TestFinishMap; @@ -119,8 +131,8 @@ protected: std::vector<cmCTestTestHandler::cmCTestTestResult>* TestResults; size_t ParallelLevel; // max number of process that can be run at once unsigned long TestLoad; - std::set<cmCTestRunTest*> RunningTests; // current running tests - cmCTestTestHandler * TestHandler; + std::set<cmCTestRunTest*> RunningTests; // current running tests + cmCTestTestHandler* TestHandler; cmCTest* CTest; bool HasCycles; bool Quiet; |