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/cmCTestMemCheckHandler.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/cmCTestMemCheckHandler.h')
-rw-r--r-- | Source/CTest/cmCTestMemCheckHandler.h | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h index 6232924..8f0cc47 100644 --- a/Source/CTest/cmCTestMemCheckHandler.h +++ b/Source/CTest/cmCTestMemCheckHandler.h @@ -29,22 +29,24 @@ class cmXMLWriter; class cmCTestMemCheckHandler : public cmCTestTestHandler { friend class cmCTestRunTest; + public: cmTypeMacro(cmCTestMemCheckHandler, cmCTestTestHandler); - void PopulateCustomVectors(cmMakefile *mf); + void PopulateCustomVectors(cmMakefile* mf); cmCTestMemCheckHandler(); void Initialize(); + protected: virtual int PreProcessHandler(); virtual int PostProcessHandler(); virtual void GenerateTestCommand(std::vector<std::string>& args, int test); private: - - enum { // Memory checkers + enum + { // Memory checkers UNKNOWN = 0, VALGRIND, PURIFY, @@ -55,8 +57,10 @@ private: MEMORY_SANITIZER, UB_SANITIZER }; + public: - enum { // Memory faults + enum + { // Memory faults ABR = 0, ABW, ABWL, @@ -81,8 +85,10 @@ public: UMR, NO_MEMORY_FAULT }; + private: - enum { // Program statuses + enum + { // Program statuses NOT_RUN = 0, TIMEOUT, SEGFAULT, @@ -94,19 +100,19 @@ private: BAD_COMMAND, COMPLETED }; - std::string BoundsCheckerDPBDFile; - std::string BoundsCheckerXMLFile; - std::string MemoryTester; + std::string BoundsCheckerDPBDFile; + std::string BoundsCheckerXMLFile; + std::string MemoryTester; std::vector<std::string> MemoryTesterDynamicOptions; std::vector<std::string> MemoryTesterOptions; - int MemoryTesterStyle; - std::string MemoryTesterOutputFile; - std::string MemoryTesterEnvironmentVariable; + int MemoryTesterStyle; + std::string MemoryTesterOutputFile; + std::string MemoryTesterEnvironmentVariable; // these are used to store the types of errors that can show up std::vector<std::string> ResultStrings; std::vector<std::string> ResultStringsLong; - std::vector<int> GlobalResults; - bool LogWithPID; // does log file add pid + std::vector<int> GlobalResults; + bool LogWithPID; // does log file add pid std::vector<int>::size_type FindOrAddWarning(const std::string& warning); // initialize the ResultStrings and ResultStringsLong for @@ -125,18 +131,15 @@ private: std::vector<std::string> CustomPostMemCheck; //! Parse Valgrind/Purify/Bounds Checker result out of the output - //string. After running, log holds the output and results hold the - //different memmory errors. - bool ProcessMemCheckOutput(const std::string& str, - std::string& log, std::vector<int>& results); - bool ProcessMemCheckValgrindOutput(const std::string& str, - std::string& log, + // string. After running, log holds the output and results hold the + // different memmory errors. + bool ProcessMemCheckOutput(const std::string& str, std::string& log, + std::vector<int>& results); + bool ProcessMemCheckValgrindOutput(const std::string& str, std::string& log, std::vector<int>& results); - bool ProcessMemCheckPurifyOutput(const std::string& str, - std::string& log, + bool ProcessMemCheckPurifyOutput(const std::string& str, std::string& log, std::vector<int>& results); - bool ProcessMemCheckSanitizerOutput(const std::string& str, - std::string& log, + bool ProcessMemCheckSanitizerOutput(const std::string& str, std::string& log, std::vector<int>& results); bool ProcessMemCheckBoundsCheckerOutput(const std::string& str, std::string& log, @@ -154,4 +157,3 @@ private: }; #endif - |