[Cmake-commits] [cmake-commits] king committed cmGlobalUnixMakefileGenerator3.cxx 1.133 1.134

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv20907/Source

Modified Files:
	cmGlobalUnixMakefileGenerator3.cxx 
Log Message:
BUG: Avoid std::unique algorithm on VMS

The Compaq compiler's std::unique algorithm followed by deletion of the
extra elements seems to crash.  For now we'll accept the duplicate
dependencies on this platform.


Index: cmGlobalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.cxx,v
retrieving revision 1.133
retrieving revision 1.134
diff -C 2 -d -r1.133 -r1.134
*** cmGlobalUnixMakefileGenerator3.cxx	10 May 2009 09:29:10 -0000	1.133
--- cmGlobalUnixMakefileGenerator3.cxx	10 Jun 2009 17:02:18 -0000	1.134
***************
*** 304,310 ****
--- 304,312 ----
    // Sort the list and remove duplicates.
    std::sort(lfiles.begin(), lfiles.end(), std::less<std::string>());
+ #if !defined(__VMS) // The Compaq STL on VMS crashes, so accept duplicates.
    std::vector<std::string>::iterator new_end = 
      std::unique(lfiles.begin(),lfiles.end());
    lfiles.erase(new_end, lfiles.end());
+ #endif
  
    // reset lg to the first makefile