From b813f863e6ba9fca7ba216810564c268099db16c Mon Sep 17 00:00:00 2001
From: Eric NOULARD <eric.noulard@gmail.com>
Date: Fri, 4 Mar 2011 22:57:37 +0100
Subject: CPack  fix compile error on VS70 and avoid KWStyle warnings

---
 Source/CPack/cmCPackGenerator.cxx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 2cc2f34..5f314c6 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -24,6 +24,7 @@
 #include <cmsys/SystemTools.hxx>
 #include <cmsys/Glob.hxx>
 #include <memory> // auto_ptr
+#include <algorithm>
 
 #if defined(__HAIKU__)
 #include <StorageKit.h>
@@ -822,7 +823,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
           glB.RecurseOn();
           glB.FindFiles(findExpr);
           filesBefore = glB.GetFiles();
-          sort(filesBefore.begin(),filesBefore.end());
+          std::sort(filesBefore.begin(),filesBefore.end());
           }
         // do installation
         int res = mf->ReadListFile(0, installFile.c_str());
@@ -834,10 +835,10 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
           glA.RecurseOn();
           glA.FindFiles(findExpr);
           std::vector<std::string> filesAfter = glA.GetFiles();
-          sort(filesAfter.begin(),filesAfter.end());
+          std::sort(filesAfter.begin(),filesAfter.end());
           std::vector<std::string>::iterator diff;
           std::vector<std::string> result(filesAfter.size());
-          diff = set_difference (
+          diff = std::set_difference (
                   filesAfter.begin(),filesAfter.end(),
                   filesBefore.begin(),filesBefore.end(),
                   result.begin());
@@ -847,8 +848,11 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
           // Populate the File field of each component
           for (fit=result.begin();fit!=diff;++fit)
             {
-            localFileName = cmSystemTools::RelativePath(InstallPrefix, fit->c_str());
-            localFileName = localFileName.substr(localFileName.find('/')+1,std::string::npos);
+            localFileName =
+                cmSystemTools::RelativePath(InstallPrefix, fit->c_str());
+            localFileName =
+                localFileName.substr(localFileName.find('/')+1,
+                                     std::string::npos);
             Components[installComponent].Files.push_back(localFileName);
             cmCPackLogger(cmCPackLog::LOG_DEBUG, "Adding file <"
                                 <<localFileName<<"> to component <"
-- 
cgit v0.12