瀏覽代碼

cmGeneratorTarget: Replace set insert algorithm with cmRemoveDuplicates.

Stephen Kelly 10 年之前
父節點
當前提交
ee5bc006eb
共有 1 個文件被更改,包括 5 次插入6 次删除
  1. 5 6
      Source/cmGeneratorTarget.cxx

+ 5 - 6
Source/cmGeneratorTarget.cxx

@@ -528,23 +528,22 @@ cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs,
   std::vector<cmSourceFile const*> objectFiles;
   std::vector<cmSourceFile const*> objectFiles;
   this->GetExternalObjects(objectFiles, config);
   this->GetExternalObjects(objectFiles, config);
   std::vector<cmTarget*> objectLibraries;
   std::vector<cmTarget*> objectLibraries;
-  std::set<cmTarget*> emitted;
   for(std::vector<cmSourceFile const*>::const_iterator
   for(std::vector<cmSourceFile const*>::const_iterator
       it = objectFiles.begin(); it != objectFiles.end(); ++it)
       it = objectFiles.begin(); it != objectFiles.end(); ++it)
     {
     {
     std::string objLib = (*it)->GetObjectLibrary();
     std::string objLib = (*it)->GetObjectLibrary();
     if (cmTarget* tgt = this->Makefile->FindTargetToUse(objLib))
     if (cmTarget* tgt = this->Makefile->FindTargetToUse(objLib))
       {
       {
-      if (emitted.insert(tgt).second)
-        {
-        objectLibraries.push_back(tgt);
-        }
+      objectLibraries.push_back(tgt);
       }
       }
     }
     }
 
 
+  std::vector<cmTarget*>::const_iterator end
+      = cmRemoveDuplicates(objectLibraries);
+
   for(std::vector<cmTarget*>::const_iterator
   for(std::vector<cmTarget*>::const_iterator
         ti = objectLibraries.begin();
         ti = objectLibraries.begin();
-      ti != objectLibraries.end(); ++ti)
+      ti != end; ++ti)
     {
     {
     cmTarget* objLib = *ti;
     cmTarget* objLib = *ti;
     cmGeneratorTarget* ogt =
     cmGeneratorTarget* ogt =