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 4b2710c1aeffcdfe18e3afc01c8e4f7ce2ed02c8 (commit) via 7f25f559edddb9bb59ae84c889cbb34da259a8f6 (commit) from 7fbbd9218d02c7c9aac1cae564319dceb19cc9bb (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=4b2710c1aeffcdfe18e3afc01c8e4f7ce2ed02c8 commit 4b2710c1aeffcdfe18e3afc01c8e4f7ce2ed02c8 Merge: 7fbbd92 7f25f55 Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon Sep 3 10:57:03 2012 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Sep 3 10:57:03 2012 -0400 Merge topic 'ctest-svn-update' into next 7f25f55 cmCTestSVN: Rename 'SVNInfo' members to 'SVNRepo' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f25f559edddb9bb59ae84c889cbb34da259a8f6 commit 7f25f559edddb9bb59ae84c889cbb34da259a8f6 Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon Sep 3 10:54:59 2012 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Mon Sep 3 10:54:59 2012 -0400 cmCTestSVN: Rename 'SVNInfo' members to 'SVNRepo' Without this some compilers complain with errors such as: Source/CTest/cmCTestSVN.cxx:60: error: declaration of 'cmCTestSVN::SVNInfo& cmCTestSVN::InfoParser::SVNInfo' Source/CTest/cmCTestSVN.h:37: error: changes meaning of 'SVNInfo' from 'struct cmCTestSVN::SVNInfo' because the member 'SVNInfo' of the nested InfoParser and LogParser structs hides the cmCTestSVN::SVNInfo type name. diff --git a/Source/CTest/cmCTestSVN.cxx b/Source/CTest/cmCTestSVN.cxx index c439281..2fd4440 100644 --- a/Source/CTest/cmCTestSVN.cxx +++ b/Source/CTest/cmCTestSVN.cxx @@ -48,7 +48,7 @@ public: const char* prefix, std::string& rev, SVNInfo& svninfo): - Rev(rev), SVNInfo(svninfo) + Rev(rev), SVNRepo(svninfo) { this->SetLog(&svn->Log, prefix); this->RegexRev.compile("^Revision: ([0-9]+)"); @@ -57,7 +57,7 @@ public: } private: std::string& Rev; - cmCTestSVN::SVNInfo& SVNInfo; + cmCTestSVN::SVNInfo& SVNRepo; cmsys::RegularExpression RegexRev; cmsys::RegularExpression RegexURL; cmsys::RegularExpression RegexRoot; @@ -69,11 +69,11 @@ private: } else if(this->RegexURL.find(this->Line)) { - this->SVNInfo.URL = this->RegexURL.match(1); + this->SVNRepo.URL = this->RegexURL.match(1); } else if(this->RegexRoot.find(this->Line)) { - this->SVNInfo.Root = this->RegexRoot.match(1); + this->SVNRepo.Root = this->RegexRoot.match(1); } return true; } @@ -301,12 +301,12 @@ class cmCTestSVN::LogParser: public cmCTestVC::OutputLogger, { public: LogParser(cmCTestSVN* svn, const char* prefix, SVNInfo& svninfo): - OutputLogger(svn->Log, prefix), SVN(svn), SVNInfo(svninfo) + OutputLogger(svn->Log, prefix), SVN(svn), SVNRepo(svninfo) { this->InitializeParser(); } ~LogParser() { this->CleanupParser(); } private: cmCTestSVN* SVN; - cmCTestSVN::SVNInfo& SVNInfo; + cmCTestSVN::SVNInfo& SVNRepo; typedef cmCTestSVN::Revision Revision; typedef cmCTestSVN::Change Change; @@ -328,7 +328,7 @@ private: if(strcmp(name, "logentry") == 0) { this->Rev = Revision(); - this->Rev.SVNInfo = &SVNInfo; + this->Rev.SVNInfo = &SVNRepo; if(const char* rev = this->FindAttribute(atts, "revision")) { this->Rev.Rev = rev; @@ -359,7 +359,7 @@ private: else if(strcmp(name, "path") == 0 && !this->CData.empty()) { std::string orig_path(&this->CData[0], this->CData.size()); - std::string new_path = SVNInfo.BuildLocalPath( orig_path ); + std::string new_path = SVNRepo.BuildLocalPath( orig_path ); this->CurChange.Path.assign(new_path); this->Changes.push_back(this->CurChange); } ----------------------------------------------------------------------- Summary of changes: Source/CTest/cmCTestSVN.cxx | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits