[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1130-g02c9caf

[Stephen Kelly]

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  02c9caf7e74c6e339477b15093f9ef0c0142a3a1 (commit)
       via  1935ad83a90fb1d5a500d7cd2b77aeb24e855ab8 (commit)
      from  5a4863aa35575fee5db1095c3da3b7f09d4c8f39 (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=02c9caf7e74c6e339477b15093f9ef0c0142a3a1
commit 02c9caf7e74c6e339477b15093f9ef0c0142a3a1
Merge: 5a4863a 1935ad8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 29 15:33:56 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 29 15:33:56 2012 -0500

    Merge topic 'SUNPRO-stdremove-template-expansion' into next
    
    1935ad8 Workaround the failing build on SunPro.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1935ad83a90fb1d5a500d7cd2b77aeb24e855ab8
commit 1935ad83a90fb1d5a500d7cd2b77aeb24e855ab8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 29 21:26:32 2012 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 29 21:31:13 2012 +0100

    Workaround the failing build on SunPro.
    
    My efforts to diagnose the problem via google and via email with the maintainer
    of the machine have not borne fruit.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 5ab9bdc..3fce0d7 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2619,14 +2619,32 @@ void cmTarget::PrependTLLIncludeDirectories(const std::string &includes)
                                                   );
 }
 
+#if defined(__SUNPRO_CC) && __SUNPRO_CC <= 0x510
+// The Sun Machine on the dashboard has an un diagnosed error with parsing
+// this template: http://open.cdash.org/viewBuildError.php?buildid=2689581
+// In the absense of an ability to find out what the problem is, just
+// write the specialized expansion of the template instead. If cmStdRemove
+// is ever to move to a generic location, that problem would have to be
+// fixed.
+std::vector<std::string>::iterator cmStdRemove(
+                                  std::vector<std::string>::iterator first,
+                                  std::vector<std::string>::iterator last,
+                            const std::string& value)
+#else
 // A Borland machine on the dashboard has a faulty std::remove.
 template <typename ForwardIterator, typename T>
 ForwardIterator cmStdRemove(ForwardIterator first,
                             ForwardIterator last,
                             const T& value)
+#endif
 {
-#if defined(__BORLANDC__) || (defined(__GNUC__) && __GNUC__ < 3)
+#if defined(__BORLANDC__) || (defined(__GNUC__) && __GNUC__ < 3) \
+                          || (defined(__SUNPRO_CC) && __SUNPRO_CC <= 0x510)
+#  if defined(__SUNPRO_CC) && __SUNPRO_CC <= 0x510
+  std::vector<std::string>::iterator result = first;
+#  else
   ForwardIterator result = first;
+#  endif
   for ( ; first != last; ++first)
     {
     if (!(*first == value))

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

Summary of changes:
 Source/cmTarget.cxx |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake