[Cmake-commits] CMake branch, next, updated. v3.0.0-3920-g848ad34

[Brad King]

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  848ad3410af396124bea05776d0fa5ceae7f3248 (commit)
       via  3c5eac1fbb43e08f105f611d3e89e5181c3ab0e8 (commit)
      from  a3b8c82b11144c4b512ef1e27f93dc2b83f3d4fa (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=848ad3410af396124bea05776d0fa5ceae7f3248
commit 848ad3410af396124bea05776d0fa5ceae7f3248
Merge: a3b8c82 3c5eac1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 25 10:51:13 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 25 10:51:13 2014 -0400

    Merge topic 'style-fix' into next
    
    3c5eac1f cmCTestMemCheckHandler: Fix coding style in this class


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c5eac1fbb43e08f105f611d3e89e5181c3ab0e8
commit 3c5eac1fbb43e08f105f611d3e89e5181c3ab0e8
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Jun 24 13:49:05 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 25 10:51:45 2014 -0400

    cmCTestMemCheckHandler: Fix coding style in this class
    
    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:


hooks/post-receive
-- 
CMake