[Cmake-commits] [cmake-commits] king committed cmGlobalUnixMakefileGenerator3.cxx 1.140 1.141 cmGlobalUnixMakefileGenerator3.h 1.60 1.61

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalUnixMakefileGenerator3.cxx 
	cmGlobalUnixMakefileGenerator3.h 
Log Message:
Qualify std::map compare functor as const

Some older STL implementations invoke the comparison functor as a const
object, so the function call operator must be 'const' qualified.  This
fixes the commit "Fix support for OLD behavior of policy CMP0002" to
compile on older STLs.


Index: cmGlobalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.cxx,v
retrieving revision 1.140
retrieving revision 1.141
diff -C 2 -d -r1.140 -r1.141
*** cmGlobalUnixMakefileGenerator3.cxx	28 Sep 2009 21:34:22 -0000	1.140
--- cmGlobalUnixMakefileGenerator3.cxx	29 Sep 2009 12:34:37 -0000	1.141
***************
*** 914,918 ****
  bool
  cmGlobalUnixMakefileGenerator3::ProgressMapCompare
! ::operator()(cmTarget* l, cmTarget* r)
  {
    // Order by target name.
--- 914,918 ----
  bool
  cmGlobalUnixMakefileGenerator3::ProgressMapCompare
! ::operator()(cmTarget* l, cmTarget* r) const
  {
    // Order by target name.

Index: cmGlobalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -C 2 -d -r1.60 -r1.61
*** cmGlobalUnixMakefileGenerator3.h	28 Sep 2009 21:34:23 -0000	1.60
--- cmGlobalUnixMakefileGenerator3.h	29 Sep 2009 12:34:39 -0000	1.61
***************
*** 181,185 ****
      void WriteProgressVariables(unsigned long total, unsigned long& current);
    };
!   struct ProgressMapCompare { bool operator()(cmTarget*,cmTarget*); };
    typedef std::map<cmTarget*, TargetProgress,
                     ProgressMapCompare> ProgressMapType;
--- 181,185 ----
      void WriteProgressVariables(unsigned long total, unsigned long& current);
    };
!   struct ProgressMapCompare { bool operator()(cmTarget*,cmTarget*) const; };
    typedef std::map<cmTarget*, TargetProgress,
                     ProgressMapCompare> ProgressMapType;