Convert GN's deps iterator to work with range-based for loops.

tools/gn/command_refs.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 #include <set>
 
 #include "base/command_line.h"
 #include "tools/gn/commands.h"
 #include "tools/gn/deps_iterator.h"
 #include "tools/gn/filesystem_utils.h"
 #include "tools/gn/input_file.h"
 #include "tools/gn/item.h"
 #include "tools/gn/setup.h"
 #include "tools/gn/standard_out.h"
 #include "tools/gn/target.h"
 
 namespace commands {
 
 namespace {
 
 typedef std::set<const Target*> TargetSet;
 typedef std::vector<const Target*> TargetVector;

[tfarina, 2014/09/27 00:33:56]

you can remove this, it is unused.

[brettw, 2014/09/27 22:23:03]

Thanks, will pick this up in the next pass if that's OK.

 
 // Maps targets to the list of targets that depend on them.
 typedef std::multimap<const Target*, const Target*> DepMap;
 
 // Populates the reverse dependency map for the targets in the Setup.
 void FillDepMap(Setup* setup, DepMap* dep_map) {
-  std::vector<const Target*> targets =
-      setup->builder()->GetAllResolvedTargets();
-
-  for (size_t target_i = 0; target_i < targets.size(); target_i++) {
-    for (DepsIterator iter(targets[target_i]); !iter.done(); iter.Advance())
-      dep_map->insert(std::make_pair(iter.target(), targets[target_i]));
+  for (const auto& target : setup->builder()->GetAllResolvedTargets()) {
+    for (const auto& dep_pair : target->GetDeps(Target::DEPS_ALL))
+      dep_map->insert(std::make_pair(dep_pair.ptr, target));
   }
 }
 
 // Returns the file path generating this item.
 base::FilePath FilePathForItem(const Item* item) {
   return item->defined_from()->GetRange().begin().file()->physical_name();
 }
 
 // Prints the targets which are the result of a query. This list is sorted
 // and, if as_files is set, the unique filenames matching those targets will
@@ skipping 229 matching lines @@
            cur_dep != dep_end; cur_dep++)
         results.insert(cur_dep->second);
     }
     OutputResultSet(results, files);
   }
 
   return 0;
 }
 
 }  // namespace commands