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 3642bb085688f8b4c16f6d9855fe5fd840e13a31 (commit)
via 5660f669879476134797f764b1942e80b3f66830 (commit)
from 14c6c727e05ab306b4268126ec942c8fa19a1bff (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=3642bb085688f8b4c16f6d9855fe5fd840e13a31
commit 3642bb085688f8b4c16f6d9855fe5fd840e13a31
Merge: 14c6c72 5660f66
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Sep 4 08:35:09 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 4 08:35:09 2012 -0400
Merge topic 'ctest-svn-update' into next
5660f66 cmCTestSVN: Define nested struct Revision outside class
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5660f669879476134797f764b1942e80b3f66830
commit 5660f669879476134797f764b1942e80b3f66830
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Sep 4 08:31:23 2012 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Sep 4 08:31:23 2012 -0400
cmCTestSVN: Define nested struct Revision outside class
Visual Studio 6 does not compile the nested cmCTestSVN::Revision struct
correctly unless it is defined after cmCTestSVN is completely defined.
diff --git a/Source/CTest/cmCTestSVN.cxx b/Source/CTest/cmCTestSVN.cxx
index 9628ee9..49cea2e 100644
--- a/Source/CTest/cmCTestSVN.cxx
+++ b/Source/CTest/cmCTestSVN.cxx
@@ -18,6 +18,11 @@
#include <cmsys/RegularExpression.hxx>
+struct cmCTestSVN::Revision: public cmCTestVC::Revision
+{
+ cmCTestSVN::SVNInfo* SVNInfo;
+};
+
//----------------------------------------------------------------------------
cmCTestSVN::cmCTestSVN(cmCTest* ct, std::ostream& log):
cmCTestGlobalVC(ct, log)
diff --git a/Source/CTest/cmCTestSVN.h b/Source/CTest/cmCTestSVN.h
index 9fc2008..56265d0 100644
--- a/Source/CTest/cmCTestSVN.h
+++ b/Source/CTest/cmCTestSVN.h
@@ -59,10 +59,7 @@ private:
};
// Extended revision structure to include info about external it refers to.
- struct Revision : public cmCTestVC::Revision
- {
- cmCTestSVN::SVNInfo* SVNInfo;
- };
+ struct Revision;
// Info of all the repositories (root, externals and nested ones).
std::list<SVNInfo> Repositories;
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestSVN.cxx | 5 +++++
Source/CTest/cmCTestSVN.h | 5 +----
2 files changed, 6 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
