This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 46c5c81d73cf288c85b0027422c89b840bcdb54d (commit)
via 5dbda727329b1e96bd7d3b730480265d1ee2407c (commit)
from 8b3016971d4f574fb8a0a09bfcc288fa0a9b3c60 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46c5c81d73cf288c85b0027422c89b840bcdb54d
commit 46c5c81d73cf288c85b0027422c89b840bcdb54d
Merge: 8b30169 5dbda72
Author: Bill Hoffman <bill.hoff...@kitware.com>
AuthorDate: Tue Jun 24 13:50:37 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jun 24 13:50:37 2014 -0400
Merge topic 'style-fix' into next
5dbda727 Fix bad style in this class. Wrong case and no this pointer.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5dbda727329b1e96bd7d3b730480265d1ee2407c
commit 5dbda727329b1e96bd7d3b730480265d1ee2407c
Author: Bill Hoffman <bill.hoff...@kitware.com>
AuthorDate: Tue Jun 24 13:49:05 2014 -0400
Commit: Bill Hoffman <bill.hoff...@kitware.com>
CommitDate: Tue Jun 24 13:49:05 2014 -0400
Fix bad style in this class. Wrong case and no this pointer.
This class had a method that started with lower case, and also
was called without this->.
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx
b/Source/CTest/cmCTestMemCheckHandler.cxx
index 09d0ad8..7b50174 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -918,7 +918,7 @@
cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult& res,
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"PostProcessBoundsCheckerTest for : "
<< res.Name << std::endl);
- std::string ofile = testOutputFileName(test);
+ std::string ofile = this->TestOutputFileName(test);
if ( ofile.empty() )
{
return;
@@ -957,7 +957,7 @@
cmCTestMemCheckHandler::PostProcessPurifyTest(cmCTestTestResult& res,
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"PostProcessPurifyTest for : "
<< res.Name << std::endl);
- appendMemTesterOutput(res, test);
+ this->AppendMemTesterOutput(res, test);
}
void
@@ -967,14 +967,14 @@
cmCTestMemCheckHandler::PostProcessValgrindTest(cmCTestTestResult& res,
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"PostProcessValgrindTest for : "
<< res.Name << std::endl);
- appendMemTesterOutput(res, test);
+ this->AppendMemTesterOutput(res, test);
}
void
-cmCTestMemCheckHandler::appendMemTesterOutput(cmCTestTestResult& res,
+cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult& res,
int test)
{
- std::string ofile = testOutputFileName(test);
+ std::string ofile = this->TestOutputFileName(test);
if ( ofile.empty() )
{
@@ -996,7 +996,7 @@
cmCTestMemCheckHandler::appendMemTesterOutput(cmCTestTestResult& res,
}
std::string
-cmCTestMemCheckHandler::testOutputFileName(int test)
+cmCTestMemCheckHandler::TestOutputFileName(int test)
{
std::string index;
cmOStringStream stream;
diff --git a/Source/CTest/cmCTestMemCheckHandler.h
b/Source/CTest/cmCTestMemCheckHandler.h
index 0521a48..20a38bb 100644
--- a/Source/CTest/cmCTestMemCheckHandler.h
+++ b/Source/CTest/cmCTestMemCheckHandler.h
@@ -123,11 +123,11 @@ private:
void PostProcessValgrindTest(cmCTestTestResult& res, int test);
///! append MemoryTesterOutputFile to the test log
- void appendMemTesterOutput(cmCTestTestHandler::cmCTestTestResult& res,
+ void AppendMemTesterOutput(cmCTestTestHandler::cmCTestTestResult& res,
int test);
///! generate the output filename for the given test index
- std::string testOutputFileName(int test);
+ std::string TestOutputFileName(int test);
};
#endif
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestMemCheckHandler.cxx | 12 ++++++------
Source/CTest/cmCTestMemCheckHandler.h | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
