[Cmake-commits] CMake branch, next, updated. v2.8.9-1008-g8a51466

[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  8a51466bbe4ad4768c42ba032149534fe003b68f (commit)
       via  ea17faac4d9df954361c90eecc7c6c3d6f7e30e1 (commit)
       via  35f2af164f97bbbed93160b098652b4ee4d8b964 (commit)
      from  4c7150cba317edefcea490404b1cecd8f653bed1 (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=8a51466bbe4ad4768c42ba032149534fe003b68f
commit 8a51466bbe4ad4768c42ba032149534fe003b68f
Merge: 4c7150c ea17faa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 4 15:07:21 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 4 15:07:21 2012 -0400

    Merge topic 'ctest-svn-suncc-5.1' into next
    
    ea17faa cmCTestSVN: Fix compilation with Sun CC 5.1
    35f2af1 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea17faac4d9df954361c90eecc7c6c3d6f7e30e1
commit ea17faac4d9df954361c90eecc7c6c3d6f7e30e1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 4 15:03:38 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 4 15:05:05 2012 -0400

    cmCTestSVN: Fix compilation with Sun CC 5.1
    
    Hack access to cmCTestVC::Revision on this compiler to avoid errors like
    
     Source/CTest/cmCTestSVN.cxx, line 23: Error: cmCTestSVN::SVNInfo is not accessible from cmCTestSVN::Revision.
     Source/CTest/cmCTestSVN.cxx, line 22: Error: cmCTestVC::Revision is not accessible from file level.

diff --git a/Source/CTest/cmCTestSVN.h b/Source/CTest/cmCTestSVN.h
index 73d676e..c6548e3 100644
--- a/Source/CTest/cmCTestSVN.h
+++ b/Source/CTest/cmCTestSVN.h
@@ -63,6 +63,7 @@ private:
 
   // Extended revision structure to include info about external it refers to.
   struct Revision;
+  friend struct Revision;
 
   // Info of all the repositories (root, externals and nested ones).
   std::list<SVNInfo> Repositories;
diff --git a/Source/CTest/cmCTestVC.h b/Source/CTest/cmCTestVC.h
index 44e1dac..9dd0651 100644
--- a/Source/CTest/cmCTestVC.h
+++ b/Source/CTest/cmCTestVC.h
@@ -67,6 +67,9 @@ protected:
   virtual void NoteNewRevision();
   virtual bool WriteXMLUpdates(std::ostream& xml);
 
+#if defined(__SUNPRO_CC) && __SUNPRO_CC <= 0x510
+public: // Sun CC 5.1 needs help to allow cmCTestSVN::Revision to see this
+#endif
   /** Basic information about one revision of a tree or file.  */
   struct Revision
   {
@@ -80,6 +83,7 @@ protected:
     std::string Log;
   };
 
+protected:
   struct File;
   friend struct File;
 

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 Source/CTest/cmCTestSVN.h |    1 +
 Source/CTest/cmCTestVC.h  |    4 ++++
 3 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake