diff options
| author | Brad King <brad.king@kitware.com> | 2012-10-09 12:39:11 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-10-09 12:39:11 (GMT) |
| commit | 76f3fe73baffd6b5b13e01d25e90789e84a38de8 (patch) | |
| tree | caee32ed995450af549c266a3bcdd5aee43ae49e | |
| parent | f413d280bc3f249d631c279d9dd236cbd85fd39d (diff) | |
| parent | ea17faac4d9df954361c90eecc7c6c3d6f7e30e1 (diff) | |
| download | CMake-76f3fe73baffd6b5b13e01d25e90789e84a38de8.zip CMake-76f3fe73baffd6b5b13e01d25e90789e84a38de8.tar.gz CMake-76f3fe73baffd6b5b13e01d25e90789e84a38de8.tar.bz2 | |
Merge topic 'ctest-svn-suncc-5.1'
ea17faa cmCTestSVN: Fix compilation with Sun CC 5.1
| -rw-r--r-- | Source/CTest/cmCTestSVN.h | 1 | ||||
| -rw-r--r-- | Source/CTest/cmCTestVC.h | 4 |
2 files changed, 5 insertions, 0 deletions
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; |